Changeset c51da03 in network-game

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

Location:

client

Files:

• Client/GameRender.cpp (modified) (2 diffs)
• Client/RadioButtonList.cpp (modified) (2 diffs)
• Client/RadioButtonList.h (modified) (1 diff)
• Client/main.cpp (modified) (3 diffs)
• makefile (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;
             }

client/Client/RadioButtonList.cpp

@@ -23 +23 @@
    al_clear_to_color(al_map_rgb(0, 0, 0));
 
-   int fontHeight = al_get_font_line_height(font);
+   //int fontHeight = al_get_font_line_height(font);
 
    al_draw_text(font, al_map_rgb(0, 255, 0), 0, 0, ALLEGRO_ALIGN_LEFT, this->strLabel.c_str());
@@ -44 +44 @@
    if (e.type == ALLEGRO_EVENT_MOUSE_BUTTON_UP) {
       if (e.mouse.button == 1) {
-         for (int i=0; i<this->vctRadioButtons.size(); i++) {
+         for (unsigned int i=0; i<this->vctRadioButtons.size(); i++) {
             centerY = y+26+i*20;
 

client/Client/RadioButtonList.h

@@ -15 +15 @@
    string strLabel;
    vector<string> vctRadioButtons;
-   int selectedButton;
+   unsigned int selectedButton;
 
 public:

client/Client/main.cpp

@@ -15 +15 @@
 #include <cstdio>
 #include <cstdlib>
-#include <cmath>
+//#include <cmath>
 #include <sys/types.h>
 #include <string>
@@ -133 +133 @@
    ALLEGRO_EVENT_QUEUE *event_queue = NULL;
    ALLEGRO_TIMER *timer = NULL;
-   bool key[4] = { false, false, false, false };
    map<unsigned int, Player*> mapPlayers;
    unsigned int curPlayerId = -1;
@@ -697 +696 @@
                cout << "Got a logout message" << endl;
 
-               int playerId;
+               unsigned int playerId;
 
                // Check if it's about you or another player

client/makefile

@@ -1 +1 @@
 CC = g++
 LIB_FLAGS = `pkg-config --cflags --libs --static allegro-static-5.0 allegro_ttf-static-5.0 allegro_primitives-static-5.0`
-FLAGS = $(LIB_FLAGS)
+FLAGS = -Wall
 COMMON_PATH = ../common
 DEPENDENCIES = Common.o MessageContainer.o MessageProcessor.o Player.o WorldMap.o Projectile.o Game.o GameRender.o GameSummary.o chat.o GuiComponent.o Window.o Textbox.o Button.o RadioButtonList.o TextLabel.o
 
 gameClient : Client/main.cpp $(DEPENDENCIES)
-        $(CC) -o $@ $+ $(FLAGS)
+        $(CC) -o $@ $+ $(FLAGS) $(LIB_FLAGS)
+
+%.o : Client/%.cpp
+        $(CC) -c -o $@ $? $(FLAGS)
 
 Common.o : $(COMMON_PATH)/Common.cpp
@@ -32 +35 @@
         $(CC) -c -o $@ $? $(FLAGS)
 
-%.o : Client/%.cpp
-        $(CC) -c -o $@ $? $(FLAGS)
-
 clean:
         rm *.o