Changeset 67d032c in network-game

Timestamp:

Feb 24, 2013, 5:57:21 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

054b50b

Parents:

60940f8 (diff), 3d81c0d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:weretaco/network-game

Files:

• client/Client/main.cpp (modified) (5 diffs)
• common/Player.cpp (modified) (1 diff)

client/Client/main.cpp

@@ -165 +165 @@
 
    WorldMap* gameMap = WorldMap::loadMapFromFile("../../data/map.txt");
-   //delete gameMap;
-   //gameMap = WorldMap::createDefaultMap();
 
    wndLogin = new Window(0, 0, SCREEN_W, SCREEN_H);
@@ -245 +243 @@
    {
       ALLEGRO_EVENT ev;
+      
       al_wait_for_event(event_queue, &ev);
 
@@ -337 +336 @@
 
       if (receiveMessage(&msgFrom, sock, &from) >= 0)
-      {
          processMessage(msgFrom, state, chatConsole, mapPlayers, curPlayerId);
-         cout << "state: " << state << endl;
-      }
  
       if (redraw && al_is_event_queue_empty(event_queue))
@@ -453 +449 @@
 {
    string response = string(msg.buffer);
-
-   cout << "Got message: " << msg.type << endl;
 
    switch(state)
@@ -531 +525 @@
                mapPlayers[p.id] = p;
 
-               cout << "p.id: " << p.id << endl;
-
                break;
             }

common/Player.cpp

@@ -71 +71 @@
    memcpy(&this->target.y, buffer+16, 4);
    this->name.assign(buffer+20);
-
-   cout << "id: " << this->id << endl;
-   cout << "pos x: " << this->pos.x << endl;
-   cout << "pos y: " << this->pos.y << endl;
-   cout << "target x: " << this->target.x << endl;
-   cout << "target y: " << this->target.y << endl;
-   cout << "name: " << this->name << endl;
 }