[Pingus-CVS] CVS: Games/Pingus/src menu_button.cxx,1.7,1.8 menu_button.hxx,1.1,1.2

[grumbel]

Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv19872

Modified Files:
        menu_button.cxx menu_button.hxx 
Log Message:
fixed bug

Index: menu_button.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/menu_button.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- menu_button.cxx     5 Apr 2003 20:24:16 -0000       1.7
+++ menu_button.cxx     12 Apr 2003 13:18:43 -0000      1.8
@@ -156,12 +156,10 @@
 bool
 SurfaceButton::is_at(int x, int y)
 {
-  assert (surface);
-
-  return (x > x_pos - int(surface.get_width()) / 2
-         && x < x_pos + int(surface.get_width()) / 2
-         && y > y_pos - int(surface.get_height()) / 2
-         && y < y_pos + int(surface.get_height()) / 2);
+  return (x > x_pos - int(surface_p.get_width()) / 2
+         && x < x_pos + int(surface_p.get_width()) / 2
+         && y > y_pos - int(surface_p.get_height()) / 2
+         && y < y_pos + int(surface_p.get_height()) / 2);
 }
 
 ///////////////////////////////////////////////
@@ -182,7 +180,6 @@
   line1 = _("Credits");
   //line1["de"] = "Credits";
 
-  surface = PingusResource::load_surface("menu/ice_off", "core");
   surface_p = PingusResource::load_surface("menu/credits_on", "core");
   //  surface   = PingusResource::load_surface("NewButtons/credits_off", 
"menu");
 
@@ -218,7 +215,6 @@
   line1 = _("Options");
   //line1["de"] = "Einstellungen";
 
-  surface   = PingusResource::load_surface("menu/ice_off", "core");
   //  surface   = PingusResource::load_surface("NewButtons/options_off", 
"menu");
   surface_p = PingusResource::load_surface("menu/options_on", "core");
 
@@ -259,7 +255,6 @@
   // surface_p = PingusResource::load_surface("Buttons/quit_p", "menu");  
 
   //  surface   = PingusResource::load_surface("NewButtons/exit_off", "menu");
-  surface   = PingusResource::load_surface("menu/ice_off", "core");
   surface_p = PingusResource::load_surface("menu/exit_on", "core");  
 }
 
@@ -280,7 +275,7 @@
   x_pos = CL_Display::get_width() * 400 / 800;
   y_pos = CL_Display::get_height() * 500 / 600; 
 
-  surface   = PingusResource::load_surface("menu/load", "core");
+  //surface   = PingusResource::load_surface("menu/load", "core");
   surface_p = PingusResource::load_surface("menu/load_p", "core");
 }
 
@@ -316,8 +311,6 @@
   // surface   = PingusResource::load_surface("Buttons/editor", "menu");
   // surface_p = PingusResource::load_surface("Buttons/editor_p", "menu");
 
-  //  surface   = PingusResource::load_surface("NewButtons/ice_off", "menu");
-  surface   = PingusResource::load_surface("menu/ice_off", "core");
   surface_p = PingusResource::load_surface("menu/create_on", "core");
 }
 
@@ -345,15 +338,7 @@
   y_pos = CL_Display::get_height() * 370 / 600; 
 
   desc = _("..:: Start the game ::..");
-  //desc["de"] = "..:: Such dir eine Welt zum beginnen aus ::..";
-
   line1 = _("Start");
-
-  // surface   = PingusResource::load_surface("Buttons/worlds", "menu");
-  // surface_p = PingusResource::load_surface("Buttons/worlds_p", "menu");     
-
-  surface   = PingusResource::load_surface("menu/ice_off", "core");
-  //  surface   = PingusResource::load_surface("NewButtons/play_off", "menu");
   surface_p = PingusResource::load_surface("menu/play_on", "core");     
 }
 
@@ -386,7 +371,6 @@
   desc = _("..:: Start a contrib level ::..");
 
   line1 = _("Contrib");
-  surface   = PingusResource::load_surface("menu/ice_off", "core");
   surface_p = PingusResource::load_surface("menu/play_on", "core");
 }
 
@@ -410,7 +394,6 @@
     
   line1 = _("Multi");
   
-  surface = PingusResource::load_surface("menu/ice_off", "core");
   surface_p = PingusResource::load_surface("menu/multi_on", "core");
 }
  

Index: menu_button.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/menu_button.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- menu_button.hxx     18 Mar 2003 17:24:55 -0000      1.1
+++ menu_button.hxx     12 Apr 2003 13:18:43 -0000      1.2
@@ -32,7 +32,6 @@
 class SurfaceButton : public GUI::Component
 {
 protected:
-  CL_Surface surface;
   CL_Surface surface_p;
   CL_Font*    font;
   CL_Font*    font_large;