[Pingus-CVS] CVS: Games/Pingus/src layer_manager.hxx,1.8,1.9 start_screen.cxx,1.14,1.15 start_screen.hxx,1.3,1.4

[torangan]

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

Modified Files:
        layer_manager.hxx start_screen.cxx start_screen.hxx 
Log Message:
- translations stuff
- small fixes


Index: layer_manager.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/layer_manager.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- layer_manager.hxx   11 Apr 2003 01:21:21 -0000      1.8
+++ layer_manager.hxx   11 Apr 2003 15:15:34 -0000      1.9
@@ -33,15 +33,15 @@
   private:
     CL_Surface sur;
 
-    float x_offset;
-    float y_offset;
-    
-    float x_update;
-    float y_update;
-
     float x_pos;
     float y_pos;
 
+    float x_update;
+    float y_update;
+
+    float x_offset;
+    float y_offset;
+    
   public:
     Layer () 
       : x_pos(0), y_pos(0),
@@ -52,8 +52,8 @@
     Layer (const CL_Surface& arg_sur, float x_o, float y_o, float x_u, float 
y_u)
       : sur(arg_sur),
         x_pos(0), y_pos(0),
-        x_offset(x_o), y_offset(y_o),
-        x_update(x_u), y_update(y_u)
+        x_update(x_u), y_update(y_u),
+        x_offset(x_o), y_offset(y_o)
     {}
     
     void draw (GraphicContext& gc) 

Index: start_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/start_screen.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- start_screen.cxx    10 Apr 2003 19:38:51 -0000      1.14
+++ start_screen.cxx    11 Apr 2003 15:15:34 -0000      1.15
@@ -41,14 +41,15 @@
   PLFHandle plf;
   Sprite background;
   std::string time_str;
- 
+  std::string description;
+  
 public:
   StartScreenComponent(PLFHandle plf);
   void draw(GraphicContext& gc);
   virtual ~StartScreenComponent() {}
   
 private:
-  std::string format_description(int length);
+  const std::string& format_description(int length);
 };
 
 class StartScreenOkButton : public GUI::SurfaceButton
@@ -172,17 +173,26 @@
 
   if (maintainer_mode)
     gc.print_left(Fonts::chalk_small, 110, 430, _("Filename: ") + 
plf->get_resname());
+    
+  CL_System::sleep(30);
 }
 
-std::string
+const std::string&
 StartScreenComponent::format_description(int length)
 {
-  std::string description = System::translate(plf->get_description());
+  if (description != "")
+    return description;
+    
+  description = System::translate(plf->get_description());
 
   unsigned int pos = 0;
   while ((pos = description.find('\t', pos)) != std::string::npos)
     description.replace(pos, 1, 1, ' ');
   
+  pos = 0;
+  while ((pos = description.find("  ", pos)) != std::string::npos)
+    description.replace(pos, 2, 1, ' ');
+
   pos = 0;  
   while ((pos = description.find('\n', pos)) != std::string::npos)
     {

Index: start_screen.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/start_screen.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- start_screen.hxx    9 Apr 2003 20:20:20 -0000       1.3
+++ start_screen.hxx    11 Apr 2003 15:15:34 -0000      1.4
@@ -27,7 +27,8 @@
 class StartScreen : public GUIScreen
 {
 private:
-  PLFHandle plf;
+  PLFHandle   plf;
+  
 public:
   StartScreen(PLFHandle plf);
   ~StartScreen();