[Pingus-CVS] CVS: Games/Pingus/src Makefile.static,1.16,1.17 global_event.cxx,1.8,1.9 pingus_main.cxx,1.61,1.62 pingus_menu.cxx,1.16,1.17 savegame.cxx,1.1,1.2 savegame.hxx,1.1,1.2 savegame_manager.cxx,1.2,1.3 savegame_manager.hxx,1.1,1.2 stat_manager.cxx,1.5,1.6

[grumbel]

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

Modified Files:
        Makefile.static global_event.cxx pingus_main.cxx 
        pingus_menu.cxx savegame.cxx savegame.hxx savegame_manager.cxx 
        savegame_manager.hxx stat_manager.cxx 
Log Message:
- some small error corrections in the text
 - unlocked first level if no savegame is present

Index: Makefile.static
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/Makefile.static,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Makefile.static     1 Apr 2003 13:21:20 -0000       1.16
+++ Makefile.static     1 Apr 2003 15:13:33 -0000       1.17
@@ -1,4 +1,4 @@
-# Compile with CL_HAS_KEY_GRAVE!
+# Compile with -DCL_HAS_KEY_GRAVE -DOFFICIAL_PINGUS_BUILD
 
 LDADD = backgrounds/libpingus_backgrounds.a \
 colliders/libpingus_colliders.a \

Index: global_event.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/global_event.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- global_event.cxx    1 Apr 2003 13:21:20 -0000       1.8
+++ global_event.cxx    1 Apr 2003 15:13:33 -0000       1.9
@@ -37,8 +37,6 @@
 void
 GlobalEvent::on_button_press(CL_InputDevice *device, const CL_Key &key)
 {
-  //  std::cout << "Button pressed..." << std::endl;
-
   if (device == CL_Input::keyboards[0])
     {
       switch (key.id)
@@ -89,8 +87,17 @@
          break;
 
        case CL_KEY_C:
-         draw_collision_map = !draw_collision_map;
+          if (maintainer_mode)
+            draw_collision_map = !draw_collision_map;
          break;
+
+        case CL_KEY_M:
+          if (CL_Keyboard::get_keycode(CL_KEY_LCTRL) || 
CL_Keyboard::get_keycode(CL_KEY_RCTRL) )
+            {
+              std::cout << "Maintainer Mode: " << maintainer_mode << std::endl;
+              maintainer_mode = !maintainer_mode;
+            }
+          break;
 
        case CL_KEY_END:
          if (CL_Keyboard::get_keycode(CL_KEY_LCTRL) 

Index: pingus_main.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- pingus_main.cxx     1 Apr 2003 13:21:20 -0000       1.61
+++ pingus_main.cxx     1 Apr 2003 15:13:33 -0000       1.62
@@ -144,7 +144,11 @@
 char* 
 PingusMain::get_title()
 {
-  static char title[] = "Pingus - http://pingus.seul.org";;
+#ifdef OFFICIAL_PINGUS_BUILD
+  static char title[] = "Pingus "VERSION" - http://pingus.seul.org";;
+#else
+  static char title[] = "Pingus "VERSION" (unofficial build) - 
http://pingus.seul.org";;
+#endif
   return title;
   //return (string(PACKAGE) + " " + VERSION + " - 
http://pingus.seul.org";).c_str();
 }

Index: pingus_menu.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_menu.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- pingus_menu.cxx     1 Apr 2003 13:21:20 -0000       1.16
+++ pingus_menu.cxx     1 Apr 2003 15:13:33 -0000       1.17
@@ -35,7 +35,7 @@
 {
   if (!is_init)
     {
-      pout << "PingusMenu::init ()" << std::endl;
+      //pout << "PingusMenu::init ()" << std::endl;
       //event_enabled = true;
       is_init = true;
 

Index: savegame.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/savegame.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- savegame.cxx        26 Mar 2003 12:01:17 -0000      1.1
+++ savegame.cxx        1 Apr 2003 15:13:33 -0000       1.2
@@ -54,6 +54,13 @@
     return NONE;
 }
 
+Savegame::Savegame()
+{
+  status = ACCESSIBLE;
+  saved_pingus = 0;
+  time = 0;
+}
+
 Savegame::Savegame(xmlDocPtr doc, xmlNodePtr node)
 {
   read_xml(doc, node);

Index: savegame.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/savegame.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- savegame.hxx        26 Mar 2003 12:01:17 -0000      1.1
+++ savegame.hxx        1 Apr 2003 15:13:33 -0000       1.2
@@ -45,7 +45,7 @@
   /** Number of Pingus that where saved while playing the level */
   int saved_pingus;
 
-  Savegame() {}
+  Savegame();
   Savegame(xmlDocPtr doc, xmlNodePtr node);
   Savegame(std::string arg_levelname, Status arg_status, int arg_time, int 
arg_saved_pingus);
 

Index: savegame_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/savegame_manager.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- savegame_manager.cxx        28 Mar 2003 12:06:32 -0000      1.2
+++ savegame_manager.cxx        1 Apr 2003 15:13:33 -0000       1.3
@@ -34,10 +34,6 @@
     return (instance_ = new SavegameManager(System::get_statdir() + 
"stat/savegame.xml")); 
 }
 
-SavegameManager::SavegameManager()
-{
-}
-
 SavegameManager::SavegameManager(const std::string& arg_filename)
   : filename(arg_filename)
 {
@@ -47,6 +43,11 @@
     {
       std::cout << "SavegameManager: Couldn't find savegame file '" << filename
                 << "', starting with a empty one." << std::endl;
+      // FIXME: Unlock the first level
+      Savegame savegame;
+      savegame.status = Savegame::ACCESSIBLE;
+      savegame.levelname = "tutorial/digger-tutorial2-grumbel";
+      store(savegame);
     }
   else
     {

Index: savegame_manager.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/savegame_manager.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- savegame_manager.hxx        26 Mar 2003 12:01:17 -0000      1.1
+++ savegame_manager.hxx        1 Apr 2003 15:13:33 -0000       1.2
@@ -35,7 +35,6 @@
 public:
   static SavegameManager* instance();
 
-  SavegameManager();
   SavegameManager(const std::string& filename);
   ~SavegameManager();
   

Index: stat_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/stat_manager.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- stat_manager.cxx    30 Mar 2003 13:12:35 -0000      1.5
+++ stat_manager.cxx    1 Apr 2003 15:13:33 -0000       1.6
@@ -79,7 +79,7 @@
             {
               std::string name  = (const char*)(cur->name);
               std::string value = XMLhelper::parse_string(doc, cur);
-              std::cout << "Stat: " << name << " = " << value << std::endl;
+              //std::cout << "Stat: " << name << " = " << value << std::endl;
               stats[name] = value;
 
               cur = cur->next;