From 554daf7b88d47e701377e3e81e6abb0b895379f4 Mon Sep 17 00:00:00 2001 From: Arthur Dene Ice Date: Mon, 5 May 2014 19:01:07 -0700 Subject: [PATCH] double to int32 explicit conversion --- common/EQPacket.cpp | 2 +- common/EQStream.cpp | 6 +++--- zone/npc.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/EQPacket.cpp b/common/EQPacket.cpp index 5372a0f9d..08193c297 100644 --- a/common/EQPacket.cpp +++ b/common/EQPacket.cpp @@ -202,7 +202,7 @@ uint32 EQProtocolPacket::serialize(unsigned char *dest) const *(uint16 *)dest=opcode; } else { *(dest)=0; - *(dest+1)=opcode; + *(dest+1)=(unsigned char)opcode; } memcpy(dest+2,pBuffer,size); diff --git a/common/EQStream.cpp b/common/EQStream.cpp index 785c11ff3..dc84fd34e 100644 --- a/common/EQStream.cpp +++ b/common/EQStream.cpp @@ -72,7 +72,7 @@ void EQStream::init() { if(GetExecutablePlatform() == ExePlatformWorld || GetExecutablePlatform() == ExePlatformZone) { retransmittimer = Timer::GetCurrentTime(); - retransmittimeout = 500 * RETRANSMIT_TIMEOUT_MULT; + retransmittimeout = (uint32)500 * RETRANSMIT_TIMEOUT_MULT; } OpMgr = nullptr; @@ -478,10 +478,10 @@ void EQStream::ProcessPacket(EQProtocolPacket *p) if(RETRANSMIT_TIMEOUT_MULT && ntohl(Stats->average_delta)) { //recalculate retransmittimeout using the larger of the last rtt or average rtt, which is multiplied by the rule value if((ntohl(Stats->last_local_delta) + ntohl(Stats->last_remote_delta)) > (ntohl(Stats->average_delta) * 2)) { - retransmittimeout = (ntohl(Stats->last_local_delta) + ntohl(Stats->last_remote_delta)) + retransmittimeout = (uint32)(ntohl(Stats->last_local_delta) + ntohl(Stats->last_remote_delta)) * RETRANSMIT_TIMEOUT_MULT; } else { - retransmittimeout = ntohl(Stats->average_delta) * 2 * RETRANSMIT_TIMEOUT_MULT; + retransmittimeout = (uint32)ntohl(Stats->average_delta) * 2 * RETRANSMIT_TIMEOUT_MULT; } if(retransmittimeout > RETRANSMIT_TIMEOUT_MAX) retransmittimeout = RETRANSMIT_TIMEOUT_MAX; diff --git a/zone/npc.cpp b/zone/npc.cpp index 3886d7c66..e43270a92 100644 --- a/zone/npc.cpp +++ b/zone/npc.cpp @@ -2010,7 +2010,7 @@ void NPC::ModifyNPCStat(const char *identifier, const char *newValue) } if(id == "loottable_id") { - loottable_id = atof(val.c_str()); + loottable_id = (uint32)atof(val.c_str()); return; } if(id == "healscale")