From 019b52c24722e8a34fb209715ad6c78ce6f2d0e8 Mon Sep 17 00:00:00 2001 From: ephphatha Date: Wed, 13 Jul 2022 19:15:35 +1000 Subject: [PATCH] Remove temporary variables in SpawnRock --- Source/items.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Source/items.cpp b/Source/items.cpp index b98c1960a..bbb4b7f3a 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -1623,21 +1623,22 @@ void SpawnRock() if (ActiveItemCount >= MAXITEMS) return; - int oi; - bool ostand = false; - for (int i = 0; i < ActiveObjectCount && !ostand; i++) { - oi = ActiveObjects[i]; - ostand = Objects[oi]._otype == OBJ_STAND; + Object *stand = nullptr; + for (int i = 0; i < ActiveObjectCount; i++) { + if (Objects[ActiveObjects[i]]._otype == OBJ_STAND) { + stand = &Objects[ActiveObjects[i]]; + break; + } } - if (!ostand) + if (stand == nullptr) return; int ii = AllocateItem(); auto &item = Items[ii]; - item.position = Objects[oi].position; - dItem[Objects[oi].position.x][Objects[oi].position.y] = ii + 1; + item.position = stand->position; + dItem[item.position.x][item.position.y] = ii + 1; int curlv = ItemsGetCurrlevel(); GetItemAttrs(item, IDI_ROCK, curlv); SetupItem(item);