zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-23 15:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lunatic: Fix build, part 12. playerswhenstarted --> g_mostConcurrentPlayers

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5995 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-01-05 05:29:47 +00:00
parent 21ac609dd9
commit dc10cd210b
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/source/lunatic/bcheck.lua
View file

@ -59,7 +59,7 @@ end
local con_lang = require("con_lang") local con_lang = require("con_lang")
function bcheck.player_idx(snum) 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) error("invalid player number "..snum, 3)
end end
end end

2
polymer/eduke32/source/lunatic/control.lua
View file

@ -1159,7 +1159,7 @@ function _pstomp(ps, i)
if (ps.knee_incs == 0 and sprite[ps.i].xrepeat >= 40) then if (ps.knee_incs == 0 and sprite[ps.i].xrepeat >= 40) then
local spr = sprite[i] local spr = sprite[i]
if (cansee(spr^(4*256), spr.sectnum, ps.pos^(-16*256), sprite[ps.i].sectnum)) then 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 if (player[j].actorsqu == i) then
return return
end end

6
polymer/eduke32/source/lunatic/defs.ilua
View file

@ -664,7 +664,7 @@ struct
char *apStrings[]; char *apStrings[];
const int32_t playerswhenstarted; const int32_t g_mostConcurrentPlayers;
int16_t g_deleteQueueSize; int16_t g_deleteQueueSize;
int16_t g_blimpSpawnItems[15]; int16_t g_blimpSpawnItems[15];
int32_t g_scriptVersion; int32_t g_scriptVersion;
@ -845,7 +845,7 @@ local ivec3 = xmath.ivec3
do do
-- player.all() iterator -- player.all() iterator
local function iter_allplayers(_nil, pli) local function iter_allplayers(_nil, pli)
if (pli+1 < ffiC.playerswhenstarted) then if (pli+1 < ffiC.g_mostConcurrentPlayers) then
return pli+1 return pli+1
end end
end end
@ -976,7 +976,7 @@ do
end end
-- XXX: error message will say "g_player_ps" -- 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" -- needed by "control"
actor = setmtonce({}, defs_c.GenStructMetatable("actor", "MAXSPRITES", actor_static_members)) actor = setmtonce({}, defs_c.GenStructMetatable("actor", "MAXSPRITES", actor_static_members))

2
polymer/eduke32/source/lunatic/dynsymlist
View file

@ -178,7 +178,7 @@ apStrings;
screenpeek; screenpeek;
hudweap; hudweap;
playerswhenstarted; g_mostConcurrentPlayers;
g_deleteQueueSize; g_deleteQueueSize;
g_blimpSpawnItems; g_blimpSpawnItems;
g_scriptVersion; g_scriptVersion;

2
polymer/eduke32/source/premap.c
View file

@ -1544,7 +1544,7 @@ static void resetpspritevars(char gameMode)
s->xoffset = 0; s->xoffset = 0;
s->clipdist = 64; s->clipdist = 64;
// if (j < playerswhenstarted) // if (j < g_mostConcurrentPlayers)
{ {
if ((gameMode&MODE_EOL) != MODE_EOL || g_player[j].ps->last_extra == 0) if ((gameMode&MODE_EOL) != MODE_EOL || g_player[j].ps->last_extra == 0)
{ {