Made these two compilable. Were accessing text's w and h variables.

SVN-Revision: 1393

diff --git a/src/button.cpp b/src/button.cpp
index 766407e..f144bb3 100644 (file)
--- a/src/button.cpp
+++ b/src/button.cpp
@@ -119,13 +119,13 @@ void Button::draw(DrawingContext& context)
     char str[80];
     int i = -32;
 
     char str[80];
     int i = -32;
 

-    if(0 > rect.x - (int)strlen(info.c_str()) * white_small_text->w)
-      i = rect.w + strlen(info.c_str()) * white_small_text->w;
+    if(0 > rect.x - white_small_text->get_text_width(info))
+      i = rect.w + (int)white_small_text->get_text_width(info);

 
     if(!info.empty())
 
     if(!info.empty())

-      context.draw_text(white_small_text, info.c_str(), Vector(i + rect.x - strlen(info.c_str()) * white_small_text->w, rect.y), LAYER_GUI);
+      context.draw_text(white_small_text, info, Vector(i + rect.x - white_small_text->get_text_width(info), rect.y), LAYER_GUI);

     sprintf(str,"(%s)", SDL_GetKeyName(shortcut));
     sprintf(str,"(%s)", SDL_GetKeyName(shortcut));

-    context.draw_text(white_small_text, str, Vector(i + rect.x - strlen(str) * white_small_text->w, rect.y + white_small_text->h+2), LAYER_GUI);
+    context.draw_text(white_small_text, str, Vector(i + rect.x -  white_small_text->get_text_width(str), rect.y + white_small_text->get_height()+2), LAYER_GUI);

   }
   if(state == BUTTON_PRESSED || state == BUTTON_DEACTIVE)
     fillrect(rect.x,rect.y,rect.w,rect.h,75,75,75,200);
   }
   if(state == BUTTON_PRESSED || state == BUTTON_DEACTIVE)
     fillrect(rect.x,rect.y,rect.w,rect.h,75,75,75,200);

diff --git a/src/leveleditor.cpp b/src/leveleditor.cpp
index 291c59d..9d1fb61 100644 (file)
--- a/src/leveleditor.cpp
+++ b/src/leveleditor.cpp
@@ -1880,7 +1880,7 @@ void le_showhelp()
     context.draw_text_center(blue_text, "- Help -", Vector(0, 30), LAYER_GUI);
 
     for(unsigned int t = 0; t < sizeof(text[i])/sizeof(char *); t++)
     context.draw_text_center(blue_text, "- Help -", Vector(0, 30), LAYER_GUI);
 
     for(unsigned int t = 0; t < sizeof(text[i])/sizeof(char *); t++)

-      context.draw_text(white_text, text[i][t], Vector(5, 80+(t*white_text->h)), LAYER_GUI);
+      context.draw_text(white_text, text[i][t], Vector(5, 80+(t*white_text->get_height())), LAYER_GUI);

 
     sprintf(str,"Press any key to continue - Page %d/%d?", i, sizeof(text));
     context.draw_text(gold_text, str, Vector(0, 0), LAYER_GUI);
 
     sprintf(str,"Press any key to continue - Page %d/%d?", i, sizeof(text));
     context.draw_text(gold_text, str, Vector(0, 0), LAYER_GUI);