Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
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
Package registry
Model registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Shin_Kinr
SRB2
Commits
581d968c
Commit
581d968c
authored
7 months ago
by
LJ Sonic
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix-1277' into 'next'
Fix
#1277
Closes
#1277
See merge request
!2509
parents
f937df5a
3c1736eb
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/deh_lua.c
+6
-0
6 additions, 0 deletions
src/deh_lua.c
src/dehacked.c
+4
-5
4 additions, 5 deletions
src/dehacked.c
with
10 additions
and
5 deletions
src/deh_lua.c
+
6
−
0
View file @
581d968c
...
@@ -28,6 +28,12 @@ static inline int lib_freeslot(lua_State *L)
...
@@ -28,6 +28,12 @@ static inline int lib_freeslot(lua_State *L)
if
(
!
lua_lumploading
)
if
(
!
lua_lumploading
)
return
luaL_error
(
L
,
"This function cannot be called from within a hook or coroutine!"
);
return
luaL_error
(
L
,
"This function cannot be called from within a hook or coroutine!"
);
if
(
!
deh_loaded
)
{
initfreeslots
();
deh_loaded
=
true
;
}
while
(
n
--
>
0
)
while
(
n
--
>
0
)
{
{
s
=
Z_StrDup
(
luaL_checkstring
(
L
,
1
));
s
=
Z_StrDup
(
luaL_checkstring
(
L
,
1
));
...
...
This diff is collapsed.
Click to expand it.
src/dehacked.c
+
4
−
5
View file @
581d968c
...
@@ -192,7 +192,10 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
...
@@ -192,7 +192,10 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
INT32
i
;
INT32
i
;
if
(
!
deh_loaded
)
if
(
!
deh_loaded
)
{
initfreeslots
();
initfreeslots
();
deh_loaded
=
true
;
}
deh_num_warning
=
0
;
deh_num_warning
=
0
;
...
@@ -605,14 +608,10 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
...
@@ -605,14 +608,10 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
if
(
deh_num_warning
)
if
(
deh_num_warning
)
{
{
CONS_Printf
(
M_GetText
(
"%d warning%s in the SOC lump
\n
"
),
deh_num_warning
,
deh_num_warning
==
1
?
""
:
"s"
);
CONS_Printf
(
M_GetText
(
"%d warning%s in the SOC lump
\n
"
),
deh_num_warning
,
deh_num_warning
==
1
?
""
:
"s"
);
if
(
devparm
)
{
if
(
devparm
)
I_Error
(
"%s%s"
,
va
(
M_GetText
(
"%d warning%s in the SOC lump
\n
"
),
deh_num_warning
,
deh_num_warning
==
1
?
""
:
"s"
),
M_GetText
(
"See log.txt for details.
\n
"
));
I_Error
(
"%s%s"
,
va
(
M_GetText
(
"%d warning%s in the SOC lump
\n
"
),
deh_num_warning
,
deh_num_warning
==
1
?
""
:
"s"
),
M_GetText
(
"See log.txt for details.
\n
"
));
//while (!I_GetKey())
//I_OsPolling();
}
}
}
deh_loaded
=
true
;
Z_Free
(
s
);
Z_Free
(
s
);
}
}
...
...
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