zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mass text replacement g_player[p].ps --> ps, part 1 (the easy one).

Browse source 
The p variable (sometimes named differently) has short scope in all cases,
so I'm almost sure that the replacements amount to an identity transformation.

git-svn-id: https://svn.eduke32.com/eduke32@2875 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-08-10 19:11:53 +00:00
parent 689788c65b
commit e1d6fe534d
4 changed files with 629 additions and 596 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
polymer/eduke32/source/actors.c
View file

@ -1615,12 +1615,14 @@ ACTOR_STATIC void G_MoveStandables(void)
} }
else if (s->owner == -2) else if (s->owner == -2)
{ {
g_player[p].ps->opos.x = g_player[p].ps->pos.x = s->x-(sintable[(g_player[p].ps->ang+512)&2047]>>6); DukePlayer_t *const ps = g_player[p].ps;
g_player[p].ps->opos.y = g_player[p].ps->pos.y = s->y-(sintable[g_player[p].ps->ang&2047]>>6);
g_player[p].ps->opos.z = g_player[p].ps->pos.z = s->z+(2<<8);
setsprite(g_player[p].ps->i,(vec3_t *)g_player[p].ps); ps->opos.x = ps->pos.x = s->x-(sintable[(ps->ang+512)&2047]>>6);
g_player[p].ps->cursectnum = sprite[g_player[p].ps->i].sectnum; ps->opos.y = ps->pos.y = s->y-(sintable[ps->ang&2047]>>6);
ps->opos.z = ps->pos.z = s->z+(2<<8);
setsprite(ps->i, (vec3_t *)ps);
ps->cursectnum = sprite[ps->i].sectnum;
} }
} }
@ -3118,7 +3120,7 @@ BOLT:
ACTOR_STATIC void G_MoveTransports(void) ACTOR_STATIC void G_MoveTransports(void)
{ {
int32_t warpspriteto; int32_t warpspriteto;
int32_t i = headspritestat[STAT_TRANSPORT], j, k, l, p, sect, sectlotag, nexti, nextj; int32_t i = headspritestat[STAT_TRANSPORT], j, k, l, sect, sectlotag, nexti, nextj;
int32_t ll,onfloorz,q; int32_t ll,onfloorz,q;
while (i >= 0) while (i >= 0)
@ -3146,16 +3148,16 @@ ACTOR_STATIC void G_MoveTransports(void)
switch (sprite[j].statnum) switch (sprite[j].statnum)
{ {
case STAT_PLAYER: case STAT_PLAYER:
if (sprite[j].owner != -1) if (sprite[j].owner != -1)
{ {
p = sprite[j].yvel; const int32_t p = sprite[j].yvel;
DukePlayer_t *const ps = g_player[p].ps;
g_player[p].ps->on_warping_sector = 1; ps->on_warping_sector = 1;
if (g_player[p].ps->transporter_hold == 0 && g_player[p].ps->jumping_counter == 0) if (ps->transporter_hold == 0 && ps->jumping_counter == 0)
{ {
if (g_player[p].ps->on_ground && sectlotag == 0 && onfloorz && g_player[p].ps->jetpack_on == 0) if (ps->on_ground && sectlotag == 0 && onfloorz && ps->jetpack_on == 0)
{ {
if (sprite[i].pal == 0) if (sprite[i].pal == 0)
{ {
@ -3170,21 +3172,21 @@ ACTOR_STATIC void G_MoveTransports(void)
sprite[g_player[k].ps->i].extra = 0; sprite[g_player[k].ps->i].extra = 0;
} }
g_player[p].ps->ang = sprite[OW].ang; ps->ang = sprite[OW].ang;
if (sprite[OW].owner != OW) if (sprite[OW].owner != OW)
{ {
T1 = 13; T1 = 13;
actor[OW].t_data[0] = 13; actor[OW].t_data[0] = 13;
g_player[p].ps->transporter_hold = 13; ps->transporter_hold = 13;
} }
g_player[p].ps->bobposx = g_player[p].ps->opos.x = g_player[p].ps->pos.x = sprite[OW].x; ps->bobposx = ps->opos.x = ps->pos.x = sprite[OW].x;
g_player[p].ps->bobposy = g_player[p].ps->opos.y = g_player[p].ps->pos.y = sprite[OW].y; ps->bobposy = ps->opos.y = ps->pos.y = sprite[OW].y;
g_player[p].ps->opos.z = g_player[p].ps->pos.z = sprite[OW].z-PHEIGHT; ps->opos.z = ps->pos.z = sprite[OW].z-PHEIGHT;
changespritesect(j,sprite[OW].sectnum); changespritesect(j,sprite[OW].sectnum);
g_player[p].ps->cursectnum = sprite[j].sectnum; ps->cursectnum = sprite[j].sectnum;
if (sprite[i].pal == 0) if (sprite[i].pal == 0)
{ {
@ -3195,36 +3197,36 @@ ACTOR_STATIC void G_MoveTransports(void)
break; break;
} }
} }
else if (!(sectlotag == 1 && g_player[p].ps->on_ground == 1)) break; else if (!(sectlotag == 1 && ps->on_ground == 1)) break;
if (onfloorz == 0 && klabs(SZ-g_player[p].ps->pos.z) < 6144) if (onfloorz == 0 && klabs(SZ-ps->pos.z) < 6144)
if ((g_player[p].ps->jetpack_on == 0) || (g_player[p].ps->jetpack_on && TEST_SYNC_KEY(g_player[p].sync->bits, SK_JUMP)) || if ((ps->jetpack_on == 0) || (ps->jetpack_on && TEST_SYNC_KEY(g_player[p].sync->bits, SK_JUMP)) ||
(g_player[p].ps->jetpack_on && TEST_SYNC_KEY(g_player[p].sync->bits, SK_CROUCH))) (ps->jetpack_on && TEST_SYNC_KEY(g_player[p].sync->bits, SK_CROUCH)))
{ {
g_player[p].ps->bobposx = g_player[p].ps->opos.x = g_player[p].ps->pos.x += sprite[OW].x-SX; ps->bobposx = ps->opos.x = ps->pos.x += sprite[OW].x-SX;
g_player[p].ps->bobposy = g_player[p].ps->opos.y = g_player[p].ps->pos.y += sprite[OW].y-SY; ps->bobposy = ps->opos.y = ps->pos.y += sprite[OW].y-SY;
if (g_player[p].ps->jetpack_on && (TEST_SYNC_KEY(g_player[p].sync->bits, SK_JUMP) || g_player[p].ps->jetpack_on < 11)) if (ps->jetpack_on && (TEST_SYNC_KEY(g_player[p].sync->bits, SK_JUMP) || ps->jetpack_on < 11))
g_player[p].ps->pos.z = sprite[OW].z-6144; ps->pos.z = sprite[OW].z-6144;
else g_player[p].ps->pos.z = sprite[OW].z+6144; else ps->pos.z = sprite[OW].z+6144;
g_player[p].ps->opos.z = g_player[p].ps->pos.z; ps->opos.z = ps->pos.z;
actor[g_player[p].ps->i].bposx = g_player[p].ps->pos.x; actor[ps->i].bposx = ps->pos.x;
actor[g_player[p].ps->i].bposy = g_player[p].ps->pos.y; actor[ps->i].bposy = ps->pos.y;
actor[g_player[p].ps->i].bposz = g_player[p].ps->pos.z; actor[ps->i].bposz = ps->pos.z;
changespritesect(j,sprite[OW].sectnum); changespritesect(j,sprite[OW].sectnum);
g_player[p].ps->cursectnum = sprite[OW].sectnum; ps->cursectnum = sprite[OW].sectnum;
break; break;
} }
k = 0; k = 0;
if (onfloorz && sectlotag == 1 && g_player[p].ps->on_ground && if (onfloorz && sectlotag == 1 && ps->on_ground &&
g_player[p].ps->pos.z >= sector[sect].floorz && ps->pos.z >= sector[sect].floorz &&
(TEST_SYNC_KEY(g_player[p].sync->bits, SK_CROUCH) || g_player[p].ps->vel.z > 2048)) (TEST_SYNC_KEY(g_player[p].sync->bits, SK_CROUCH) || ps->vel.z > 2048))
// if( onfloorz && sectlotag == 1 && g_player[p].ps->pos.z > (sector[sect].floorz-(6<<8)) ) // if( onfloorz && sectlotag == 1 && ps->pos.z > (sector[sect].floorz-(6<<8)) )
{ {
k = 1; k = 1;
if (screenpeek == p) if (screenpeek == p)
@ -3232,23 +3234,23 @@ ACTOR_STATIC void G_MoveTransports(void)
FX_StopAllSounds(); FX_StopAllSounds();
S_ClearSoundLocks(); S_ClearSoundLocks();
} }
if (sprite[g_player[p].ps->i].extra > 0) if (sprite[ps->i].extra > 0)
A_PlaySound(DUKE_UNDERWATER,j); A_PlaySound(DUKE_UNDERWATER,j);
g_player[p].ps->opos.z = g_player[p].ps->pos.z = ps->opos.z = ps->pos.z =
sector[sprite[OW].sectnum].ceilingz; sector[sprite[OW].sectnum].ceilingz;
/* /*
g_player[p].ps->vel.x = 4096-(krand()&8192); ps->vel.x = 4096-(krand()&8192);
g_player[p].ps->vel.y = 4096-(krand()&8192); ps->vel.y = 4096-(krand()&8192);
*/ */
if (TEST_SYNC_KEY(g_player[p].sync->bits, SK_CROUCH)) if (TEST_SYNC_KEY(g_player[p].sync->bits, SK_CROUCH))
g_player[p].ps->vel.z += 512; ps->vel.z += 512;
} }
// r1449-: // r1449-:
if (onfloorz && sectlotag == 2 && g_player[p].ps->pos.z < (sector[sect].ceilingz+1080) && g_player[p].ps->vel.z == 0) if (onfloorz && sectlotag == 2 && ps->pos.z < (sector[sect].ceilingz+1080) && ps->vel.z == 0)
// r1450+, breaks submergible slime in bobsp2: // r1450+, breaks submergible slime in bobsp2:
// if (onfloorz && sectlotag == 2 && g_player[p].ps->pos.z <= sector[sect].ceilingz /*&& g_player[p].ps->vel.z == 0*/) // if (onfloorz && sectlotag == 2 && ps->pos.z <= sector[sect].ceilingz /*&& ps->vel.z == 0*/)
{ {
k = 1; k = 1;
// if( sprite[j].extra <= 0) break; // if( sprite[j].extra <= 0) break;
@ -3259,33 +3261,33 @@ ACTOR_STATIC void G_MoveTransports(void)
} }
A_PlaySound(DUKE_GASP,j); A_PlaySound(DUKE_GASP,j);
g_player[p].ps->opos.z = g_player[p].ps->pos.z = ps->opos.z = ps->pos.z =
sector[sprite[OW].sectnum].floorz; sector[sprite[OW].sectnum].floorz;
g_player[p].ps->jumping_toggle = 1; ps->jumping_toggle = 1;
g_player[p].ps->jumping_counter = 0; ps->jumping_counter = 0;
g_player[p].ps->vel.z = 0; ps->vel.z = 0;
// g_player[p].ps->vel.z += 1024; // ps->vel.z += 1024;
} }
if (k == 1) if (k == 1)
{ {
vec3_t vect; vec3_t vect;
g_player[p].ps->bobposx = g_player[p].ps->opos.x = g_player[p].ps->pos.x += sprite[OW].x-SX; ps->bobposx = ps->opos.x = ps->pos.x += sprite[OW].x-SX;
g_player[p].ps->bobposy = g_player[p].ps->opos.y = g_player[p].ps->pos.y += sprite[OW].y-SY; ps->bobposy = ps->opos.y = ps->pos.y += sprite[OW].y-SY;
if (sprite[OW].owner != OW) if (sprite[OW].owner != OW)
g_player[p].ps->transporter_hold = -2; ps->transporter_hold = -2;
g_player[p].ps->cursectnum = sprite[OW].sectnum; ps->cursectnum = sprite[OW].sectnum;
changespritesect(j,sprite[OW].sectnum); changespritesect(j,sprite[OW].sectnum);
vect.x = g_player[p].ps->pos.x; vect.x = ps->pos.x;
vect.y = g_player[p].ps->pos.y; vect.y = ps->pos.y;
vect.z = g_player[p].ps->pos.z+PHEIGHT; vect.z = ps->pos.z+PHEIGHT;
setsprite(g_player[p].ps->i,&vect); setsprite(ps->i,&vect);
P_UpdateScreenPal(g_player[p].ps); P_UpdateScreenPal(ps);
if ((krand()&255) < 32) if ((krand()&255) < 32)
A_Spawn(j,WATERSPLASH2); A_Spawn(j,WATERSPLASH2);
@ -3293,7 +3295,7 @@ ACTOR_STATIC void G_MoveTransports(void)
if (sectlotag == 1) if (sectlotag == 1)
for (l = 0; l < 9; l++) for (l = 0; l < 9; l++)
{ {
q = A_Spawn(g_player[p].ps->i,WATERBUBBLE); q = A_Spawn(ps->i,WATERBUBBLE);
sprite[q].z += krand()&16383; sprite[q].z += krand()&16383;
} }
} }

208
polymer/eduke32/source/gameexec.c
View file

@ -580,8 +580,9 @@ GAMEEXEC_STATIC void VM_Move(void)
if (a&face_player_smart) if (a&face_player_smart)
{ {
int32_t newx = g_player[vm.g_p].ps->pos.x+(g_player[vm.g_p].ps->vel.x/768); DukePlayer_t *const ps = g_player[vm.g_p].ps;
int32_t newy = g_player[vm.g_p].ps->pos.y+(g_player[vm.g_p].ps->vel.y/768); int32_t newx = ps->pos.x + (ps->vel.x/768);
int32_t newy = ps->pos.y + (ps->vel.y/768);
goalang = getangle(newx-vm.g_sp->x,newy-vm.g_sp->y); goalang = getangle(newx-vm.g_sp->x,newy-vm.g_sp->y);
@ -688,10 +689,10 @@ dead:
if (a && vm.g_sp->picnum != ROTATEGUN) if (a && vm.g_sp->picnum != ROTATEGUN)
{ {
DukePlayer_t *const ps = g_player[vm.g_p].ps;
if (vm.g_x < 960 && vm.g_sp->xrepeat > 16) if (vm.g_x < 960 && vm.g_sp->xrepeat > 16)
{ {
DukePlayer_t *const ps = g_player[vm.g_p].ps;
daxvel = -(1024-vm.g_x); daxvel = -(1024-vm.g_x);
angdif = getangle(ps->pos.x-vm.g_sp->x, ps->pos.y-vm.g_sp->y); angdif = getangle(ps->pos.x-vm.g_sp->x, ps->pos.y-vm.g_sp->y);
@ -710,12 +711,12 @@ dead:
{ {
if (actor[vm.g_i].bposz != vm.g_sp->z || ((!g_netServer && ud.multimode < 2) && ud.player_skill < 2)) if (actor[vm.g_i].bposz != vm.g_sp->z || ((!g_netServer && ud.multimode < 2) && ud.player_skill < 2))
{ {
if ((vm.g_t[0]&1) || g_player[vm.g_p].ps->actorsqu == vm.g_i) return; if ((vm.g_t[0]&1) || ps->actorsqu == vm.g_i) return;
else daxvel <<= 1; else daxvel <<= 1;
} }
else else
{ {
if ((vm.g_t[0]&3) || g_player[vm.g_p].ps->actorsqu == vm.g_i) return; if ((vm.g_t[0]&3) || ps->actorsqu == vm.g_i) return;
else daxvel <<= 2; else daxvel <<= 2;
} }
} }
@ -898,9 +899,10 @@ skip_check:
case CON_IFCANSEETARGET: case CON_IFCANSEETARGET:
{ {
int32_t j = cansee(vm.g_sp->x,vm.g_sp->y,vm.g_sp->z-((krand()&41)<<8), DukePlayer_t *const ps = g_player[vm.g_p].ps;
vm.g_sp->sectnum,g_player[vm.g_p].ps->pos.x,g_player[vm.g_p].ps->pos.y, int32_t j = cansee(vm.g_sp->x, vm.g_sp->y, vm.g_sp->z-((krand()&41)<<8),
g_player[vm.g_p].ps->pos.z/*-((krand()&41)<<8)*/,sprite[g_player[vm.g_p].ps->i].sectnum); vm.g_sp->sectnum, ps->pos.x, ps->pos.y,
ps->pos.z/*-((krand()&41)<<8)*/, sprite[ps->i].sectnum);
VM_CONDITIONAL(j); VM_CONDITIONAL(j);
if (j) actor[vm.g_i].timetosleep = SLEEPTIME; if (j) actor[vm.g_i].timetosleep = SLEEPTIME;
} }
@ -912,15 +914,16 @@ skip_check:
case CON_IFCANSEE: case CON_IFCANSEE:
{ {
spritetype *s = &sprite[g_player[vm.g_p].ps->i]; DukePlayer_t *const ps = g_player[vm.g_p].ps;
spritetype *s = &sprite[ps->i];
int32_t j; int32_t j;
// select sprite for monster to target // select sprite for monster to target
// if holoduke is on, let them target holoduke first. // if holoduke is on, let them target holoduke first.
// //
if (g_player[vm.g_p].ps->holoduke_on >= 0) if (ps->holoduke_on >= 0)
{ {
s = &sprite[g_player[vm.g_p].ps->holoduke_on]; s = &sprite[ps->holoduke_on];
j = cansee(vm.g_sp->x,vm.g_sp->y,vm.g_sp->z-(krand()&((32<<8)-1)),vm.g_sp->sectnum, j = cansee(vm.g_sp->x,vm.g_sp->y,vm.g_sp->z-(krand()&((32<<8)-1)),vm.g_sp->sectnum,
s->x,s->y,s->z,s->sectnum); s->x,s->y,s->z,s->sectnum);
@ -928,7 +931,7 @@ skip_check:
{ {
// they can't see player's holoduke // they can't see player's holoduke
// check for player... // check for player...
s = &sprite[g_player[vm.g_p].ps->i]; s = &sprite[ps->i];
} }
} }
@ -1041,19 +1044,21 @@ skip_check:
if ((GametypeFlags[ud.coop]&GAMETYPE_WEAPSTAY) && (g_netServer || ud.multimode > 1)) if ((GametypeFlags[ud.coop]&GAMETYPE_WEAPSTAY) && (g_netServer || ud.multimode > 1))
{ {
DukePlayer_t *const ps = g_player[vm.g_p].ps;
if (*insptr == 0) if (*insptr == 0)
{ {
int32_t j = 0; int32_t j = 0;
for (; j < g_player[vm.g_p].ps->weapreccnt; j++) for (; j < ps->weapreccnt; j++)
if (g_player[vm.g_p].ps->weaprecs[j] == vm.g_sp->picnum) if (ps->weaprecs[j] == vm.g_sp->picnum)
break; break;
VM_CONDITIONAL(j < g_player[vm.g_p].ps->weapreccnt && vm.g_sp->owner == vm.g_i); VM_CONDITIONAL(j < ps->weapreccnt && vm.g_sp->owner == vm.g_i);
continue; continue;
} }
else if (g_player[vm.g_p].ps->weapreccnt < MAX_WEAPONS) else if (ps->weapreccnt < MAX_WEAPONS)
{ {
g_player[vm.g_p].ps->weaprecs[g_player[vm.g_p].ps->weapreccnt++] = vm.g_sp->picnum; ps->weaprecs[ps->weapreccnt++] = vm.g_sp->picnum;
VM_CONDITIONAL(vm.g_sp->owner == vm.g_i); VM_CONDITIONAL(vm.g_sp->owner == vm.g_i);
continue; continue;
} }
@ -1444,15 +1449,16 @@ skip_check:
{ {
int32_t j; int32_t j;
DukePlayer_t *const ps = g_player[vm.g_p].ps;
if (g_player[vm.g_p].ps->newowner >= 0) if (ps->newowner >= 0)
G_ClearCameraView(g_player[vm.g_p].ps); G_ClearCameraView(ps);
j = sprite[g_player[vm.g_p].ps->i].extra; j = sprite[ps->i].extra;
if (vm.g_sp->picnum != ATOMICHEALTH) if (vm.g_sp->picnum != ATOMICHEALTH)
{ {
if (j > g_player[vm.g_p].ps->max_player_health && *insptr > 0) if (j > ps->max_player_health && *insptr > 0)
{ {
insptr++; insptr++;
continue; continue;
@ -1461,16 +1467,16 @@ skip_check:
{ {
if (j > 0) if (j > 0)
j += *insptr; j += *insptr;
if (j > g_player[vm.g_p].ps->max_player_health && *insptr > 0) if (j > ps->max_player_health && *insptr > 0)
j = g_player[vm.g_p].ps->max_player_health; j = ps->max_player_health;
} }
} }
else else
{ {
if (j > 0) if (j > 0)
j += *insptr; j += *insptr;
if (j > (g_player[vm.g_p].ps->max_player_health<<1)) if (j > (ps->max_player_health<<1))
j = (g_player[vm.g_p].ps->max_player_health<<1); j = (ps->max_player_health<<1);
} }
if (j < 0) j = 0; if (j < 0) j = 0;
@ -1479,14 +1485,14 @@ skip_check:
{ {
if (*insptr > 0) if (*insptr > 0)
{ {
if ((j - *insptr) < (g_player[vm.g_p].ps->max_player_health>>2) && if ((j - *insptr) < (ps->max_player_health>>2) &&
j >= (g_player[vm.g_p].ps->max_player_health>>2)) j >= (ps->max_player_health>>2))
A_PlaySound(DUKE_GOTHEALTHATLOW,g_player[vm.g_p].ps->i); A_PlaySound(DUKE_GOTHEALTHATLOW,ps->i);
g_player[vm.g_p].ps->last_extra = j; ps->last_extra = j;
} }
sprite[g_player[vm.g_p].ps->i].extra = j; sprite[ps->i].extra = j;
} }
} }
@ -3098,63 +3104,66 @@ nullquote:
continue; continue;
case CON_ADDINVENTORY: case CON_ADDINVENTORY:
{
DukePlayer_t *const ps = g_player[vm.g_p].ps;
insptr += 2; insptr += 2;
switch (*(insptr-1)) switch (*(insptr-1))
{ {
case GET_STEROIDS: case GET_STEROIDS:
g_player[vm.g_p].ps->inv_amount[GET_STEROIDS] = *insptr; ps->inv_amount[GET_STEROIDS] = *insptr;
g_player[vm.g_p].ps->inven_icon = 2; ps->inven_icon = 2;
break; break;
case GET_SHIELD: case GET_SHIELD:
g_player[vm.g_p].ps->inv_amount[GET_SHIELD] += *insptr;// 100; ps->inv_amount[GET_SHIELD] += *insptr;// 100;
if (g_player[vm.g_p].ps->inv_amount[GET_SHIELD] > g_player[vm.g_p].ps->max_shield_amount) if (ps->inv_amount[GET_SHIELD] > ps->max_shield_amount)
g_player[vm.g_p].ps->inv_amount[GET_SHIELD] = g_player[vm.g_p].ps->max_shield_amount; ps->inv_amount[GET_SHIELD] = ps->max_shield_amount;
break; break;
case GET_SCUBA: case GET_SCUBA:
g_player[vm.g_p].ps->inv_amount[GET_SCUBA] = *insptr;// 1600; ps->inv_amount[GET_SCUBA] = *insptr;// 1600;
g_player[vm.g_p].ps->inven_icon = 6; ps->inven_icon = 6;
break; break;
case GET_HOLODUKE: case GET_HOLODUKE:
g_player[vm.g_p].ps->inv_amount[GET_HOLODUKE] = *insptr;// 1600; ps->inv_amount[GET_HOLODUKE] = *insptr;// 1600;
g_player[vm.g_p].ps->inven_icon = 3; ps->inven_icon = 3;
break; break;
case GET_JETPACK: case GET_JETPACK:
g_player[vm.g_p].ps->inv_amount[GET_JETPACK] = *insptr;// 1600; ps->inv_amount[GET_JETPACK] = *insptr;// 1600;
g_player[vm.g_p].ps->inven_icon = 4; ps->inven_icon = 4;
break; break;
case GET_ACCESS: case GET_ACCESS:
switch (vm.g_sp->pal) switch (vm.g_sp->pal)
{ {
case 0: case 0:
g_player[vm.g_p].ps->got_access |= 1; ps->got_access |= 1;
break; break;
case 21: case 21:
g_player[vm.g_p].ps->got_access |= 2; ps->got_access |= 2;
break; break;
case 23: case 23:
g_player[vm.g_p].ps->got_access |= 4; ps->got_access |= 4;
break; break;
} }
break; break;
case GET_HEATS: case GET_HEATS:
g_player[vm.g_p].ps->inv_amount[GET_HEATS] = *insptr; ps->inv_amount[GET_HEATS] = *insptr;
g_player[vm.g_p].ps->inven_icon = 5; ps->inven_icon = 5;
break; break;
case GET_FIRSTAID: case GET_FIRSTAID:
g_player[vm.g_p].ps->inven_icon = 1; ps->inven_icon = 1;
g_player[vm.g_p].ps->inv_amount[GET_FIRSTAID] = *insptr; ps->inv_amount[GET_FIRSTAID] = *insptr;
break; break;
case GET_BOOTS: case GET_BOOTS:
g_player[vm.g_p].ps->inven_icon = 7; ps->inven_icon = 7;
g_player[vm.g_p].ps->inv_amount[GET_BOOTS] = *insptr; ps->inv_amount[GET_BOOTS] = *insptr;
break; break;
default: default:
OSD_Printf(CON_ERROR "Invalid inventory ID %d\n",g_errorLineNum,keyw[g_tw],(int32_t)*(insptr-1)); OSD_Printf(CON_ERROR "Invalid inventory ID %d\n",g_errorLineNum,keyw[g_tw],(int32_t)*(insptr-1));
@ -3162,6 +3171,7 @@ nullquote:
} }
insptr++; insptr++;
continue; continue;
}
case CON_HITRADIUSVAR: case CON_HITRADIUSVAR:
insptr++; insptr++;
@ -3181,14 +3191,15 @@ nullquote:
{ {
int32_t l = *(++insptr); int32_t l = *(++insptr);
int32_t j = 0; int32_t j = 0;
int32_t s = sprite[g_player[vm.g_p].ps->i].xvel; DukePlayer_t *const ps = g_player[vm.g_p].ps;
int32_t s = sprite[ps->i].xvel;
if ((l&8) && g_player[vm.g_p].ps->on_ground && TEST_SYNC_KEY(g_player[vm.g_p].sync->bits, SK_CROUCH)) if ((l&8) && ps->on_ground && TEST_SYNC_KEY(g_player[vm.g_p].sync->bits, SK_CROUCH))
j = 1; j = 1;
else if ((l&16) && g_player[vm.g_p].ps->jumping_counter == 0 && !g_player[vm.g_p].ps->on_ground && else if ((l&16) && ps->jumping_counter == 0 && !ps->on_ground &&
g_player[vm.g_p].ps->vel.z > 2048) ps->vel.z > 2048)
j = 1; j = 1;
else if ((l&32) && g_player[vm.g_p].ps->jumping_counter > 348) else if ((l&32) && ps->jumping_counter > 348)
j = 1; j = 1;
else if ((l&1) && s >= 0 && s < 8) else if ((l&1) && s >= 0 && s < 8)
j = 1; j = 1;
@ -3196,32 +3207,32 @@ nullquote:
j = 1; j = 1;
else if ((l&4) && s >= 8 && TEST_SYNC_KEY(g_player[vm.g_p].sync->bits, SK_RUN)) else if ((l&4) && s >= 8 && TEST_SYNC_KEY(g_player[vm.g_p].sync->bits, SK_RUN))
j = 1; j = 1;
else if ((l&64) && g_player[vm.g_p].ps->pos.z < (vm.g_sp->z-(48<<8))) else if ((l&64) && ps->pos.z < (vm.g_sp->z-(48<<8)))
j = 1; j = 1;
else if ((l&128) && s <= -8 && !TEST_SYNC_KEY(g_player[vm.g_p].sync->bits, SK_RUN)) else if ((l&128) && s <= -8 && !TEST_SYNC_KEY(g_player[vm.g_p].sync->bits, SK_RUN))
j = 1; j = 1;
else if ((l&256) && s <= -8 && TEST_SYNC_KEY(g_player[vm.g_p].sync->bits, SK_RUN)) else if ((l&256) && s <= -8 && TEST_SYNC_KEY(g_player[vm.g_p].sync->bits, SK_RUN))
j = 1; j = 1;
else if ((l&512) && (g_player[vm.g_p].ps->quick_kick > 0 || (g_player[vm.g_p].ps->curr_weapon == KNEE_WEAPON && g_player[vm.g_p].ps->kickback_pic > 0))) else if ((l&512) && (ps->quick_kick > 0 || (ps->curr_weapon == KNEE_WEAPON && ps->kickback_pic > 0)))
j = 1; j = 1;
else if ((l&1024) && sprite[g_player[vm.g_p].ps->i].xrepeat < 32) else if ((l&1024) && sprite[ps->i].xrepeat < 32)
j = 1; j = 1;
else if ((l&2048) && g_player[vm.g_p].ps->jetpack_on) else if ((l&2048) && ps->jetpack_on)
j = 1; j = 1;
else if ((l&4096) && g_player[vm.g_p].ps->inv_amount[GET_STEROIDS] > 0 && g_player[vm.g_p].ps->inv_amount[GET_STEROIDS] < 400) else if ((l&4096) && ps->inv_amount[GET_STEROIDS] > 0 && ps->inv_amount[GET_STEROIDS] < 400)
j = 1; j = 1;
else if ((l&8192) && g_player[vm.g_p].ps->on_ground) else if ((l&8192) && ps->on_ground)
j = 1; j = 1;
else if ((l&16384) && sprite[g_player[vm.g_p].ps->i].xrepeat > 32 && sprite[g_player[vm.g_p].ps->i].extra > 0 && g_player[vm.g_p].ps->timebeforeexit == 0) else if ((l&16384) && sprite[ps->i].xrepeat > 32 && sprite[ps->i].extra > 0 && ps->timebeforeexit == 0)
j = 1; j = 1;
else if ((l&32768) && sprite[g_player[vm.g_p].ps->i].extra <= 0) else if ((l&32768) && sprite[ps->i].extra <= 0)
j = 1; j = 1;
else if ((l&65536L)) else if ((l&65536L))
{ {
if (vm.g_sp->picnum == APLAYER && (g_netServer || ud.multimode > 1)) if (vm.g_sp->picnum == APLAYER && (g_netServer || ud.multimode > 1))
j = G_GetAngleDelta(g_player[otherp].ps->ang,getangle(g_player[vm.g_p].ps->pos.x-g_player[otherp].ps->pos.x,g_player[vm.g_p].ps->pos.y-g_player[otherp].ps->pos.y)); j = G_GetAngleDelta(g_player[otherp].ps->ang,getangle(ps->pos.x-g_player[otherp].ps->pos.x,ps->pos.y-g_player[otherp].ps->pos.y));
else else
j = G_GetAngleDelta(g_player[vm.g_p].ps->ang,getangle(vm.g_sp->x-g_player[vm.g_p].ps->pos.x,vm.g_sp->y-g_player[vm.g_p].ps->pos.y)); j = G_GetAngleDelta(ps->ang,getangle(vm.g_sp->x-ps->pos.x,vm.g_sp->y-ps->pos.y));
if (j > -128 && j < 128) if (j > -128 && j < 128)
j = 1; j = 1;
@ -4724,47 +4735,49 @@ nullquote:
insptr++; insptr++;
{ {
int32_t j = 0; int32_t j = 0;
DukePlayer_t *const ps = g_player[vm.g_p].ps;
switch (*insptr++) switch (*insptr++)
{ {
case GET_STEROIDS: case GET_STEROIDS:
if (g_player[vm.g_p].ps->inv_amount[GET_STEROIDS] != *insptr) if (ps->inv_amount[GET_STEROIDS] != *insptr)
j = 1; j = 1;
break; break;
case GET_SHIELD: case GET_SHIELD:
if (g_player[vm.g_p].ps->inv_amount[GET_SHIELD] != g_player[vm.g_p].ps->max_shield_amount) if (ps->inv_amount[GET_SHIELD] != ps->max_shield_amount)
j = 1; j = 1;
break; break;
case GET_SCUBA: case GET_SCUBA:
if (g_player[vm.g_p].ps->inv_amount[GET_SCUBA] != *insptr) j = 1; if (ps->inv_amount[GET_SCUBA] != *insptr) j = 1;
break; break;
case GET_HOLODUKE: case GET_HOLODUKE:
if (g_player[vm.g_p].ps->inv_amount[GET_HOLODUKE] != *insptr) j = 1; if (ps->inv_amount[GET_HOLODUKE] != *insptr) j = 1;
break; break;
case GET_JETPACK: case GET_JETPACK:
if (g_player[vm.g_p].ps->inv_amount[GET_JETPACK] != *insptr) j = 1; if (ps->inv_amount[GET_JETPACK] != *insptr) j = 1;
break; break;
case GET_ACCESS: case GET_ACCESS:
switch (vm.g_sp->pal) switch (vm.g_sp->pal)
{ {
case 0: case 0:
if (g_player[vm.g_p].ps->got_access&1) j = 1; if (ps->got_access&1) j = 1;
break; break;
case 21: case 21:
if (g_player[vm.g_p].ps->got_access&2) j = 1; if (ps->got_access&2) j = 1;
break; break;
case 23: case 23:
if (g_player[vm.g_p].ps->got_access&4) j = 1; if (ps->got_access&4) j = 1;
break; break;
} }
break; break;
case GET_HEATS: case GET_HEATS:
if (g_player[vm.g_p].ps->inv_amount[GET_HEATS] != *insptr) j = 1; if (ps->inv_amount[GET_HEATS] != *insptr) j = 1;
break; break;
case GET_FIRSTAID: case GET_FIRSTAID:
if (g_player[vm.g_p].ps->inv_amount[GET_FIRSTAID] != *insptr) j = 1; if (ps->inv_amount[GET_FIRSTAID] != *insptr) j = 1;
break; break;
case GET_BOOTS: case GET_BOOTS:
if (g_player[vm.g_p].ps->inv_amount[GET_BOOTS] != *insptr) j = 1; if (ps->inv_amount[GET_BOOTS] != *insptr) j = 1;
break; break;
default: default:
OSD_Printf(CON_ERROR "invalid inventory ID: %d\n",g_errorLineNum,keyw[g_tw],(int32_t)*(insptr-1)); OSD_Printf(CON_ERROR "invalid inventory ID: %d\n",g_errorLineNum,keyw[g_tw],(int32_t)*(insptr-1));
@ -4776,25 +4789,32 @@ nullquote:
case CON_PSTOMP: case CON_PSTOMP:
insptr++; insptr++;
if (g_player[vm.g_p].ps->knee_incs == 0 && sprite[g_player[vm.g_p].ps->i].xrepeat >= 40) {
if (cansee(vm.g_sp->x,vm.g_sp->y,vm.g_sp->z-(4<<8),vm.g_sp->sectnum,g_player[vm.g_p].ps->pos.x, DukePlayer_t *const ps = g_player[vm.g_p].ps;
g_player[vm.g_p].ps->pos.y,g_player[vm.g_p].ps->pos.z+(16<<8),sprite[g_player[vm.g_p].ps->i].sectnum))
{ if (ps->knee_incs == 0 && sprite[ps->i].xrepeat >= 40)
int32_t j = playerswhenstarted-1; if (cansee(vm.g_sp->x,vm.g_sp->y,vm.g_sp->z-(4<<8),vm.g_sp->sectnum,ps->pos.x,
for (; j>=0; j--) ps->pos.y,ps->pos.z+(16<<8),sprite[ps->i].sectnum))
{ {
if (g_player[j].ps->actorsqu == vm.g_i) int32_t j = playerswhenstarted-1;
break;
for (; j>=0; j--)
{
if (g_player[j].ps->actorsqu == vm.g_i)
break;
}
if (j == -1)
{
ps->knee_incs = 1;
if (ps->weapon_pos == 0)
ps->weapon_pos = -1;
ps->actorsqu = vm.g_i;
}
} }
if (j == -1)
{ continue;
g_player[vm.g_p].ps->knee_incs = 1; }
if (g_player[vm.g_p].ps->weapon_pos == 0)
g_player[vm.g_p].ps->weapon_pos = -1;
g_player[vm.g_p].ps->actorsqu = vm.g_i;
}
}
continue;
case CON_IFAWAYFROMWALL: case CON_IFAWAYFROMWALL:
{ {

892
polymer/eduke32/source/gamestructures.c
View file

File diff suppressed because it is too large Load diff

9
polymer/eduke32/source/sector.c
View file

@ -233,7 +233,8 @@ int32_t __fastcall A_FindPlayer(spritetype *s, int32_t *d)
{ {
if ((!g_netServer && ud.multimode < 2)) if ((!g_netServer && ud.multimode < 2))
{ {
*d = klabs(g_player[myconnectindex].ps->opos.x-s->x) + klabs(g_player[myconnectindex].ps->opos.y-s->y) + ((klabs(g_player[myconnectindex].ps->opos.z-s->z+(28<<8)))>>4); DukePlayer_t *const myps = g_player[myconnectindex].ps;
*d = klabs(myps->opos.x-s->x) + klabs(myps->opos.y-s->y) + ((klabs(myps->opos.z-s->z+(28<<8)))>>4);
return myconnectindex; return myconnectindex;
} }
@ -243,8 +244,10 @@ int32_t __fastcall A_FindPlayer(spritetype *s, int32_t *d)
for (TRAVERSE_CONNECT(j)) for (TRAVERSE_CONNECT(j))
{ {
x = klabs(g_player[j].ps->opos.x-s->x) + klabs(g_player[j].ps->opos.y-s->y) + ((klabs(g_player[j].ps->opos.z-s->z+(28<<8)))>>4); DukePlayer_t *const ps = g_player[j].ps;
if (x < closest && sprite[g_player[j].ps->i].extra > 0)
x = klabs(ps->opos.x-s->x) + klabs(ps->opos.y-s->y) + ((klabs(ps->opos.z-s->z+(28<<8)))>>4);
if (x < closest && sprite[ps->i].extra > 0)
{ {
closest_player = j; closest_player = j;
closest = x; closest = x;