pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pingus-CVS] CVS: Games/Pingus/src pingus_main.cxx,1.57,1.58 result_scr


From: grumbel
Subject: [Pingus-CVS] CVS: Games/Pingus/src pingus_main.cxx,1.57,1.58 result_screen.cxx,1.6,1.7
Date: 30 Mar 2003 15:34:59 -0000

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

Modified Files:
        pingus_main.cxx result_screen.cxx 
Log Message:
some -Wall cleanup

Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- pingus_main.cxx     30 Mar 2003 13:12:35 -0000      1.57
+++ pingus_main.cxx     30 Mar 2003 15:34:57 -0000      1.58
@@ -641,7 +641,8 @@
   // bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 #endif 
-  std::cout << "BasePath: " << path_manager.get_base_path () << std::endl;
+  if (maintainer_mode)
+    std::cout << "BasePath: " << path_manager.get_base_path () << std::endl;
 }
 
 void
@@ -649,7 +650,7 @@
 {
   std::string greeting = "Welcome to Pingus "VERSION"!";
   std::cout <<  greeting << std::endl;
-  for (int i = 0; i < greeting.length(); ++i)
+  for (unsigned int i = 0; i < greeting.length(); ++i)
     std::cout.put('=');
   std::cout << std::endl;
   

Index: result_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/result_screen.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- result_screen.cxx   30 Mar 2003 13:12:35 -0000      1.6
+++ result_screen.cxx   30 Mar 2003 15:34:57 -0000      1.7
@@ -41,6 +41,7 @@
   std::vector<CL_Surface> chalk_pingus;
 
   ResultScreenComponent(Result arg_result);
+  virtual ~ResultScreenComponent() {}
   void draw(GraphicContext& gc) ;
 };
 
@@ -51,10 +52,10 @@
   ResultScreen* parent;
 public:
   ResultScreenOkButton(ResultScreen* p)
-    : GUI::SurfaceButton(100, 500, 
-                         ResDescriptor("result/ok", "core", 
ResDescriptor::RD_RESOURCE),
-                         ResDescriptor("result/ok", "core", 
ResDescriptor::RD_RESOURCE),
-                         ResDescriptor("result/ok", "core", 
ResDescriptor::RD_RESOURCE)),
+    : GUI::SurfaceButton(625, 425, 
+                         ResDescriptor("start/ok", "core", 
ResDescriptor::RD_RESOURCE),
+                         ResDescriptor("start/ok_clicked", "core", 
ResDescriptor::RD_RESOURCE),
+                         ResDescriptor("start/ok_hover", "core", 
ResDescriptor::RD_RESOURCE)),
       parent(p)
   {
   }
@@ -145,8 +146,12 @@
 
   ResultScreenComponent* comp = new ResultScreenComponent(result);
   gui_manager->add(comp);
-  gui_manager->add(new ResultScreenOkButton(this));
-  gui_manager->add(new ResultScreenRetryButton(this));
+
+  if (result.success())
+    gui_manager->add(new ResultScreenOkButton(this));
+  else
+    gui_manager->add(new ResultScreenRetryButton(this));
+
   //gui_manager->add(new GUI::SurfaceButton(500, 500, cancel_desc, 
cancel_desc, cancel_desc));
 }
 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]