Changes in client/Client/GameRender.cpp [5c7f28d:1e250bf] in network-game

File:

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

client/Client/GameRender.cpp

@@ -1 +1 @@
 #include "GameRender.h"
+
+#include <cmath>
 
 #include <allegro5/allegro_primitives.h>
@@ -16 +18 @@
       for (int y=0; y<gameMap->height; y++)
       {
-         TerrainType terrain = gameMap->getElement(x, y);
+         TerrainType el = gameMap->getElement(x, y);
          StructureType structure = gameMap->getStructure(x, y);
 
-         switch(terrain) {
-         case TERRAIN_GRASS:
+         if (el == 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));
-            break;
-         case TERRAIN_OCEAN:
+         else if (el == 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));
-            break;
-         case TERRAIN_ROCK:
+         else if (el == 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;
-         }  
 
-         switch(structure) {
-         case STRUCTURE_BLUE_FLAG:
+         if (structure == 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));
-            break;
-         case STRUCTURE_RED_FLAG:
+         }else if (structure == 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;
          }
       }
@@ -62 +52 @@
                case OBJECT_RED_FLAG:
                   al_draw_filled_rectangle(it->pos.x-8+mapPos.x, it->pos.y-8+mapPos.y, it->pos.x+8+mapPos.x, it->pos.y+8+mapPos.y, al_map_rgb(255, 0, 0));
+                  break;
+               case OBJECT_NONE:
                   break;
             }