From 95e084dbd374ffe5a9d3bd74ea7c13b4512e1eb5 Mon Sep 17 00:00:00 2001 From: qndel Date: Mon, 12 Oct 2020 00:23:59 +0200 Subject: [PATCH] apply enums (#2088) --- Source/items.cpp | 9 +++++---- Source/objects.cpp | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/items.cpp b/Source/items.cpp index 575ebb8dc..a3a5147be 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -2476,11 +2476,11 @@ int RndItem(int m) return 0; if (random_(24, 100) > 25) - return 1; + return IDI_GOLD + 1; ri = 0; for (i = 0; AllItemsList[i].iLoc != ILOC_INVALID; i++) { - if (AllItemsList[i].iRnd == 2 && monster[m].mLevel >= AllItemsList[i].iMinMLvl) { + if (AllItemsList[i].iRnd == IDROP_DOUBLE && monster[m].mLevel >= AllItemsList[i].iMinMLvl) { ril[ri] = i; ri++; } @@ -4665,9 +4665,10 @@ int RndSmithItem(int lvl) ril[ri] = i; ri++; #ifdef HELLFIRE - if (AllItemsList[i].iRnd == 2 && ri < 512) { + if (AllItemsList[i].iRnd == IDROP_DOUBLE && ri < 512) { #else - if (AllItemsList[i].iRnd == 2) { + if (AllItemsList[i].iRnd == IDROP_DOUBLE) + { #endif ril[ri] = i; ri++; diff --git a/Source/objects.cpp b/Source/objects.cpp index 01734a9f3..55c9e57f5 100644 --- a/Source/objects.cpp +++ b/Source/objects.cpp @@ -3369,7 +3369,7 @@ int ItemMiscIdIdx(int imiscid) int i; i = 0; - while (AllItemsList[i].iRnd == 0 || AllItemsList[i].iMiscId != imiscid) { + while (AllItemsList[i].iRnd == IDROP_NEVER || AllItemsList[i].iMiscId != imiscid) { i++; }