Changeset 3ea1839 in network-game

Timestamp:

Jun 26, 2014, 11:02:13 PM (10 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

master

Children:

e708305

Parents:

34bd549

Message:

Fix Mac compiler warnings

Files:

• client/Client/TextLabel.cpp (modified) (1 diff)
• common/WorldMap.cpp (modified) (1 diff)

client/Client/TextLabel.cpp

@@ -34 +34 @@
       default:
          cout << "Invalid alignment: " << this->alignment << endl;
+         targetX = 0;
          break;
    }

common/WorldMap.cpp

@@ -232 +232 @@
       // read the map dimensions
       getline(file, line);
-      if (line.size() > 0)
-      {
-         istringstream iss(line);
-         string token;
-         getline(iss, token, 'x');
-         width = atoi(token.c_str());
-         getline(iss, token, 'x');
-         height = atoi(token.c_str());
-      }
+
+      istringstream iss(line);
+      string token;
+      getline(iss, token, 'x');
+      width = atoi(token.c_str());
+      getline(iss, token, 'x');
+      height = atoi(token.c_str());
 
       cout << "width: " << width << endl;