Changeset 233e736 in network-game

Timestamp:

Sep 27, 2013, 6:56:04 PM (11 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

master

Children:

a6fe73d

Parents:

d519032

Message:

Fixed a client-side map loading bug

Files:

• client/Client/main.cpp (modified) (2 diffs)
• common/Game.cpp (modified) (1 diff)
• common/Game.h (modified) (1 diff)
• common/WorldMap.cpp (modified) (3 diffs)

client/Client/main.cpp

@@ -856 +856 @@
                cout << "Game name: " << gameName << endl;
                
-               game = new Game(gameName);
-
+               game = new Game(gameName, "../../data/map.txt");
+
+               /*
                state = STATE_NEW_GAME;
 
@@ -864 +865 @@
 
                msgProcessor.sendMessage(&msgTo, sock, &server, &outputLog);
+               */
 
                break;

common/Game.cpp

@@ -11 +11 @@
 }
 
-Game::Game(string name) {
+Game::Game(string name, string filepath) {
    this->id = 0;
    this->name = name;
    this->blueScore = 0;
    this->redScore = 0;
-   this->worldMap = WorldMap::loadMapFromFile("../data/map.txt");
+   this->worldMap = WorldMap::loadMapFromFile(filepath);
 }
 

common/Game.h

@@ -30 +30 @@
 public:
    Game();
-   Game(string name);
+   Game(string name, string filepath);
 
    ~Game();

common/WorldMap.cpp

@@ -124 +124 @@
    bool foundObject = false;
 
-   cout << "Searching for obbject to update" << endl;
+   cout << "Searching for object to update" << endl;
    switch (t) {
    case WorldMap::OBJECT_BLUE_FLAG:
@@ -198 +198 @@
    ifstream file(filename.c_str());
 
+   cout << "Trying to open file: " << filename << endl;
+
    if (file.is_open())
    {
+      cout << filename << " opened successfully" << endl;
+
       string line;
       int width, height;
@@ -299 +303 @@
       }
       file.close();
+      cout << filename << " closed" << endl;
    }
    else
       cout << "Could not open the file" << endl;
+
+   cout << "Finished file processing" << endl;
 
    return m;