From 069366e9bee677fecdd6ccbe8ac5ebea17142753 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sun, 28 Apr 2019 04:56:54 +0200 Subject: [PATCH] Clean up RespawnItem --- Source/items.cpp | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/Source/items.cpp b/Source/items.cpp index 8ccdce6fe..915524e59 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -2979,29 +2979,25 @@ void SpawnRock() void RespawnItem(int i, BOOL FlipFlag) { - int it; // ecx - int il; // eax + int it; - item[i]._iAnimWidth = 96; - item[i]._iAnimWidth2 = 16; it = ItemCAnimTbl[item[i]._iCurs]; - il = ItemAnimLs[it]; - item[i]._iAnimLen = il; item[i]._iAnimData = itemanims[it]; - item[i]._iPostDraw = FALSE; + item[i]._iAnimLen = ItemAnimLs[it]; item[i]._iRequest = FALSE; - + item[i]._iAnimWidth = 96; + item[i]._iAnimWidth2 = 16; + item[i]._iPostDraw = FALSE; if (FlipFlag) { - item[i]._iSelFlag = 0; - il = 1; + item[i]._iAnimFrame = 1; item[i]._iAnimFlag = TRUE; + item[i]._iSelFlag = 0; } else { + item[i]._iAnimFrame = item[i]._iAnimLen; item[i]._iAnimFlag = FALSE; item[i]._iSelFlag = 1; } - item[i]._iAnimFrame = il; - if (item[i]._iCurs == ICURS_MAGIC_ROCK) { item[i]._iSelFlag = 1; PlaySfxLoc(ItemDropSnds[it], item[i]._ix, item[i]._iy); @@ -3022,8 +3018,8 @@ void DeleteItem(int ii, int i) void ItemDoppel() { - int idoppelx; // esi - ItemStruct *i; // edx + int idoppelx; + ItemStruct *i; if (gbMaxPlayers != 1) { for (idoppelx = 16; idoppelx < 96; idoppelx++) { @@ -3041,8 +3037,7 @@ void ItemDoppel() void ProcessItems() { - int i; // edi - int ii; // esi + int i, ii; for (i = 0; i < numitems; i++) { ii = itemactive[i];