Changeset 5c7f28d in network-game for client/Client/GameRender.cpp

Timestamp:

Jan 26, 2014, 9:45:30 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

c51da03

Parents:

9ee50ce

Message:

The global projectile map and related code is gone from main.cpp, the client processes LOGOUT messages about other players from STATE_GAME, and the map drawing code in GameRender uses switches instead of ifs

File:

• client/Client/GameRender.cpp (modified) (1 diff)

client/Client/GameRender.cpp

@@ -16 +16 @@
       for (int y=0; y<gameMap->height; y++)
       {
-         TerrainType el = gameMap->getElement(x, y);
+         TerrainType terrain = gameMap->getElement(x, y);
          StructureType structure = gameMap->getStructure(x, y);
 
-         if (el == TERRAIN_GRASS)
+         switch(terrain) {
+         case TERRAIN_GRASS:
             al_draw_filled_rectangle(x*25+mapPos.x, y*25+mapPos.y, x*25+25+mapPos.x, y*25+25+mapPos.y, al_map_rgb(0, 255, 0));
-         else if (el == TERRAIN_OCEAN)
+            break;
+         case TERRAIN_OCEAN:
             al_draw_filled_rectangle(x*25+mapPos.x, y*25+mapPos.y, x*25+25+mapPos.x, y*25+25+mapPos.y, al_map_rgb(0, 0, 255));
-         else if (el == TERRAIN_ROCK)
+            break;
+         case TERRAIN_ROCK:
             al_draw_filled_rectangle(x*25+mapPos.x, y*25+mapPos.y, x*25+25+mapPos.x, y*25+25+mapPos.y, al_map_rgb(100, 100, 0));
+            break;
+         case TERRAIN_NONE:
+            break;
+         }  
 
-         if (structure == STRUCTURE_BLUE_FLAG) {
+         switch(structure) {
+         case STRUCTURE_BLUE_FLAG:
             al_draw_circle(x*25+12+mapPos.x, y*25+12+mapPos.y, 12, al_map_rgb(0, 0, 0), 3);
             //al_draw_filled_rectangle(x*25+5+mapPos.x, y*25+5+mapPos.y, x*25+20+mapPos.x, y*25+20+mapPos.y, al_map_rgb(0, 0, 255));
-         }else if (structure == STRUCTURE_RED_FLAG) {
+            break;
+         case STRUCTURE_RED_FLAG:
             al_draw_circle(x*25+12+mapPos.x, y*25+12+mapPos.y, 12, al_map_rgb(0, 0, 0), 3);
             //al_draw_filled_rectangle(x*25+5+mapPos.x, y*25+5+mapPos.y, x*25+20+mapPos.x, y*25+20+mapPos.y, al_map_rgb(255, 0, 0));
+            break;
+         case STRUCTURE_NONE:
+            break;
          }
       }