mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-03-13 06:13:18 +00:00
Remove disabled LUA_BLOCKMAP code from lua_baselib.c
This commit is contained in:
Monster Iestyn
parent
dc1e7165f7
commit
5da972f314
1 changed files with 0 additions and 260 deletions
|
|
@ -27,10 +27,6 @@
|
|||
|
||||
#define NOHUD if (hud_running) return luaL_error(L, "HUD rendering code should not call this function!");
|
||||
|
||||
// uncomment if you want to test
|
||||
// note: now outdated
|
||||
//#define LUA_BLOCKMAP
|
||||
|
||||
boolean luaL_checkboolean(lua_State *L, int narg) {
|
||||
luaL_checktype(L, narg, LUA_TBOOLEAN);
|
||||
return lua_toboolean(L, narg);
|
||||
|
|
@ -218,258 +214,6 @@ static int lib_pPointOnLineSide(lua_State *L)
|
|||
return 1;
|
||||
}
|
||||
|
||||
#ifdef LUA_BLOCKMAP
|
||||
static boolean blockfuncerror = false;
|
||||
// auxillary function for lib_pSearchBlockmap_Objects
|
||||
static boolean lib_pSearchBlockmap_Objects_aux(lua_State *L, INT32 x, INT32 y, mobj_t *thing, int funcarg)
|
||||
{
|
||||
mobj_t *mobj, *bnext = NULL;
|
||||
|
||||
if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
|
||||
return true;
|
||||
|
||||
// Check interaction with the objects in the blockmap.
|
||||
for (mobj = blocklinks[y*bmapwidth + x]; mobj; mobj = bnext)
|
||||
{
|
||||
P_SetTarget(&bnext, mobj->bnext); // We want to note our reference to bnext here incase it is MF_NOTHINK and gets removed!
|
||||
lua_pushvalue(L, funcarg);
|
||||
LUA_PushUserdata(L, thing, META_MOBJ);
|
||||
LUA_PushUserdata(L, mobj, META_MOBJ);
|
||||
if (lua_pcall(gL, 2, 1, 0)) {
|
||||
if (!blockfuncerror || cv_debug & DBG_LUA)
|
||||
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
|
||||
lua_pop(gL, 1);
|
||||
blockfuncerror = true;
|
||||
return true;
|
||||
}
|
||||
if (!lua_isnil(gL, -1))
|
||||
{ // if nil, continue
|
||||
if (lua_toboolean(gL, -1))
|
||||
return false;
|
||||
}
|
||||
lua_pop(gL, 1);
|
||||
if (P_MobjWasRemoved(thing) // func just popped our thing, cannot continue.
|
||||
|| (bnext && P_MobjWasRemoved(bnext))) // func just broke blockmap chain, cannot continue.
|
||||
{
|
||||
P_SetTarget(&bnext, NULL);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// P_SearchBlockmap_Objects
|
||||
// Lua-exclusive, but it kind of needs to be for best results
|
||||
static int lib_pSearchBlockmap_Objects(lua_State *L)
|
||||
{
|
||||
int n = lua_gettop(L);
|
||||
mobj_t *mobj;
|
||||
INT32 xl, xh, yl, yh, bx, by;
|
||||
fixed_t x1, x2, y1, y2;
|
||||
int funcarg;
|
||||
boolean retval = true;
|
||||
|
||||
// the mobj we are searching around
|
||||
mobj = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
|
||||
if (!mobj)
|
||||
return LUA_ErrInvalid(L, "mobj_t");
|
||||
|
||||
if (n > 2) // specific x/y ranges have been supplied
|
||||
{
|
||||
if (n < 6)
|
||||
return luaL_error(L, "arguments 2 to 5 not all given (expected 4 fixed-point integers)");
|
||||
|
||||
x1 = luaL_checkfixed(L, 2);
|
||||
x2 = luaL_checkfixed(L, 3);
|
||||
y1 = luaL_checkfixed(L, 4);
|
||||
y2 = luaL_checkfixed(L, 5);
|
||||
funcarg = 6;
|
||||
}
|
||||
else // mobj and function only - search around mobj's radius by default
|
||||
{
|
||||
x1 = mobj->x - mobj->radius;
|
||||
x2 = mobj->x + mobj->radius;
|
||||
y1 = mobj->y - mobj->radius;
|
||||
y2 = mobj->y + mobj->radius;
|
||||
funcarg = 2;
|
||||
}
|
||||
luaL_checktype(L, funcarg, LUA_TFUNCTION);
|
||||
|
||||
xl = (unsigned)(x1 - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
|
||||
xh = (unsigned)(x2 - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
|
||||
yl = (unsigned)(y1 - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
|
||||
yh = (unsigned)(y2 - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
|
||||
|
||||
BMBOUNDFIX(xl, xh, yl, yh);
|
||||
|
||||
blockfuncerror = false; // reset
|
||||
for (bx = xl; bx <= xh; bx++)
|
||||
for (by = yl; by <= yh; by++)
|
||||
{
|
||||
if (!lib_pSearchBlockmap_Objects_aux(L, bx, by, mobj, funcarg))
|
||||
retval = false;
|
||||
if (P_MobjWasRemoved(mobj)){
|
||||
lua_pushboolean(L, false);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
lua_pushboolean(L, retval);
|
||||
return 1;
|
||||
}
|
||||
|
||||
// auxillary function for lib_pSearchBlockmap_Objects
|
||||
static boolean lib_pSearchBlockmap_Lines_aux(lua_State *L, INT32 x, INT32 y, mobj_t *thing, int funcarg)
|
||||
{
|
||||
INT32 offset;
|
||||
const INT32 *list; // Big blockmap
|
||||
#ifdef POLYOBJECTS
|
||||
polymaplink_t *plink; // haleyjd 02/22/06
|
||||
#endif
|
||||
line_t *ld;
|
||||
|
||||
if (x < 0 || y < 0 || x >= bmapwidth || y >= bmapheight)
|
||||
return true;
|
||||
|
||||
offset = y*bmapwidth + x;
|
||||
|
||||
#ifdef POLYOBJECTS
|
||||
// haleyjd 02/22/06: consider polyobject lines
|
||||
plink = polyblocklinks[offset];
|
||||
|
||||
while (plink)
|
||||
{
|
||||
polyobj_t *po = plink->po;
|
||||
|
||||
if (po->validcount != validcount) // if polyobj hasn't been checked
|
||||
{
|
||||
size_t i;
|
||||
po->validcount = validcount;
|
||||
|
||||
for (i = 0; i < po->numLines; ++i)
|
||||
{
|
||||
if (po->lines[i]->validcount == validcount) // line has been checked
|
||||
continue;
|
||||
po->lines[i]->validcount = validcount;
|
||||
|
||||
lua_pushvalue(L, funcarg);
|
||||
LUA_PushUserdata(L, thing, META_MOBJ);
|
||||
LUA_PushUserdata(L, po->lines[i], META_LINE);
|
||||
if (lua_pcall(gL, 2, 1, 0)) {
|
||||
if (!blockfuncerror || cv_debug & DBG_LUA)
|
||||
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
|
||||
lua_pop(gL, 1);
|
||||
blockfuncerror = true;
|
||||
return true;
|
||||
}
|
||||
if (!lua_isnil(gL, -1))
|
||||
{ // if nil, continue
|
||||
if (lua_toboolean(gL, -1))
|
||||
return false;
|
||||
}
|
||||
lua_pop(gL, 1);
|
||||
if (P_MobjWasRemoved(thing))
|
||||
return true;
|
||||
}
|
||||
}
|
||||
plink = (polymaplink_t *)(plink->link.next);
|
||||
}
|
||||
#endif
|
||||
|
||||
offset = *(blockmap + offset); // offset = blockmap[y*bmapwidth+x];
|
||||
|
||||
// First index is really empty, so +1 it.
|
||||
for (list = blockmaplump + offset + 1; *list != -1; list++)
|
||||
{
|
||||
ld = &lines[*list];
|
||||
|
||||
if (ld->validcount == validcount)
|
||||
continue; // Line has already been checked.
|
||||
|
||||
ld->validcount = validcount;
|
||||
|
||||
lua_pushvalue(L, funcarg);
|
||||
LUA_PushUserdata(L, thing, META_MOBJ);
|
||||
LUA_PushUserdata(L, ld, META_LINE);
|
||||
if (lua_pcall(gL, 2, 1, 0)) {
|
||||
if (!blockfuncerror || cv_debug & DBG_LUA)
|
||||
CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
|
||||
lua_pop(gL, 1);
|
||||
blockfuncerror = true;
|
||||
return true;
|
||||
}
|
||||
if (!lua_isnil(gL, -1))
|
||||
{ // if nil, continue
|
||||
if (lua_toboolean(gL, -1))
|
||||
return false;
|
||||
}
|
||||
lua_pop(gL, 1);
|
||||
if (P_MobjWasRemoved(thing))
|
||||
return true;
|
||||
}
|
||||
return true; // Everything was checked.
|
||||
}
|
||||
|
||||
// P_SearchBlockmap_Lines
|
||||
// same deal as the _Objects version
|
||||
static int lib_pSearchBlockmap_Lines(lua_State *L)
|
||||
{
|
||||
int n = lua_gettop(L);
|
||||
mobj_t *mobj;
|
||||
INT32 xl, xh, yl, yh, bx, by;
|
||||
fixed_t x1, x2, y1, y2;
|
||||
int funcarg;
|
||||
boolean retval = true;
|
||||
|
||||
// the mobj we are searching around
|
||||
mobj = *((mobj_t **)luaL_checkudata(L, 1, META_MOBJ));
|
||||
if (!mobj)
|
||||
return LUA_ErrInvalid(L, "mobj_t");
|
||||
|
||||
if (n > 2) // specific x/y ranges have been supplied
|
||||
{
|
||||
if (n < 6)
|
||||
return luaL_error(L, "arguments 2 to 5 not all given (expected 4 fixed-point integers)");
|
||||
|
||||
x1 = luaL_checkfixed(L, 2);
|
||||
x2 = luaL_checkfixed(L, 3);
|
||||
y1 = luaL_checkfixed(L, 4);
|
||||
y2 = luaL_checkfixed(L, 5);
|
||||
funcarg = 6;
|
||||
}
|
||||
else // mobj and function only - search around mobj's radius by default
|
||||
{
|
||||
x1 = mobj->x - mobj->radius;
|
||||
x2 = mobj->x + mobj->radius;
|
||||
y1 = mobj->y - mobj->radius;
|
||||
y2 = mobj->y + mobj->radius;
|
||||
funcarg = 2;
|
||||
}
|
||||
luaL_checktype(L, funcarg, LUA_TFUNCTION);
|
||||
|
||||
xl = (unsigned)(x1 - bmaporgx - MAXRADIUS)>>MAPBLOCKSHIFT;
|
||||
xh = (unsigned)(x2 - bmaporgx + MAXRADIUS)>>MAPBLOCKSHIFT;
|
||||
yl = (unsigned)(y1 - bmaporgy - MAXRADIUS)>>MAPBLOCKSHIFT;
|
||||
yh = (unsigned)(y2 - bmaporgy + MAXRADIUS)>>MAPBLOCKSHIFT;
|
||||
|
||||
BMBOUNDFIX(xl, xh, yl, yh);
|
||||
|
||||
blockfuncerror = false; // reset
|
||||
validcount++;
|
||||
for (bx = xl; bx <= xh; bx++)
|
||||
for (by = yl; by <= yh; by++)
|
||||
{
|
||||
if (!lib_pSearchBlockmap_Lines_aux(L, bx, by, mobj, funcarg))
|
||||
retval = false;
|
||||
if (P_MobjWasRemoved(mobj)){
|
||||
lua_pushboolean(L, false);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
lua_pushboolean(L, retval);
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
// P_ENEMY
|
||||
/////////////
|
||||
|
||||
|
|
@ -2257,10 +2001,6 @@ static luaL_Reg lib[] = {
|
|||
{"P_AproxDistance",lib_pAproxDistance},
|
||||
{"P_ClosestPointOnLine",lib_pClosestPointOnLine},
|
||||
{"P_PointOnLineSide",lib_pPointOnLineSide},
|
||||
#ifdef LUA_BLOCKMAP
|
||||
{"P_SearchBlockmap_Objects",lib_pSearchBlockmap_Objects},
|
||||
{"P_SearchBlockmap_Lines",lib_pSearchBlockmap_Lines},
|
||||
#endif
|
||||
|
||||
// p_enemy
|
||||
{"P_CheckMeleeRange", lib_pCheckMeleeRange},
|
||||
|
|
|
|||
Loading…
Reference in a new issue