Changeset c51da03 in network-game for client/Client/main.cpp

Timestamp:

Jan 26, 2014, 9:46:43 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

c991530

Parents:

5c7f28d (diff), 1e250bf (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

File:

• client/Client/main.cpp (modified) (3 diffs)

client/Client/main.cpp

@@ -15 +15 @@
 #include <cstdio>
 #include <cstdlib>
-#include <cmath>
+//#include <cmath>
 #include <sys/types.h>
 #include <string>
@@ -133 +133 @@
    ALLEGRO_EVENT_QUEUE *event_queue = NULL;
    ALLEGRO_TIMER *timer = NULL;
-   bool key[4] = { false, false, false, false };
    map<unsigned int, Player*> mapPlayers;
    unsigned int curPlayerId = -1;
@@ -697 +696 @@
                cout << "Got a logout message" << endl;
 
-               int playerId;
+               unsigned int playerId;
 
                // Check if it's about you or another player