Changeset c51da03 in network-game for client/Client/RadioButtonList.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/RadioButtonList.cpp (modified) (2 diffs)

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;