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
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
c7cd6458
Commit
c7cd6458
authored
Dec 17, 2017
by
Monster Iestyn
Browse files
Options
Downloads
Patches
Plain Diff
Added a bunch of I_Asserts to lua_hooklib.c relating to mobj types just in case
parent
ec103678
No related branches found
No related tags found
2 merge requests
!252
OpenGL: Public flatsprite: The Fixening
,
!217
P_RespawnSpecials mobj type hotfix
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/lua_hooklib.c
+14
-0
14 additions, 0 deletions
src/lua_hooklib.c
with
14 additions
and
0 deletions
src/lua_hooklib.c
+
14
−
0
View file @
c7cd6458
...
...
@@ -231,6 +231,8 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which)
if
(
!
gL
||
!
(
hooksAvailable
[
which
/
8
]
&
(
1
<<
(
which
%
8
))))
return
false
;
I_Assert
(
mo
->
type
<
NUMMOBJTYPES
);
lua_settop
(
gL
,
0
);
// Look for all generic mobj hooks
...
...
@@ -406,6 +408,8 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
if
(
!
gL
||
!
(
hooksAvailable
[
which
/
8
]
&
(
1
<<
(
which
%
8
))))
return
0
;
I_Assert
(
thing1
->
type
<
NUMMOBJTYPES
);
lua_settop
(
gL
,
0
);
// Look for all generic mobj collision hooks
...
...
@@ -479,6 +483,8 @@ boolean LUAh_MobjThinker(mobj_t *mo)
if
(
!
gL
||
!
(
hooksAvailable
[
hook_MobjThinker
/
8
]
&
(
1
<<
(
hook_MobjThinker
%
8
))))
return
false
;
I_Assert
(
mo
->
type
<
NUMMOBJTYPES
);
lua_settop
(
gL
,
0
);
// Look for all generic mobj thinker hooks
...
...
@@ -532,6 +538,8 @@ boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher)
if
(
!
gL
||
!
(
hooksAvailable
[
hook_TouchSpecial
/
8
]
&
(
1
<<
(
hook_TouchSpecial
%
8
))))
return
0
;
I_Assert
(
special
->
type
<
NUMMOBJTYPES
);
lua_settop
(
gL
,
0
);
// Look for all generic touch special hooks
...
...
@@ -595,6 +603,8 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
if
(
!
gL
||
!
(
hooksAvailable
[
hook_ShouldDamage
/
8
]
&
(
1
<<
(
hook_ShouldDamage
%
8
))))
return
0
;
I_Assert
(
target
->
type
<
NUMMOBJTYPES
);
lua_settop
(
gL
,
0
);
// Look for all generic should damage hooks
...
...
@@ -676,6 +686,8 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
if
(
!
gL
||
!
(
hooksAvailable
[
hook_MobjDamage
/
8
]
&
(
1
<<
(
hook_MobjDamage
%
8
))))
return
0
;
I_Assert
(
target
->
type
<
NUMMOBJTYPES
);
lua_settop
(
gL
,
0
);
// Look for all generic mobj damage hooks
...
...
@@ -747,6 +759,8 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source)
if
(
!
gL
||
!
(
hooksAvailable
[
hook_MobjDeath
/
8
]
&
(
1
<<
(
hook_MobjDeath
%
8
))))
return
0
;
I_Assert
(
target
->
type
<
NUMMOBJTYPES
);
lua_settop
(
gL
,
0
);
// Look for all generic mobj death hooks
...
...
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