Changeset 913 for code/branches

Timestamp:

Mar 20, 2008, 4:32:20 PM (17 years ago)

Author:

scheusso

Message:

another dead bug

Location:

code/branches/network/src/network

Files:

• Client.cc (modified) (1 diff)
• PacketDecoder.cc (modified) (1 diff)
• PacketGenerator.cc (modified) (3 diffs)
• PacketManager.h (modified) (1 diff)

code/branches/network/src/network/Client.cc

@@ -191 +191 @@
 
   void Client::processGamestate( GameStateCompressed *data){
+    int id = data->id;
+    COUT(5) << "received gamestate id: " << data->id << std::endl;
     gamestate.pushGameState(data);
-    COUT(5) << "received gamestate id: " << data->id << std::endl;
-    client_connection.addPacket(pck_gen.acknowledgement(data->id));
+    client_connection.addPacket(pck_gen.acknowledgement(id));
     client_connection.sendPackets();
     return;

code/branches/network/src/network/PacketDecoder.cc

@@ -154 +154 @@
     //copy the GameStateCompressed id into the struct, which is located at second place data+sizeof( int )
     //memcpy( (void*)&(currentState->id), (const void*)(data+sizeof( int )), sizeof( int ) );
-    currentState->id = (int)*(packet->data+sizeof(int));
+    currentState->id = *((int *)packet->data+sizeof(int));
+    COUT(5) << "decoder: received gs id: " << currentState->id << std::endl;
 //     std::cout << "id: " << currentState->id << std::endl;
     //copy the size of the GameStateCompressed compressed data into the new GameStateCompressed struct, located at 3th

code/branches/network/src/network/PacketGenerator.cc

@@ -50 +50 @@
   ENetPacket* PacketGenerator::acknowledgement( int state, int reliable )
   {
-    std::cout << "generating new acknowledgement, id: " << state << std::endl;
+    COUT(4) << "generating new acknowledgement, id: " << state << std::endl;
     ack* ackreq = new ack;
     ackreq->id = ACK;
@@ -63 +63 @@
   ENetPacket* PacketGenerator::mousem( double x, double y, int reliable )
   {
-    std::cout << "generating new mouse" << std::endl;
+    COUT(4) << "generating new mouse" << std::endl;
     mouse* mousemove = new mouse;
     mousemove->id = MOUSE;
@@ -77 +77 @@
   ENetPacket* PacketGenerator::keystrike( char press, int reliable )
   {
-    std::cout << "generating new keyboard" << std::endl;
+    COUT(4) << "generating new keyboard" << std::endl;
     keyboard* key = new keyboard;
     key->id = KEYBOARD;

code/branches/network/src/network/PacketManager.h

@@ -4 +4 @@
 #include <string>
 #include <enet/enet.h>
+
+#include "core/CoreIncludes.h"
 
 #include "NetworkPrereqs.h"