[Pingus-CVS] rev 2233 - in branches/pingus_0_6/src: . editor worldmap

[address@hidden]

Author: torangan
Date: 2004-04-09 21:08:00 +0200 (Fri, 09 Apr 2004)
New Revision: 2233

Modified:
   branches/pingus_0_6/src/editor/editor.cxx
   branches/pingus_0_6/src/editor/editor_event.cxx
   branches/pingus_0_6/src/editor/editor_help_screen.cxx
   branches/pingus_0_6/src/pingus_main.cxx
   branches/pingus_0_6/src/plf_res_mgr.cxx
   branches/pingus_0_6/src/plf_res_mgr.hxx
   branches/pingus_0_6/src/worldmap/manager.hxx
   branches/pingus_0_6/src/worldmap/worldmap.cxx
   branches/pingus_0_6/src/xml_pdf.cxx
   branches/pingus_0_6/src/xml_plf.cxx
Log:
level ending rename


Modified: branches/pingus_0_6/src/editor/editor.cxx
===================================================================
--- branches/pingus_0_6/src/editor/editor.cxx   2004-04-09 18:18:26 UTC (rev 
2232)
+++ branches/pingus_0_6/src/editor/editor.cxx   2004-04-09 19:08:00 UTC (rev 
2233)
@@ -346,7 +346,7 @@
 
   StatManager::instance()->set_int("next-backup-id", backup_id + 1);
 
-  std::string filename = System::get_backupdir () + "pingus-backup-" + 
to_string(backup_id) + ".plf";
+  std::string filename = System::get_backupdir () + "pingus-backup-" + 
to_string(backup_id) + ".pingus";
   std::cout << "Editor: saving backup level to: " << filename << std::endl;
   object_manager->save_level_xml(filename.c_str());
   return filename;

Modified: branches/pingus_0_6/src/editor/editor_event.cxx
===================================================================
--- branches/pingus_0_6/src/editor/editor_event.cxx     2004-04-09 18:18:26 UTC 
(rev 2232)
+++ branches/pingus_0_6/src/editor/editor_event.cxx     2004-04-09 19:08:00 UTC 
(rev 2233)
@@ -614,10 +614,10 @@
 
   if (!str.empty())
     {
-      if (str.substr(str.size() - 4) ==  ".plf")
+      if (str.substr(str.size() - 7) ==  ".pingus")
        object_manager->save_level_xml(str);
       else
-       object_manager->save_level_xml(str + ".plf");
+       object_manager->save_level_xml(str + ".pingus");
 
       editor->last_level = str;
     }

Modified: branches/pingus_0_6/src/editor/editor_help_screen.cxx
===================================================================
--- branches/pingus_0_6/src/editor/editor_help_screen.cxx       2004-04-09 
18:18:26 UTC (rev 2232)
+++ branches/pingus_0_6/src/editor/editor_help_screen.cxx       2004-04-09 
19:08:00 UTC (rev 2233)
@@ -81,7 +81,7 @@
 
   x_pos = 64;
   y_pos = 500;
-  font->print_left (x_pos, y_pos + 0, _("Naming Convention: 
<LEVELNAME><NUMBER>-<CREATOR>.plf"));
+  font->print_left (x_pos, y_pos + 0, _("Naming Convention: 
<LEVELNAME><NUMBER>-<CREATOR>.pingus"));
 
   font->print_left (x_pos, y_pos + 30, _("When you have created a level and 
want to have it in the next Pingus release,\n"
                                         "please mail it to address@hidden"));

Modified: branches/pingus_0_6/src/pingus_main.cxx
===================================================================
--- branches/pingus_0_6/src/pingus_main.cxx     2004-04-09 18:18:26 UTC (rev 
2232)
+++ branches/pingus_0_6/src/pingus_main.cxx     2004-04-09 19:08:00 UTC (rev 
2233)
@@ -512,8 +512,8 @@
         << "\n   -d, --datadir PATH       Set the path to load the data files 
to `path'"
         //"   --use-datafile           Use the pre-compiled datafile 
(default)\n"
         //          "   --use-scriptfile         Use the scriptfile and read 
all data from files\n"
-        << "\n   -l, --level " << _("FILE      ") << _("Load a custom level 
from FILE")
-        << "\n   --worldmap "<< _("FILE        ") << _("Load a custom worldmap 
from FILE")
+        << "\n   -l, --level    " << _("FILE      ") << _("Load a custom level 
from FILE")
+        << "\n   --worldmap   "<< _("FILE        ") << _("Load a custom 
worldmap from FILE")
         << "\n   -v, --verbose            " << _("Print some more messages to 
stdout, can be set")
         << "\n                            " << _("multiple times to increase 
verbosity")
         << "\n   -V, --version            " << _("Prints version number and 
exit")
@@ -807,9 +807,9 @@
       if (!System::exist(levelfile))
         {
           if (System::exist(levelfile + ".xml"))
-            levelfile += ".plf";
-          else if (System::exist("levels/" + levelfile + ".plf"))
-            levelfile = "levels/" + levelfile + ".plf";
+            levelfile += ".pingus";
+          else if (System::exist("levels/" + levelfile + ".pingus"))
+            levelfile = "levels/" + levelfile + ".pingus";
           else
             {
               pout << _("PingusMain: Levelfile not found, ignoring: ") << 
levelfile << std::endl;

Modified: branches/pingus_0_6/src/plf_res_mgr.cxx
===================================================================
--- branches/pingus_0_6/src/plf_res_mgr.cxx     2004-04-09 18:18:26 UTC (rev 
2232)
+++ branches/pingus_0_6/src/plf_res_mgr.cxx     2004-04-09 19:08:00 UTC (rev 
2233)
@@ -98,7 +98,7 @@
 PLFHandle
 PLFResMgr::load_plf(const std::string& res_name)
 {
-  return load_plf_raw(res_name, path_manager.complete("levels/" + res_name + 
".plf"));
+  return load_plf_raw(res_name, path_manager.complete("levels/" + res_name + 
".pingus"));
 }
 
 void PLFResMgr::free_plf_map()

Modified: branches/pingus_0_6/src/plf_res_mgr.hxx
===================================================================
--- branches/pingus_0_6/src/plf_res_mgr.hxx     2004-04-09 18:18:26 UTC (rev 
2232)
+++ branches/pingus_0_6/src/plf_res_mgr.hxx     2004-04-09 19:08:00 UTC (rev 
2233)
@@ -47,7 +47,7 @@
   /** @return a handle to the PLF, instead of loading it from a
       res_name, load it from a system dependend filename
 
-      @param filename The filename of the plf, aka 
"../data/levels/snow11-grumbel.plf" */
+      @param filename The filename of the plf, aka 
"../data/levels/snow11-grumbel.pingus" */
   static PLFHandle load_plf_from_filename(const std::string& filename);
   static  void free_plf_map();
 };

Modified: branches/pingus_0_6/src/worldmap/manager.hxx
===================================================================
--- branches/pingus_0_6/src/worldmap/manager.hxx        2004-04-09 18:18:26 UTC 
(rev 2232)
+++ branches/pingus_0_6/src/worldmap/manager.hxx        2004-04-09 19:08:00 UTC 
(rev 2233)
@@ -101,7 +101,7 @@
 
   @param filename the filename of the new map, filename must be
   @param filename relative to the worldmap directory
-  @param filename Example: "volcano.plf" */
+  @param filename Example: "volcano.pingus" */
   void change_map (const std::string& filename, NodeId node);
 
   /** Singleton access function */

Modified: branches/pingus_0_6/src/worldmap/worldmap.cxx
===================================================================
--- branches/pingus_0_6/src/worldmap/worldmap.cxx       2004-04-09 18:18:26 UTC 
(rev 2232)
+++ branches/pingus_0_6/src/worldmap/worldmap.cxx       2004-04-09 19:08:00 UTC 
(rev 2233)
@@ -326,7 +326,7 @@
         << "      <z-pos>0</z-pos>\n"
         << "    </position>\n"
         << "  </dot>\n"
-        << "  <levelname>level10.plf</levelname>\n"
+        << "  <levelname>level10.pingus</levelname>\n"
         << "</leveldot>\n" << std::endl;
     }
 

Modified: branches/pingus_0_6/src/xml_pdf.cxx
===================================================================
--- branches/pingus_0_6/src/xml_pdf.cxx 2004-04-09 18:18:26 UTC (rev 2232)
+++ branches/pingus_0_6/src/xml_pdf.cxx 2004-04-09 19:08:00 UTC (rev 2233)
@@ -83,7 +83,7 @@
   if (levelname.empty())
     PingusError::raise("XMLPDF: No level given");
 
-  plf = PLF::create(path_manager.complete("levels/" + levelname + ".plf"));
+  plf = PLF::create(path_manager.complete("levels/" + levelname + ".pingus"));
 
   std::cout << "XXXXXXXXX Read Demo file: " << std::endl;
   write_xml(std::cout);

Modified: branches/pingus_0_6/src/xml_plf.cxx
===================================================================
--- branches/pingus_0_6/src/xml_plf.cxx 2004-04-09 18:18:26 UTC (rev 2232)
+++ branches/pingus_0_6/src/xml_plf.cxx 2004-04-09 19:08:00 UTC (rev 2233)
@@ -43,7 +43,7 @@
     PingusError::raise("XMLPLF: Couldn't open \"" + filename + "\"");
 
   resname = System::basename(System::dirname(filename))
-    + "/" + System::basename(filename.substr(0, filename.length()-4));
+    + "/" + System::basename(filename.substr(0, filename.length()-7));
 
   parse_file();
 }