- Timestamp:
- Feb 24, 2013, 5:55:35 PM (12 years ago)
- Branches:
- master
- Children:
- 67d032c
- Parents:
- 7b43385
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
client/Client/main.cpp
r7b43385 r3d81c0d 165 165 166 166 WorldMap* gameMap = WorldMap::loadMapFromFile("../../data/map.txt"); 167 //delete gameMap;168 //gameMap = WorldMap::createDefaultMap();169 167 170 168 wndLogin = new Window(0, 0, SCREEN_W, SCREEN_H); … … 245 243 { 246 244 ALLEGRO_EVENT ev; 245 247 246 al_wait_for_event(event_queue, &ev); 248 247 … … 337 336 338 337 if (receiveMessage(&msgFrom, sock, &from) >= 0) 339 {340 338 processMessage(msgFrom, state, chatConsole, mapPlayers, curPlayerId); 341 cout << "state: " << state << endl;342 }343 339 344 340 if (redraw && al_is_event_queue_empty(event_queue)) … … 453 449 { 454 450 string response = string(msg.buffer); 455 456 cout << "Got message: " << msg.type << endl;457 451 458 452 switch(state) … … 531 525 mapPlayers[p.id] = p; 532 526 533 cout << "p.id: " << p.id << endl;534 535 527 break; 536 528 }
Note:
See TracChangeset
for help on using the changeset viewer.