zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 17:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Init SobjGun

Browse source
This commit is contained in:
Christoph Oelckers 2021-11-04 00:38:02 +01:00
parent 2c0a597f06
commit 60d5490654
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
source/games/sw/src/weapon.cpp
View file

@ -11308,20 +11308,13 @@ AddSpriteToSectorObject(short SpriteNum, SECTOR_OBJECTp sop)
} }
int int
SpawnBigGunFlames(int16_t Weapon, int16_t Operator, SECTOR_OBJECTp sop) SpawnBigGunFlames(int16_t Weapon, int16_t Operator, SECTOR_OBJECTp sop, bool smallflames)
{ {
SPRITEp sp; SPRITEp sp;
USERp u; USERp u;
SPRITEp exp; SPRITEp exp;
USERp eu; USERp eu;
unsigned sn; unsigned sn;
bool smallflames = false;
if (Weapon < 0)
{
Weapon = abs(Weapon);
smallflames = true;
}
sp = &sprite[Weapon]; sp = &sprite[Weapon];
u = User[Weapon].Data(); u = User[Weapon].Data();
@ -18153,8 +18146,7 @@ InitSobjMachineGun(short SpriteNum, PLAYERp pp)
return 0; return 0;
} }
int int InitSobjGun(PLAYERp pp)
InitSobjGun(PLAYERp pp)
{ {
short i; short i;
SPRITEp sp; SPRITEp sp;
@ -18192,9 +18184,9 @@ InitSobjGun(PLAYERp pp)
case 32: case 32:
case 0: case 0:
SpawnVis(actor, -1, -1, -1, -1, 8); SpawnVis(actor, -1, -1, -1, -1, 8);
SpawnBigGunFlames(short(sp - sprite), pp->PlayerSprite, pp->sop); SpawnBigGunFlames(actor->GetSpriteIndex(), pp->PlayerSprite, pp->sop, false);
SetGunQuake(short(sp - sprite)); SetGunQuake(actor->GetSpriteIndex());
InitTankShell(short(sp - sprite), pp); InitTankShell(actor->GetSpriteIndex(), pp);
if (!SP_TAG5(sp)) if (!SP_TAG5(sp))
pp->FirePause = 80; pp->FirePause = 80;
else else
@ -18202,8 +18194,8 @@ InitSobjGun(PLAYERp pp)
break; break;
case 1: case 1:
SpawnVis(actor, -1, -1, -1, -1, 32); SpawnVis(actor, -1, -1, -1, -1, 32);
SpawnBigGunFlames(-short(sp - sprite), pp->PlayerSprite, pp->sop); SpawnBigGunFlames(actor->GetSpriteIndex(), pp->PlayerSprite, pp->sop, true);
InitSobjMachineGun(short(sp - sprite), pp); InitSobjMachineGun(actor->GetSpriteIndex(), pp);
if (!SP_TAG5(sp)) if (!SP_TAG5(sp))
pp->FirePause = 10; pp->FirePause = 10;
else else
@ -18212,7 +18204,7 @@ InitSobjGun(PLAYERp pp)
case 2: case 2:
if (SW_SHAREWARE) break; if (SW_SHAREWARE) break;
SpawnVis(actor, -1, -1, -1, -1, 32); SpawnVis(actor, -1, -1, -1, -1, 32);
InitTurretLaser(short(sp - sprite), pp); InitTurretLaser(actor->GetSpriteIndex(), pp);
if (!SP_TAG5(sp)) if (!SP_TAG5(sp))
pp->FirePause = 120; pp->FirePause = 120;
else else
@ -18221,7 +18213,7 @@ InitSobjGun(PLAYERp pp)
case 3: case 3:
if (SW_SHAREWARE) break; if (SW_SHAREWARE) break;
SpawnVis(actor, -1, -1, -1, -1, 32); SpawnVis(actor, -1, -1, -1, -1, 32);
InitTurretRail(short(sp - sprite), pp); InitTurretRail(actor->GetSpriteIndex(), pp);
if (!SP_TAG5(sp)) if (!SP_TAG5(sp))
pp->FirePause = 120; pp->FirePause = 120;
else else
@ -18230,7 +18222,7 @@ InitSobjGun(PLAYERp pp)
case 4: case 4:
if (SW_SHAREWARE) break; if (SW_SHAREWARE) break;
SpawnVis(actor, -1, -1, -1, -1, 32); SpawnVis(actor, -1, -1, -1, -1, 32);
InitTurretFireball(short(sp - sprite), pp); InitTurretFireball(actor->GetSpriteIndex(), pp);
if (!SP_TAG5(sp)) if (!SP_TAG5(sp))
pp->FirePause = 20; pp->FirePause = 20;
else else
@ -18239,7 +18231,7 @@ InitSobjGun(PLAYERp pp)
case 5: case 5:
if (SW_SHAREWARE) break; if (SW_SHAREWARE) break;
SpawnVis(actor, -1, -1, -1, -1, 32); SpawnVis(actor, -1, -1, -1, -1, 32);
InitTurretRocket(short(sp - sprite), pp); InitTurretRocket(actor->GetSpriteIndex(), pp);
if (!SP_TAG5(sp)) if (!SP_TAG5(sp))
pp->FirePause = 100; pp->FirePause = 100;
else else
@ -18248,7 +18240,7 @@ InitSobjGun(PLAYERp pp)
case 6: case 6:
if (SW_SHAREWARE) break; if (SW_SHAREWARE) break;
SpawnVis(actor, -1, -1, -1, -1, 32); SpawnVis(actor, -1, -1, -1, -1, 32);
InitTurretMicro(short(sp - sprite), pp); InitTurretMicro(actor->GetSpriteIndex(), pp);
if (!SP_TAG5(sp)) if (!SP_TAG5(sp))
pp->FirePause = 100; pp->FirePause = 100;
else else