Skip to content
Snippets Groups Projects
Commit 3299a16f authored by Monster Iestyn's avatar Monster Iestyn
Browse files

Merge branch 'lua-userdata-invalidate-fix' into 'next'

Lua userdata invalidate fix

See merge request STJr/SRB2!1584
parents 113cedd4 3a49b951
No related branches found
No related tags found
No related merge requests found
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "byteptr.h" #include "byteptr.h"
#include "p_saveg.h" #include "p_saveg.h"
#include "p_local.h" #include "p_local.h"
#include "p_slopes.h" // for P_SlopeById #include "p_slopes.h" // for P_SlopeById and slopelist
#include "p_polyobj.h" // polyobj_t, PolyObjects #include "p_polyobj.h" // polyobj_t, PolyObjects
#ifdef LUA_ALLOW_BYTECODE #ifdef LUA_ALLOW_BYTECODE
#include "d_netfil.h" // for LUA_DumpFile #include "d_netfil.h" // for LUA_DumpFile
...@@ -851,6 +851,8 @@ void LUA_InvalidateLevel(void) ...@@ -851,6 +851,8 @@ void LUA_InvalidateLevel(void)
{ {
LUA_InvalidateUserdata(&lines[i]); LUA_InvalidateUserdata(&lines[i]);
LUA_InvalidateUserdata(&lines[i].tags); LUA_InvalidateUserdata(&lines[i].tags);
LUA_InvalidateUserdata(lines[i].args);
LUA_InvalidateUserdata(lines[i].stringargs);
LUA_InvalidateUserdata(lines[i].sidenum); LUA_InvalidateUserdata(lines[i].sidenum);
} }
for (i = 0; i < numsides; i++) for (i = 0; i < numsides; i++)
...@@ -863,6 +865,13 @@ void LUA_InvalidateLevel(void) ...@@ -863,6 +865,13 @@ void LUA_InvalidateLevel(void)
LUA_InvalidateUserdata(&PolyObjects[i].vertices); LUA_InvalidateUserdata(&PolyObjects[i].vertices);
LUA_InvalidateUserdata(&PolyObjects[i].lines); LUA_InvalidateUserdata(&PolyObjects[i].lines);
} }
for (pslope_t *slope = slopelist; slope; slope = slope->next)
{
LUA_InvalidateUserdata(slope);
LUA_InvalidateUserdata(&slope->normal);
LUA_InvalidateUserdata(&slope->o);
LUA_InvalidateUserdata(&slope->d);
}
#ifdef HAVE_LUA_SEGS #ifdef HAVE_LUA_SEGS
for (i = 0; i < numsegs; i++) for (i = 0; i < numsegs; i++)
LUA_InvalidateUserdata(&segs[i]); LUA_InvalidateUserdata(&segs[i]);
...@@ -885,6 +894,8 @@ void LUA_InvalidateMapthings(void) ...@@ -885,6 +894,8 @@ void LUA_InvalidateMapthings(void)
{ {
LUA_InvalidateUserdata(&mapthings[i]); LUA_InvalidateUserdata(&mapthings[i]);
LUA_InvalidateUserdata(&mapthings[i].tags); LUA_InvalidateUserdata(&mapthings[i].tags);
LUA_InvalidateUserdata(mapthings[i].args);
LUA_InvalidateUserdata(mapthings[i].stringargs);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment