From c4e388ef567141a94fa42c31237c04f8ab150cf2 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 24 Nov 2021 23:22:36 +0100 Subject: [PATCH] - merged SpawnActor wrapper. --- source/games/sw/src/sprite.cpp | 6 +++--- source/games/sw/src/sprite.h | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/source/games/sw/src/sprite.cpp b/source/games/sw/src/sprite.cpp index e6a92c8a7..6c5bc688f 100644 --- a/source/games/sw/src/sprite.cpp +++ b/source/games/sw/src/sprite.cpp @@ -917,17 +917,17 @@ USERp SpawnUser(DSWActor* actor, short id, STATEp state) return u; } -DSWActor* SpawnActor(short stat, short id, STATEp state, short sectnum, int x, int y, int z, int init_ang, int vel) +DSWActor* SpawnActor(int stat, int id, STATEp state, sectortype* sect, int x, int y, int z, int init_ang, int vel) { SPRITEp sp; USERp u; - if (sectnum < 0) + if (sect == nullptr) return nullptr; ASSERT(!Prediction); - auto spawnedActor = InsertActor(sectnum, stat); + auto spawnedActor = InsertActor(sect, stat); sp = &spawnedActor->s(); diff --git a/source/games/sw/src/sprite.h b/source/games/sw/src/sprite.h index f75b56610..4946ac25b 100644 --- a/source/games/sw/src/sprite.h +++ b/source/games/sw/src/sprite.h @@ -31,11 +31,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms BEGIN_SW_NS void KillActor(DSWActor* actor); -DSWActor* SpawnActor(short stat, short id, STATEp state, short sectnum, int x, int y, int z, int ang, int vel); -DSWActor* SpawnActor(short stat, short id, STATEp state, sectortype* sect, int x, int y, int z, int ang, int vel) -{ - return SpawnActor(stat, id, state, sectnum(sect), x, y, z, ang, vel); -} +DSWActor* SpawnActor(int stat, int id, STATEp state, sectortype* sect, int x, int y, int z, int ang, int vel); void SpriteSetup(void); int move_actor(DSWActor* actor, int xchange, int ychange, int zchange);