[Pingus-CVS] r2553 - in trunk/src: . editor worldmap

[jave27]

Author: jave27
Date: 2005-12-08 22:42:33 +0100 (Thu, 08 Dec 2005)
New Revision: 2553

Modified:
   trunk/src/editor/editor_viewport.cxx
   trunk/src/editor/editor_viewport.hxx
   trunk/src/file_dialog_item.cxx
   trunk/src/file_dialog_listener.hxx
   trunk/src/worldmap/worldmap_story.cxx
Log:
More cleanup and some translation fixes.

Modified: trunk/src/editor/editor_viewport.cxx
===================================================================
--- trunk/src/editor/editor_viewport.cxx        2005-12-08 21:16:15 UTC (rev 
2552)
+++ trunk/src/editor/editor_viewport.cxx        2005-12-08 21:42:33 UTC (rev 
2553)
@@ -34,10 +34,10 @@
 
 // Constructor
 EditorViewport::EditorViewport(EditorScreen* e) :
+       state(CL_Display::get_width(), CL_Display::get_height()),
        scene_context(new SceneContext()),
        editor(e),
        bg_surface(0),
-       state(CL_Display::get_width(), CL_Display::get_height()),
        autoscroll(true)
 {
        // FIXME: Hardcoded values should be determined by level size

Modified: trunk/src/editor/editor_viewport.hxx
===================================================================
--- trunk/src/editor/editor_viewport.hxx        2005-12-08 21:16:15 UTC (rev 
2552)
+++ trunk/src/editor/editor_viewport.hxx        2005-12-08 21:42:33 UTC (rev 
2553)
@@ -85,14 +85,6 @@
        /** Background image - if null, will display dark gray background */
        CL_Surface* bg_surface;
 
-       /** Vector where this Viewport starts 
-       Vector start_pos;
-
-       /** Vector where this Viewport ends 
-       Vector end_pos;
-
-       */
-
        /** Whether or not Autoscrolling is turned on */
        bool autoscroll;
 

Modified: trunk/src/file_dialog_item.cxx
===================================================================
--- trunk/src/file_dialog_item.cxx      2005-12-08 21:16:15 UTC (rev 2552)
+++ trunk/src/file_dialog_item.cxx      2005-12-08 21:42:33 UTC (rev 2553)
@@ -82,7 +82,8 @@
                                                        // It's a level file
                                                        
reader.read_string("levelname",   file_item.friendly_name);
                                                        
reader.read_string("difficulty",  file_info);
-                                                       file_info = 
"Difficulty: " + file_info;
+                                                       file_item.friendly_name 
= _(file_item.friendly_name);
+                                                       file_info = 
_("Difficulty: ") + file_info;
                                                }
                                                else
                                                {
@@ -90,6 +91,9 @@
                                                        // FIXME: Add more 
types eventually
                                                        
reader.read_string("name",        file_item.friendly_name);
                                                        
reader.read_string("description", file_info);
+                                                       file_item.friendly_name 
= _(file_item.friendly_name);
+                                                       file_info = 
_(file_info);
+
                                                }
                                                // Have to limit the size of 
the printed name
                                                file_item.friendly_name = 
file_item.friendly_name.substr(0, 23);

Modified: trunk/src/file_dialog_listener.hxx
===================================================================
--- trunk/src/file_dialog_listener.hxx  2005-12-08 21:16:15 UTC (rev 2552)
+++ trunk/src/file_dialog_listener.hxx  2005-12-08 21:42:33 UTC (rev 2553)
@@ -27,6 +27,7 @@
 
        class FileDialogListener {
        public:
+               virtual ~FileDialogListener() {}
                virtual void save(const std::string &file, const std::string 
&filemask) { }
                virtual void load(const std::string &file, const std::string 
&filemask) { }
        };      // class FileDialogListener

Modified: trunk/src/worldmap/worldmap_story.cxx
===================================================================
--- trunk/src/worldmap/worldmap_story.cxx       2005-12-08 21:16:15 UTC (rev 
2552)
+++ trunk/src/worldmap/worldmap_story.cxx       2005-12-08 21:42:33 UTC (rev 
2553)
@@ -40,6 +40,7 @@
        WorldMapStory::WorldMapStory(const FileReader &reader)
        {
                reader.read_string("title", title);
+               title = _(title);
                reader.read_string("music", music);
                FileReader all_pages = reader.read_section("pages");