From dc10cd210b35823898d65be94b0855dd040fa503 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Thu, 5 Jan 2017 05:29:47 +0000 Subject: [PATCH] Lunatic: Fix build, part 12. playerswhenstarted --> g_mostConcurrentPlayers git-svn-id: https://svn.eduke32.com/eduke32@5995 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/lunatic/bcheck.lua | 2 +- polymer/eduke32/source/lunatic/control.lua | 2 +- polymer/eduke32/source/lunatic/defs.ilua | 6 +++--- polymer/eduke32/source/lunatic/dynsymlist | 2 +- polymer/eduke32/source/premap.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/polymer/eduke32/source/lunatic/bcheck.lua b/polymer/eduke32/source/lunatic/bcheck.lua index e43899c71..55690df45 100644 --- a/polymer/eduke32/source/lunatic/bcheck.lua +++ b/polymer/eduke32/source/lunatic/bcheck.lua @@ -59,7 +59,7 @@ end local con_lang = require("con_lang") function bcheck.player_idx(snum) - if (not (snum >= 0 and snum < ffiC.playerswhenstarted)) then + if (not (snum >= 0 and snum < ffiC.g_mostConcurrentPlayers)) then error("invalid player number "..snum, 3) end end diff --git a/polymer/eduke32/source/lunatic/control.lua b/polymer/eduke32/source/lunatic/control.lua index 5fb37133c..945541fe7 100644 --- a/polymer/eduke32/source/lunatic/control.lua +++ b/polymer/eduke32/source/lunatic/control.lua @@ -1159,7 +1159,7 @@ function _pstomp(ps, i) if (ps.knee_incs == 0 and sprite[ps.i].xrepeat >= 40) then local spr = sprite[i] if (cansee(spr^(4*256), spr.sectnum, ps.pos^(-16*256), sprite[ps.i].sectnum)) then - for j=ffiC.playerswhenstarted-1,0 do + for j=ffiC.g_mostConcurrentPlayers-1,0 do if (player[j].actorsqu == i) then return end diff --git a/polymer/eduke32/source/lunatic/defs.ilua b/polymer/eduke32/source/lunatic/defs.ilua index 0086ebd11..90cb87ef2 100644 --- a/polymer/eduke32/source/lunatic/defs.ilua +++ b/polymer/eduke32/source/lunatic/defs.ilua @@ -664,7 +664,7 @@ struct char *apStrings[]; -const int32_t playerswhenstarted; +const int32_t g_mostConcurrentPlayers; int16_t g_deleteQueueSize; int16_t g_blimpSpawnItems[15]; int32_t g_scriptVersion; @@ -845,7 +845,7 @@ local ivec3 = xmath.ivec3 do -- player.all() iterator local function iter_allplayers(_nil, pli) - if (pli+1 < ffiC.playerswhenstarted) then + if (pli+1 < ffiC.g_mostConcurrentPlayers) then return pli+1 end end @@ -976,7 +976,7 @@ do end -- XXX: error message will say "g_player_ps" -player = setmtonce({}, defs_c.GenStructMetatable("g_player_ps", "playerswhenstarted", player_static_members)) +player = setmtonce({}, defs_c.GenStructMetatable("g_player_ps", "g_mostConcurrentPlayers", player_static_members)) -- needed by "control" actor = setmtonce({}, defs_c.GenStructMetatable("actor", "MAXSPRITES", actor_static_members)) diff --git a/polymer/eduke32/source/lunatic/dynsymlist b/polymer/eduke32/source/lunatic/dynsymlist index b21020654..70b282feb 100644 --- a/polymer/eduke32/source/lunatic/dynsymlist +++ b/polymer/eduke32/source/lunatic/dynsymlist @@ -178,7 +178,7 @@ apStrings; screenpeek; hudweap; -playerswhenstarted; +g_mostConcurrentPlayers; g_deleteQueueSize; g_blimpSpawnItems; g_scriptVersion; diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c index 294bf13bb..aefb5419e 100644 --- a/polymer/eduke32/source/premap.c +++ b/polymer/eduke32/source/premap.c @@ -1544,7 +1544,7 @@ static void resetpspritevars(char gameMode) s->xoffset = 0; s->clipdist = 64; -// if (j < playerswhenstarted) +// if (j < g_mostConcurrentPlayers) { if ((gameMode&MODE_EOL) != MODE_EOL || g_player[j].ps->last_extra == 0) {