- replaced YES/NO with true/false

[supertux.git] / src / button.cpp

diff --git a/src/button.cpp b/src/button.cpp
index 6efc8c8..c13439e 100644 (file)
--- a/src/button.cpp
+++ b/src/button.cpp
@@ -23,13 +23,13 @@ void button_load(button_type* pbutton,char* icon_file, char* info, SDLKey shortc
 
   if(icon_file != NULL)
     {
-      snprintf(filename, 1024, "%s/%s", DATA_PREFIX, icon_file);
+      snprintf(filename, 1024, "%s/%s", datadir.c_str(), icon_file);
       if(!faccessible(filename))
-        snprintf(filename, 1024, "%s/images/icons/default-icon.png", DATA_PREFIX);
+        snprintf(filename, 1024, "%s/images/icons/default-icon.png", datadir.c_str());
     }
   else
     {
-      snprintf(filename, 1024, "%s/images/icons/default-icon.png", DATA_PREFIX);
+      snprintf(filename, 1024, "%s/images/icons/default-icon.png", datadir.c_str());
     }
   texture_load(&pbutton->icon,filename,USE_ALPHA);
 
@@ -50,8 +50,8 @@ void button_load(button_type* pbutton,char* icon_file, char* info, SDLKey shortc
   pbutton->w = pbutton->icon.w;
   pbutton->h = pbutton->icon.h;
   pbutton->tag = -1;
-  pbutton->state = -1;
-  pbutton->show_info = NO;
+  pbutton->state = BUTTON_NONE;
+  pbutton->show_info = false;
   pbutton->bkgd = NULL;
 }
 
@@ -61,13 +61,13 @@ void button_change_icon(button_type* pbutton,char* icon_file)
 
   if(icon_file != NULL)
     {
-      snprintf(filename, 1024, "%s/%s", DATA_PREFIX, icon_file);
+      snprintf(filename, 1024, "%s/%s", datadir.c_str(), icon_file);
       if(!faccessible(filename))
-        snprintf(filename, 1024, "%s/images/icons/default-icon.png", DATA_PREFIX);
+        snprintf(filename, 1024, "%s/images/icons/default-icon.png", datadir.c_str());
     }
   else
     {
-      snprintf(filename, 1024, "%s/images/icons/default-icon.png", DATA_PREFIX);
+      snprintf(filename, 1024, "%s/images/icons/default-icon.png", datadir.c_str());
     }
   
   texture_free(&pbutton->icon);
@@ -90,7 +90,7 @@ void button_draw(button_type* pbutton)
   texture_draw(pbutton->bkgd,pbutton->x,pbutton->y,NO_UPDATE);
   }
   texture_draw(&pbutton->icon,pbutton->x,pbutton->y,NO_UPDATE);
-  if(pbutton->show_info == YES)
+  if(pbutton->show_info)
     {
       char str[80];
       int i = -32;
@@ -103,9 +103,9 @@ void button_draw(button_type* pbutton)
       sprintf(str,"(%s)", SDL_GetKeyName(pbutton->shortcut));
       text_draw(&white_small_text, str, i + pbutton->x - strlen(str) * white_small_text.w, pbutton->y + white_small_text.h+2, 1, NO_UPDATE);
     }
-  if(pbutton->state == BN_PRESSED)
+  if(pbutton->state == BUTTON_PRESSED)
     fillrect(pbutton->x,pbutton->y,pbutton->w,pbutton->h,75,75,75,200);
-  else if(pbutton->state == BN_HOVER)
+  else if(pbutton->state == BUTTON_HOVER)
     fillrect(pbutton->x,pbutton->y,pbutton->w,pbutton->h,150,150,150,128);
 }
 
@@ -126,55 +126,55 @@ void button_event(button_type* pbutton, SDL_Event *event)
         {
           if(event->button.button == SDL_BUTTON_LEFT)
             {
-              pbutton->state = BN_PRESSED;
+              pbutton->state = BUTTON_PRESSED;
             }
           else
             {
-              pbutton->show_info = YES;
+              pbutton->show_info = true;
             }
         }
       else if(event->type == SDL_MOUSEBUTTONUP)
         {
-          if(event->button.button == SDL_BUTTON_LEFT && pbutton->state == BN_PRESSED)
+          if(event->button.button == SDL_BUTTON_LEFT && pbutton->state == BUTTON_PRESSED)
             {
-              pbutton->state = BN_CLICKED;
+              pbutton->state = BUTTON_CLICKED;
             }
-          else if(event->button.button != SDL_BUTTON_LEFT && pbutton->state != BN_PRESSED)
+          else if(event->button.button != SDL_BUTTON_LEFT && pbutton->state != BUTTON_PRESSED)
             {
-              pbutton->show_info = YES;
+              pbutton->show_info = true;
             }
         }
 
-      if(pbutton->state != BN_PRESSED && pbutton->state != BN_CLICKED)
+      if(pbutton->state != BUTTON_PRESSED && pbutton->state != BUTTON_CLICKED)
         {
-          pbutton->state = BN_HOVER;
+          pbutton->state = BUTTON_HOVER;
         }
     }
   else if(event->type != SDL_KEYDOWN && event->type != SDL_KEYUP)
     {
-      pbutton->state = -1;
+      pbutton->state = BUTTON_NONE;
       if(pbutton->show_info)
         {
-          pbutton->show_info = NO;
+          pbutton->show_info = false;
         }
     }
 
   if(event->type == SDL_KEYDOWN)
     {
       if(key == pbutton->shortcut)
-        pbutton->state = BN_PRESSED;
+        pbutton->state = BUTTON_PRESSED;
     }
   else if(event->type == SDL_KEYUP)
     {
-      if(pbutton->state == BN_PRESSED && key == pbutton->shortcut)
-        pbutton->state = BN_CLICKED;
+      if(pbutton->state == BUTTON_PRESSED && key == pbutton->shortcut)
+        pbutton->state = BUTTON_CLICKED;
     }
   else if(event->type == SDL_MOUSEMOTION)
     {
 
       if(pbutton->show_info)
         {
-          pbutton->show_info = NO;
+          pbutton->show_info = false;
         }
     }
 }
@@ -182,10 +182,10 @@ void button_event(button_type* pbutton, SDL_Event *event)
 int button_get_state(button_type* pbutton)
 {
   int state;
-  if(pbutton->state == BN_CLICKED)
+  if(pbutton->state == BUTTON_CLICKED)
     {
       state = pbutton->state;
-      pbutton->state = -1;
+      pbutton->state = BUTTON_NONE;
       return state;
     }
   else
@@ -202,12 +202,12 @@ void button_panel_init(button_panel_type* pbutton_panel, int x, int y, int w, in
   pbutton_panel->y = y;
   pbutton_panel->w = w;
   pbutton_panel->h = h;
-  pbutton_panel->hidden = NO;
+  pbutton_panel->hidden = false;
 }
 
 button_type* button_panel_event(button_panel_type* pbutton_panel, SDL_Event* event)
 {
-  if(pbutton_panel->hidden == NO)
+  if(pbutton_panel->hidden == false)
     {
       int i;
       for(i = 0; i < pbutton_panel->num_items; ++i)
@@ -237,7 +237,7 @@ void button_panel_free(button_panel_type* pbutton_panel)
 
 void button_panel_draw(button_panel_type* pbutton_panel)
 {
-  if(pbutton_panel->hidden == NO)
+  if(pbutton_panel->hidden == false)
     {
       int i;
       fillrect(pbutton_panel->x,pbutton_panel->y,pbutton_panel->w,pbutton_panel->h,100,100,100,200);