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

Timestamp:

Jan 26, 2014, 9:46:43 PM (11 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

c991530

Parents:

5c7f28d (diff), 1e250bf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:weretaco/network-game

File:

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

client/Client/GameRender.cpp

@@ -1 +1 @@
 #include "GameRender.h"
+
+#include <cmath>
 
 #include <allegro5/allegro_primitives.h>
@@ -62 +64 @@
                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;
             }