From 72d6c693e11696cf345403a7542d756f691e621f Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sat, 3 Nov 2012 06:25:26 +0000 Subject: [PATCH] - added some debug code for network protocol --- source/glest_game/main/main.cpp | 16 ---------------- source/glest_game/network/network_protocol.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index 401c2922..f47157bf 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -3082,22 +3082,6 @@ int glestMain(int argc, char** argv) { printf("\n\nData type sizes int8 = %zu int16 = %zu int32 = %zu int64 = %zu\n\n",sizeof(int8),sizeof(int16),sizeof(int32),sizeof(int64)); - unsigned char dataBuf[20]=""; - unsigned char *dataBufPtr = &dataBuf[0]; - memset(dataBufPtr,0,20); - int8 dataTest = 1; - - int8 c = (int8)((int)dataTest); // promoted - *dataBufPtr++ = c; - - printf("\n#1 Test dataTest = %d, c = %d dataBuf [%d,%d,%d,%d,%d,%d,%d,%d]\n",dataTest,c,dataBuf[0],dataBuf[1],dataBuf[2],dataBuf[3],dataBuf[4],dataBuf[5],dataBuf[6],dataBuf[7]); - - dataBufPtr = &dataBuf[0]; - int8 *cPtr = ((int8*)dataBufPtr); - *cPtr = *dataBufPtr++; - - printf("#2 Test dataTest = %d, cPtr = %d dataBuf [%d,%d,%d,%d,%d,%d,%d,%d]\n",dataTest,*cPtr,dataBuf[0],dataBuf[1],dataBuf[2],dataBuf[3],dataBuf[4],dataBuf[5],dataBuf[6],dataBuf[7]); - Config::getInstance().setBool("DebugNetworkPackets",true,true); NetworkMessageIntro data(424336, "mg_version_x","player_x", 3, nmgstOk,444444, 555555, "english"); unsigned char *buf = data.packMessage(); diff --git a/source/glest_game/network/network_protocol.cpp b/source/glest_game/network/network_protocol.cpp index c3f96893..08e17ac4 100644 --- a/source/glest_game/network/network_protocol.cpp +++ b/source/glest_game/network/network_protocol.cpp @@ -270,7 +270,7 @@ unsigned int pack(unsigned char *buf, const char *format, ...) { case 'c': // 8-bit size += 1; c = (int8)va_arg(ap, int); // promoted - *buf++ = c; + *buf++ = (unsigned char)c; printf("pack int8 = %d [%X] c = %d [%X] buf pos = %d\n",*(buf-1),*(buf-1),c,c,(buf - bufStart)); break; @@ -278,7 +278,7 @@ unsigned int pack(unsigned char *buf, const char *format, ...) { case 'C': // 8-bit unsigned size += 1; C = (uint8)va_arg(ap, unsigned int); // promoted - *buf++ = C; + *buf++ = (unsigned char)C; printf("pack uint8 = %u [%X] C = %u [%X] buf pos = %d\n",*(buf-1),*(buf-1),C,C,(buf - bufStart)); break; @@ -446,7 +446,7 @@ unsigned int unpack(unsigned char *buf, const char *format, ...) { // else { // *c = -1 - (unsigned char)(0xffu - *buf); // } - *c = *buf++; + *c = (int8)*buf++; size += 1; printf("unpack int8 = %d [%X] c = %d [%X] buf pos = %d\n",*(buf-1),*(buf-1),*c,*c,(buf - bufStart)); @@ -454,7 +454,7 @@ unsigned int unpack(unsigned char *buf, const char *format, ...) { case 'C': // 8-bit unsigned C = va_arg(ap, uint8*); - *C = *buf++; + *C = (uint8)*buf++; size += 1; printf("unpack uint8 = %u [%X] C = %u [%X] buf pos = %d\n",*(buf-1),*(buf-1),*C,*C,(buf - bufStart));