summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-12-22 15:33:43 +0100
committermadmaxoft <github@xoft.cz>2013-12-22 15:45:45 +0100
commitdfa81829fecf4e3bcc3316ebd69deb7d2c205332 (patch)
tree0ebf3d26039780c997a42b2e2f185fcfa17de76a /src
parentMerge pull request #462 from mc-server/1.7_Fishing (diff)
downloadcuberite-dfa81829fecf4e3bcc3316ebd69deb7d2c205332.tar
cuberite-dfa81829fecf4e3bcc3316ebd69deb7d2c205332.tar.gz
cuberite-dfa81829fecf4e3bcc3316ebd69deb7d2c205332.tar.bz2
cuberite-dfa81829fecf4e3bcc3316ebd69deb7d2c205332.tar.lz
cuberite-dfa81829fecf4e3bcc3316ebd69deb7d2c205332.tar.xz
cuberite-dfa81829fecf4e3bcc3316ebd69deb7d2c205332.tar.zst
cuberite-dfa81829fecf4e3bcc3316ebd69deb7d2c205332.zip
Diffstat (limited to 'src')
-rw-r--r--src/ItemGrid.cpp6
-rw-r--r--src/ItemGrid.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ItemGrid.cpp b/src/ItemGrid.cpp
index e9b86173e..d2e6b1c69 100644
--- a/src/ItemGrid.cpp
+++ b/src/ItemGrid.cpp
@@ -580,11 +580,11 @@ bool cItemGrid::DamageItem(int a_X, int a_Y, short a_Amount)
-void cItemGrid::GenerateRandomLootWithBooks(const cLootProbab * a_LootProbabs, int a_CountLootProbabs, int a_NumSlots, int a_Seed)
+void cItemGrid::GenerateRandomLootWithBooks(const cLootProbab * a_LootProbabs, size_t a_CountLootProbabs, int a_NumSlots, int a_Seed)
{
// Calculate the total weight:
int TotalProbab = 1;
- for (int i = 0; i < a_CountLootProbabs; i++)
+ for (size_t i = 0; i < a_CountLootProbabs; i++)
{
TotalProbab += a_LootProbabs[i].m_Weight;
}
@@ -597,7 +597,7 @@ void cItemGrid::GenerateRandomLootWithBooks(const cLootProbab * a_LootProbabs, i
int LootRnd = Rnd % TotalProbab;
Rnd >>= 8;
cItem CurrentLoot = cItem(E_ITEM_BOOK, 1, 0); // TODO: enchantment
- for (int j = 0; j < a_CountLootProbabs; j++)
+ for (size_t j = 0; j < a_CountLootProbabs; j++)
{
LootRnd -= a_LootProbabs[i].m_Weight;
if (LootRnd < 0)
diff --git a/src/ItemGrid.h b/src/ItemGrid.h
index a4af523cf..b344e3daf 100644
--- a/src/ItemGrid.h
+++ b/src/ItemGrid.h
@@ -157,7 +157,7 @@ public:
A total of a_NumSlots are taken by the loot.
Cannot export to Lua due to raw array a_LootProbabs. TODO: Make this exportable / export through ManualBindings.cpp with a Lua table as LootProbabs
*/
- void GenerateRandomLootWithBooks(const cLootProbab * a_LootProbabs, int a_CountLootProbabs, int a_NumSlots, int a_Seed);
+ void GenerateRandomLootWithBooks(const cLootProbab * a_LootProbabs, size_t a_CountLootProbabs, int a_NumSlots, int a_Seed);
/// Adds a callback that gets called whenever a slot changes. Must not be called from within the listener callback!
void AddListener(cListener & a_Listener);