From b234565f65700fda512e441b5ba762d5b926f3e9 Mon Sep 17 00:00:00 2001 From: ephphatha Date: Sat, 30 Jul 2022 22:25:10 +1000 Subject: [PATCH] Inline functions which only set Object::_oRndSeed --- Source/objects.cpp | 48 +++++----------------------------------------- 1 file changed, 5 insertions(+), 43 deletions(-) diff --git a/Source/objects.cpp b/Source/objects.cpp index 837d99565..75f6dce86 100644 --- a/Source/objects.cpp +++ b/Source/objects.cpp @@ -1177,16 +1177,6 @@ void AddBookcase(Object &bookcase) bookcase._oPreFlag = true; } -void AddBookstand(Object &bookstand) -{ - bookstand._oRndSeed = AdvanceRndSeed(); -} - -void AddBloodFountain(Object &bloodFountain) -{ - bloodFountain._oRndSeed = AdvanceRndSeed(); -} - void AddLargeFountain(Object &fountain) { int ox = fountain.position.x; @@ -1207,21 +1197,6 @@ void AddArmorStand(Object &armorStand) armorStand._oRndSeed = AdvanceRndSeed(); } -void AddGoatShrine(Object &goatShrine) -{ - goatShrine._oRndSeed = AdvanceRndSeed(); -} - -void AddCauldron(Object &cauldron) -{ - cauldron._oRndSeed = AdvanceRndSeed(); -} - -void AddTearFountain(Object &tearFountain) -{ - tearFountain._oRndSeed = AdvanceRndSeed(); -} - void AddDecapitatedBody(Object &decapitatedBody) { decapitatedBody._oRndSeed = AdvanceRndSeed(); @@ -1244,11 +1219,6 @@ void AddMagicCircle(Object &magicCircle) magicCircle._oVar5 = 1; } -void AddBurningCross(Object &burningCross) -{ - burningCross._oRndSeed = AdvanceRndSeed(); -} - void AddPedestalOfBlood(Object &pedestalOfBlood) { pedestalOfBlood._oVar1 = SetPiece.position.x; @@ -4458,10 +4428,11 @@ Object *AddObject(_object_id objType, Point objPos) break; case OBJ_SKELBOOK: case OBJ_BOOKSTAND: - AddBookstand(object); - break; case OBJ_BLOODFTN: - AddBloodFountain(object); + case OBJ_GOATSHRINE: + case OBJ_CAULDRON: + case OBJ_TEARFTN: + object._oRndSeed = AdvanceRndSeed(); break; case OBJ_DECAP: AddDecapitatedBody(object); @@ -4474,15 +4445,6 @@ Object *AddObject(_object_id objType, Point objPos) case OBJ_WARARMOR: AddArmorStand(object); break; - case OBJ_GOATSHRINE: - AddGoatShrine(object); - break; - case OBJ_CAULDRON: - AddCauldron(object); - break; - case OBJ_TEARFTN: - AddTearFountain(object); - break; case OBJ_BOOK2L: AddBookOfVileness(object); break; @@ -4496,7 +4458,7 @@ Object *AddObject(_object_id objType, Point objPos) break; case OBJ_BCROSS: case OBJ_TBCROSS: - AddBurningCross(object); + object._oRndSeed = AdvanceRndSeed(); AddObjectLight(object, 5); break; case OBJ_PEDISTAL: