flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed signedness warning in cItemGrid.

Browse Source
This commit is contained in:
madmaxoft 2013-12-22 15:33:43 +01:00
parent f404130e8c
commit dfa81829fe
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ItemGrid.cpp
View File

@ -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: // Calculate the total weight:
int TotalProbab = 1; 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; TotalProbab += a_LootProbabs[i].m_Weight;
} }
@ -597,7 +597,7 @@ void cItemGrid::GenerateRandomLootWithBooks(const cLootProbab * a_LootProbabs, i
int LootRnd = Rnd % TotalProbab; int LootRnd = Rnd % TotalProbab;
Rnd >>= 8; Rnd >>= 8;
cItem CurrentLoot = cItem(E_ITEM_BOOK, 1, 0); // TODO: enchantment 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; LootRnd -= a_LootProbabs[i].m_Weight;
if (LootRnd < 0) if (LootRnd < 0)

2
src/ItemGrid.h
View File

@ -157,7 +157,7 @@ public:
A total of a_NumSlots are taken by the loot. 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 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! /// Adds a callback that gets called whenever a slot changes. Must not be called from within the listener callback!
void AddListener(cListener & a_Listener); void AddListener(cListener & a_Listener);