diff --git a/Source/items.cpp b/Source/items.cpp index 2f046137a..53dce894d 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -2769,21 +2769,20 @@ void SetupAllUseful(int ii, int iseed, int lvl) SetupItem(ii); } -void CreateRndUseful(int pnum, int x, int y, unsigned char sendmsg) +void CreateRndUseful(int pnum, int x, int y, BOOL sendmsg) { - int ii; // esi + int ii; if (numitems < MAXITEMS) { - ii = itemavail[0]; - GetSuperItemSpace(x, y, itemavail[0]); - itemactive[numitems] = ii; - itemavail[0] = itemavail[MAXITEMS - numitems - 1]; + ii = itemactive[0]; + GetSuperItemSpace(x, y, ii); + itemactive[0] = itemactive[MAXITEMS - numitems -1]; + itemavail[numitems] = ii; SetupAllUseful(ii, GetRndSeed(), currlevel); - - if (sendmsg) + if (sendmsg) { NetSendCmdDItem(FALSE, ii); - - ++numitems; + } + numitems++; } } diff --git a/Source/items.h b/Source/items.h index 16185e33b..4c99a3e2b 100644 --- a/Source/items.h +++ b/Source/items.h @@ -60,7 +60,7 @@ void SpawnItem(int m, int x, int y, BOOL sendmsg); void CreateItem(int uid, int x, int y); void CreateRndItem(int x, int y, unsigned char onlygood, unsigned char sendmsg, int delta); void SetupAllUseful(int ii, int iseed, int lvl); -void CreateRndUseful(int pnum, int x, int y, unsigned char sendmsg); +void CreateRndUseful(int pnum, int x, int y, BOOL sendmsg); void CreateTypeItem(int x, int y, unsigned char onlygood, int itype, int imisc, int sendmsg, int delta); void RecreateItem(int ii, int idx, unsigned short ic, int iseed, int ivalue); void RecreateEar(int ii, unsigned short ic, int iseed, int Id, int dur, int mdur, int ch, int mch, int ivalue, int ibuff);