zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-28 22:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- use owner wrappers in spawn code.

Browse source
This commit is contained in:
Christoph Oelckers 2020-11-02 23:53:22 +01:00
parent 24cfd841f2
commit 212b99d0f3
2 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/games/duke/src/spawn_d.cpp
View file

@ -115,7 +115,7 @@ int spawn_d(int j, int pn)
} }
return i; return i;
case FIREFLYFLYINGEFFECT: case FIREFLYFLYINGEFFECT:
sp->owner = j; act->SetOwner(actj);
changespritestat(i, STAT_MISC); changespritestat(i, STAT_MISC);
sp->xrepeat = 16; sp->xrepeat = 16;
sp->yrepeat = 16; sp->yrepeat = 16;
@ -123,8 +123,8 @@ int spawn_d(int j, int pn)
case LAVAPOOLBUBBLE: case LAVAPOOLBUBBLE:
if (spj->xrepeat < 30) if (spj->xrepeat < 30)
return i; return i;
sp->owner = j; act->SetOwner(actj);
changespritestat(i, STAT_MISC); changespritestat(i, STAT_MISC);
sp->x += krand() % 512 - 256; sp->x += krand() % 512 - 256;
sp->y += krand() % 512 - 256; sp->y += krand() % 512 - 256;
sp->xrepeat = 16; sp->xrepeat = 16;
@ -338,8 +338,8 @@ int spawn_d(int j, int pn)
sp->xrepeat=4; sp->xrepeat=4;
sp->yrepeat=5; sp->yrepeat=5;
sp->owner = i; act->SetOwner(act);
sp->hitag = i; sp->hitag = i; // hijack
sp->xvel = 16; sp->xvel = 16;
ssp(act, CLIPMASK0); ssp(act, CLIPMASK0);
@ -561,7 +561,7 @@ int spawn_d(int j, int pn)
case VIEWSCREEN: case VIEWSCREEN:
case VIEWSCREEN2: case VIEWSCREEN2:
sp->owner = i; act->SetOwner(act);
sp->lotag = 1; sp->lotag = 1;
sp->extra = 1; sp->extra = 1;
changespritestat(i,6); changespritestat(i,6);
@ -935,9 +935,9 @@ int spawn_d(int j, int pn)
break; break;
case HEAVYHBOMB: case HEAVYHBOMB:
if(j >= 0) if(j >= 0) act->SetOwner(actj);
sp->owner = j; else act->SetOwner(act);
else sp->owner = i;
sp->xrepeat = sp->yrepeat = 9; sp->xrepeat = sp->yrepeat = 9;
sp->yvel = 4; sp->yvel = 4;
case REACTOR2: case REACTOR2:
@ -992,7 +992,7 @@ int spawn_d(int j, int pn)
} }
else else
{ {
sp->owner = i; act->SetOwner(act);
sp->cstat = 0; sp->cstat = 0;
} }
@ -1043,21 +1043,21 @@ int spawn_d(int j, int pn)
case BOX: case BOX:
sp->cstat = 257; // Make it hitable sp->cstat = 257; // Make it hitable
sp->extra = 1; sp->extra = 1;
changespritestat(i,6); changespritestat(act, STAT_STANDABLE);
break; break;
case FLOORFLAME: case FLOORFLAME:
sp->shade = -127; sp->shade = -127;
changespritestat(i,6); changespritestat(act, STAT_STANDABLE);
break; break;
case BOUNCEMINE: case BOUNCEMINE:
sp->owner = i; act->SetOwner(act);
sp->cstat |= 1+256; //Make it hitable sp->cstat |= 1+256; //Make it hitable
sp->xrepeat = sp->yrepeat = 24; sp->xrepeat = sp->yrepeat = 24;
sp->shade = -127; sp->shade = -127;
sp->extra = impact_damage<<2; sp->extra = impact_damage<<2;
changespritestat(i,2); changespritestat(act, STAT_ZOMBIEACTOR);
break; break;
case CAMERA1: case CAMERA1:
@ -1114,9 +1114,9 @@ int spawn_d(int j, int pn)
} }
else sp->cstat = 1+256; else sp->cstat = 1+256;
sp->extra = impact_damage<<2; sp->extra = impact_damage<<2;
sp->owner = i; act->SetOwner(act);
changespritestat(i,6); changespritestat(act, STAT_STANDABLE);
break; break;
case CRACK1: case CRACK1:

27
source/games/duke/src/spawn_r.cpp
View file

@ -154,17 +154,17 @@ int spawn_r(int j, int pn)
if (!isRRRA()) goto default_case; if (!isRRRA()) goto default_case;
sp->lotag = 1; sp->lotag = 1;
sp->clipdist = 0; sp->clipdist = 0;
sp->owner = i; act->SetOwner(act);
sp->extra = 0; sp->extra = 0;
changespritestat(i,115); changespritestat(act,115);
break; break;
case RRTILE8593: case RRTILE8593:
if (!isRRRA()) goto default_case; if (!isRRRA()) goto default_case;
sp->lotag = 1; sp->lotag = 1;
sp->clipdist = 0; sp->clipdist = 0;
sp->owner = i; act->SetOwner(act);
sp->extra = 0; sp->extra = 0;
changespritestat(i,122); changespritestat(act,122);
break; break;
case RRTILE285: case RRTILE285:
case RRTILE286: case RRTILE286:
@ -1100,7 +1100,7 @@ int spawn_r(int j, int pn)
break; break;
case HEAVYHBOMB: case HEAVYHBOMB:
sp->owner = i; act->SetOwner(act);
sp->xrepeat = sp->yrepeat = 9; sp->xrepeat = sp->yrepeat = 9;
sp->yvel = 4; sp->yvel = 4;
case REACTOR2: case REACTOR2:
@ -1165,7 +1165,7 @@ int spawn_r(int j, int pn)
} }
else else
{ {
sp->owner = i; act->SetOwner(act);
sp->cstat = 0; sp->cstat = 0;
} }
@ -1375,9 +1375,8 @@ int spawn_r(int j, int pn)
} }
else sp->cstat = 1+256; else sp->cstat = 1+256;
sp->extra = impact_damage<<2; sp->extra = impact_damage<<2;
sp->owner = i; act->SetOwner(act);
changespritestat(act, STAT_STANDABLE);
changespritestat(i,6);
break; break;
case CRACK1: case CRACK1:
@ -1394,8 +1393,8 @@ int spawn_r(int j, int pn)
} }
sp->pal = 0; sp->pal = 0;
sp->owner = i; act->SetOwner(act);
changespritestat(i,6); changespritestat(act, STAT_STANDABLE);
sp->xvel = 8; sp->xvel = 8;
ssp(act, CLIPMASK0); ssp(act, CLIPMASK0);
break; break;
@ -1411,10 +1410,10 @@ int spawn_r(int j, int pn)
sp->xrepeat = 18; sp->xrepeat = 18;
sp->yrepeat = 18; sp->yrepeat = 18;
sp->clipdist = mulscale7(sp->xrepeat,tilesiz[sp->picnum].x); sp->clipdist = mulscale7(sp->xrepeat,tilesiz[sp->picnum].x);
sp->owner = 100; act->saved_ammo = 100;
sp->cstat = 257; sp->cstat = 257;
sp->lotag = 1; sp->lotag = 1;
changespritestat(i,1); changespritestat(act, STAT_ACTOR);
break; break;
case EMPTYBOAT: case EMPTYBOAT:
if (!isRRRA()) goto default_case; if (!isRRRA()) goto default_case;
@ -1427,7 +1426,7 @@ int spawn_r(int j, int pn)
sp->xrepeat = 32; sp->xrepeat = 32;
sp->yrepeat = 32; sp->yrepeat = 32;
sp->clipdist = mulscale7(sp->xrepeat,tilesiz[sp->picnum].x); sp->clipdist = mulscale7(sp->xrepeat,tilesiz[sp->picnum].x);
sp->owner = 20; act->saved_ammo = 20;
sp->cstat = 257; sp->cstat = 257;
sp->lotag = 1; sp->lotag = 1;
changespritestat(i,1); changespritestat(i,1);