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

- the remaining SpawnActor calls.

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-22 22:10:26 +02:00
parent 80f019c429
commit 12b238b2bf
2 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16249,18 +16249,12 @@ int InitGrenade(PLAYER* pp)
int InitSpriteGrenade(DSWActor* actor) int InitSpriteGrenade(DSWActor* actor)
{ {
int nx, ny, nz;
PlaySound(DIGI_30MMFIRE, actor, v3df_dontpan|v3df_doppler); PlaySound(DIGI_30MMFIRE, actor, v3df_dontpan|v3df_doppler);
nx = actor->int_pos().X;
ny = actor->int_pos().Y;
nz = actor->int_pos().Z - Z(40);
// Spawn a shot // Spawn a shot
// Inserting and setting up variables // Inserting and setting up variables
auto actorNew = SpawnActor(STAT_MISSILE, GRENADE, &s_Grenade[0][0], actor->sector(), auto actorNew = SpawnActor(STAT_MISSILE, GRENADE, &s_Grenade[0][0], actor->sector(),
nx, ny, nz, actor->int_ang(), GRENADE_VELOCITY); actor->spr.pos.plusZ(-40), actor->spr.angle, GRENADE_VELOCITY);
actorNew->user.RotNum = 5; actorNew->user.RotNum = 5;
NewStateGroup(actorNew, &sg_Grenade[0]); NewStateGroup(actorNew, &sg_Grenade[0]);
@ -16375,8 +16369,7 @@ int InitEnemyMine(DSWActor* actor)
// Spawn a shot // Spawn a shot
// Inserting and setting up variables // Inserting and setting up variables
auto actorNew = SpawnActor(STAT_MISSILE, MINE, s_Mine, actor->sector(), auto actorNew = SpawnActor(STAT_MISSILE, MINE, s_Mine, actor->sector(), actor->spr.pos.plusZ(-40), actor->spr.angle, MINE_VELOCITY);
nx, ny, nz, actor->int_ang(), MINE_VELOCITY);
SetOwner(actor, actorNew); SetOwner(actor, actorNew);
actorNew->spr.yrepeat = 32; actorNew->spr.yrepeat = 32;
@ -16972,7 +16965,7 @@ DSWActor* SpawnBubble(DSWActor* actor)
if (Prediction) if (Prediction)
return nullptr; return nullptr;
auto actorNew = SpawnActor(STAT_MISSILE, BUBBLE, s_Bubble, actor->sector(), actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, actor->int_ang(), 0); auto actorNew = SpawnActor(STAT_MISSILE, BUBBLE, s_Bubble, actor->sector(), actor->spr.pos, actor->spr.angle, 0);
actorNew->spr.xrepeat = 8 + (RANDOM_P2(8 << 8) >> 8); actorNew->spr.xrepeat = 8 + (RANDOM_P2(8 << 8) >> 8);
actorNew->spr.yrepeat = actorNew->spr.xrepeat; actorNew->spr.yrepeat = actorNew->spr.xrepeat;
@ -17009,8 +17002,7 @@ int SpawnVehicleSmoke(DSWActor* actor)
if (MoveSkip2 != 0) if (MoveSkip2 != 0)
return false; return false;
auto actorNew = SpawnActor(STAT_MISSILE, PUFF, s_VehicleSmoke, actor->sector(), auto actorNew = SpawnActor(STAT_MISSILE, PUFF, s_VehicleSmoke, actor->sector(), actor->spr.pos.plusZ(-RANDOM_P2F(8, 8)), actor->spr.angle, 0);
actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z - RANDOM_P2(Z(8)), actor->int_ang(), 0);
actorNew->user.WaitTics = 1*120; actorNew->user.WaitTics = 1*120;
actorNew->spr.shade = -40; actorNew->spr.shade = -40;
@ -17035,8 +17027,7 @@ int SpawnVehicleSmoke(DSWActor* actor)
int SpawnSmokePuff(DSWActor* actor) int SpawnSmokePuff(DSWActor* actor)
{ {
auto actorNew = SpawnActor(STAT_MISSILE, PUFF, s_WaterSmoke, actor->sector(), auto actorNew = SpawnActor(STAT_MISSILE, PUFF, s_WaterSmoke, actor->sector(), actor->spr.pos.plusZ(-RANDOM_P2F(8, 8)), actor->spr.angle, 0);
actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z - RANDOM_P2(Z(8)), actor->int_ang(), 0);
actorNew->user.WaitTics = 1*120; actorNew->user.WaitTics = 1*120;
actorNew->spr.shade = -40; actorNew->spr.shade = -40;
@ -17329,7 +17320,7 @@ int QueueFloorBlood(DSWActor* actor)
KillActor(FloorBloodQueue[FloorBloodQueueHead]); KillActor(FloorBloodQueue[FloorBloodQueueHead]);
FloorBloodQueue[FloorBloodQueueHead] = spawnedActor = FloorBloodQueue[FloorBloodQueueHead] = spawnedActor =
SpawnActor(STAT_SKIP4, FLOORBLOOD1, s_FloorBlood1, actor->sector(), actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, actor->int_ang(), 0); SpawnActor(STAT_SKIP4, FLOORBLOOD1, s_FloorBlood1, actor->sector(), actor->spr.pos, actor->spr.angle, 0);
FloorBloodQueueHead = (FloorBloodQueueHead+1) & (MAX_FLOORBLOOD_QUEUE-1); FloorBloodQueueHead = (FloorBloodQueueHead+1) & (MAX_FLOORBLOOD_QUEUE-1);
@ -17422,13 +17413,13 @@ int QueueFootPrint(DSWActor* actor)
if (rnd_num > 683) if (rnd_num > 683)
FloorBloodQueue[FloorBloodQueueHead] = spawnedActor = FloorBloodQueue[FloorBloodQueueHead] = spawnedActor =
SpawnActor(STAT_WALLBLOOD_QUEUE, FOOTPRINT1, s_FootPrint1, actor->sector(), actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, actor->int_ang(), 0); SpawnActor(STAT_WALLBLOOD_QUEUE, FOOTPRINT1, s_FootPrint1, actor->sector(), actor->spr.pos, actor->spr.angle, 0);
else if (rnd_num > 342) else if (rnd_num > 342)
FloorBloodQueue[FloorBloodQueueHead] = spawnedActor = FloorBloodQueue[FloorBloodQueueHead] = spawnedActor =
SpawnActor(STAT_WALLBLOOD_QUEUE, FOOTPRINT2, s_FootPrint2, actor->sector(), actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, actor->int_ang(), 0); SpawnActor(STAT_WALLBLOOD_QUEUE, FOOTPRINT2, s_FootPrint2, actor->sector(), actor->spr.pos, actor->spr.angle, 0);
else else
FloorBloodQueue[FloorBloodQueueHead] = spawnedActor = FloorBloodQueue[FloorBloodQueueHead] = spawnedActor =
SpawnActor(STAT_WALLBLOOD_QUEUE, FOOTPRINT3, s_FootPrint3, actor->sector(), actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, actor->int_ang(), 0); SpawnActor(STAT_WALLBLOOD_QUEUE, FOOTPRINT3, s_FootPrint3, actor->sector(), actor->spr.pos, actor->spr.angle, 0);
FloorBloodQueueHead = (FloorBloodQueueHead+1) & (MAX_FLOORBLOOD_QUEUE-1); FloorBloodQueueHead = (FloorBloodQueueHead+1) & (MAX_FLOORBLOOD_QUEUE-1);
@ -18192,8 +18183,7 @@ void QueueLoWangs(DSWActor* actor)
if (LoWangsQueue[LoWangsQueueHead] == nullptr) if (LoWangsQueue[LoWangsQueueHead] == nullptr)
{ {
LoWangsQueue[LoWangsQueueHead] = spawnedActor = LoWangsQueue[LoWangsQueueHead] = spawnedActor =
SpawnActor(STAT_GENERIC_QUEUE, actor->spr.picnum, s_DeadLoWang, actor->sector(), SpawnActor(STAT_GENERIC_QUEUE, actor->spr.picnum, s_DeadLoWang, actor->sector(), actor->spr.pos, actor->spr.angle, 0);
actor->int_pos().X, actor->int_pos().Y, actor->int_pos().Z, actor->int_ang(), 0);
} }
else else
{ {

2
source/games/sw/src/zombie.cpp
View file

@ -776,7 +776,7 @@ void SpawnZombie(PLAYER* pp, DSWActor* weaponActor)
if (ownerActor == nullptr) if (ownerActor == nullptr)
return; return;
auto actorNew = SpawnActor(STAT_ENEMY, ZOMBIE_RUN_R0, s_ZombieRun[0], pp->cursector, pp->int_ppos().X, pp->int_ppos().Y, pp->int_ppos().Z, pp->angle.ang.Buildang(), 0); auto actorNew = SpawnActor(STAT_ENEMY, ZOMBIE_RUN_R0, s_ZombieRun[0], pp->cursector, pp->pos, pp->angle.ang, 0);
SetOwner(actorNew, ownerActor); SetOwner(actorNew, ownerActor);
actorNew->spr.pal = actorNew->user.spal = ownerActor->user.spal; actorNew->spr.pal = actorNew->user.spal = ownerActor->user.spal;
actorNew->spr.angle = RANDOM_ANGLE(); actorNew->spr.angle = RANDOM_ANGLE();