summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-12-20 16:22:16 +0100
committermadmaxoft <github@xoft.cz>2013-12-20 16:22:16 +0100
commiteabb88eb7493a48b65d9bcceadaa9b0bfec9ec03 (patch)
tree8409c1f3785c356d07edb29992c20abd6865de9d /src
parentFixed warnings in HTTP parser. (diff)
downloadcuberite-eabb88eb7493a48b65d9bcceadaa9b0bfec9ec03.tar
cuberite-eabb88eb7493a48b65d9bcceadaa9b0bfec9ec03.tar.gz
cuberite-eabb88eb7493a48b65d9bcceadaa9b0bfec9ec03.tar.bz2
cuberite-eabb88eb7493a48b65d9bcceadaa9b0bfec9ec03.tar.lz
cuberite-eabb88eb7493a48b65d9bcceadaa9b0bfec9ec03.tar.xz
cuberite-eabb88eb7493a48b65d9bcceadaa9b0bfec9ec03.tar.zst
cuberite-eabb88eb7493a48b65d9bcceadaa9b0bfec9ec03.zip
Diffstat (limited to 'src')
-rw-r--r--src/MobCensus.cpp8
-rw-r--r--src/Protocol/Protocol132.cpp4
2 files changed, 7 insertions, 5 deletions
diff --git a/src/MobCensus.cpp b/src/MobCensus.cpp
index 66b5932bc..9c32bf695 100644
--- a/src/MobCensus.cpp
+++ b/src/MobCensus.cpp
@@ -19,7 +19,6 @@ void cMobCensus::CollectMob(cMonster & a_Monster, cChunk & a_Chunk, double a_Dis
bool cMobCensus::IsCapped(cMonster::eFamily a_MobFamily)
{
- bool toReturn = true;
const int ratio = 319; // this should be 256 as we are only supposed to take account from chunks that are in 17x17 from a player
// but for now, we use all chunks loaded by players. that means 19 x 19 chunks. That's why we use 256 * (19*19) / (17*17) = 319
// MG TODO : code the correct count
@@ -42,9 +41,12 @@ int cMobCensus::GetCapMultiplier(cMonster::eFamily a_MobFamily)
case cMonster::mfPassive: return 11;
case cMonster::mfAmbient: return 16;
case cMonster::mfWater: return 5;
+ default:
+ {
+ ASSERT(!"Unhandled mob family");
+ return -1;
+ }
}
- ASSERT(!"Unhandled mob family");
- return -1;
}
diff --git a/src/Protocol/Protocol132.cpp b/src/Protocol/Protocol132.cpp
index d8f450588..346607b79 100644
--- a/src/Protocol/Protocol132.cpp
+++ b/src/Protocol/Protocol132.cpp
@@ -188,7 +188,7 @@ void cProtocol132::DataReceived(const char * a_Data, int a_Size)
byte Decrypted[512];
while (a_Size > 0)
{
- int NumBytes = (a_Size > sizeof(Decrypted)) ? sizeof(Decrypted) : a_Size;
+ int NumBytes = (a_Size > (int)sizeof(Decrypted)) ? (int)sizeof(Decrypted) : a_Size;
m_Decryptor.ProcessData(Decrypted, (byte *)a_Data, NumBytes);
super::DataReceived((const char *)Decrypted, NumBytes);
a_Size -= NumBytes;
@@ -705,7 +705,7 @@ void cProtocol132::Flush(void)
byte Encrypted[8192]; // Larger buffer, we may be sending lots of data (chunks)
while (a_Size > 0)
{
- int NumBytes = (a_Size > sizeof(Encrypted)) ? sizeof(Encrypted) : a_Size;
+ int NumBytes = (a_Size > (int)sizeof(Encrypted)) ? (int)sizeof(Encrypted) : a_Size;
m_Encryptor.ProcessData(Encrypted, (byte *)a_Data, NumBytes);
super::SendData((const char *)Encrypted, NumBytes);
a_Size -= NumBytes;