Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
yutio888
Tales of MajEyal
Commits
0600df30
Commit
0600df30
authored
13 years ago
by
dg
Browse files
Options
Downloads
Patches
Plain Diff
fix
git-svn-id:
http://svn.net-core.org/repos/t-engine4@3728
51575b47-30f0-44d4-a5cc-537603b46e54
parent
d758eb2d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
game/engines/default/engine/Game.lua
+2
-0
2 additions, 0 deletions
game/engines/default/engine/Game.lua
game/engines/default/modules/boot/dialogs/MainMenu.lua
+1
-0
1 addition, 0 deletions
game/engines/default/modules/boot/dialogs/MainMenu.lua
src/main.c
+1
-1
1 addition, 1 deletion
src/main.c
with
4 additions
and
1 deletion
game/engines/default/engine/Game.lua
+
2
−
0
View file @
0600df30
...
...
@@ -425,6 +425,7 @@ end
-- Threads will be auto joined when the module exits or when it can
-- ALL THREADS registered *MUST* return true when they exit
function
_M
:
registerThread
(
th
,
linda
)
error
(
"Threads unsuported yet"
)
print
(
"[THREAD] registering"
,
th
,
linda
,
#
self
.
__threads
+
1
)
self
.
__threads
[
#
self
.
__threads
+
1
]
=
{
th
=
th
,
linda
=
linda
}
return
#
self
.
__threads
...
...
@@ -434,6 +435,7 @@ end
-- @param timeout the time in seconds to wait for each thread
function
_M
:
joinThreads
(
timeout
)
for
i
=
#
self
.
__threads
,
1
,
-
1
do
error
(
"Threads unsuported yet"
)
local
th
=
self
.
__threads
[
i
].
th
print
(
"[THREAD] Thread join"
,
i
,
th
)
local
v
,
err
=
th
:
join
(
timeout
)
...
...
This diff is collapsed.
Click to expand it.
game/engines/default/modules/boot/dialogs/MainMenu.lua
+
1
−
0
View file @
0600df30
...
...
@@ -46,6 +46,7 @@ function _M:init()
game
:
registerDialog
(
menu
)
end
}
l
[
#
l
+
1
]
=
{
name
=
"Exit"
,
fct
=
function
()
game
:
onQuit
()
end
}
if
config
.
settings
.
cheat
then
l
[
#
l
+
1
]
=
{
name
=
"Reboot"
,
fct
=
function
()
util
.
showMainMenu
()
end
}
end
self
.
c_background
=
Button
.
new
{
text
=
game
.
stopped
and
"Enable background"
or
"Disable background"
,
width
=
150
,
fct
=
function
()
self
:
switchBackground
()
end
}
self
.
c_version
=
Textzone
.
new
{
auto_width
=
true
,
auto_height
=
true
,
text
=
(
"#{bold}##B9E100#T-Engine4 version: %d.%d.%d"
):
format
(
engine
.
version
[
1
],
engine
.
version
[
2
],
engine
.
version
[
3
])}
...
...
This diff is collapsed.
Click to expand it.
src/main.c
+
1
−
1
View file @
0600df30
...
...
@@ -781,7 +781,7 @@ void boot_lua(int state, bool rebooting, int argc, char *argv[])
SDL_WM_SetCaption
(
"T-Engine4"
,
NULL
);
// Now we can open lua lanes, the physfs paths are set and it can load it's lanes-keeper.lua file
luaopen_lanes
(
L
);
//
luaopen_lanes(L);
// And run the lua engine scripts
if
(
!
luaL_loadfile
(
L
,
"/loader/init.lua"
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment