[Pingus-CVS] r3201 - in trunk/pingus: . src src/editor

[grumbel at BerliOS]

Author: grumbel
Date: 2007-09-21 16:37:23 +0200 (Fri, 21 Sep 2007)
New Revision: 3201

Modified:
   trunk/pingus/TODO
   trunk/pingus/src/editor/editor_screen.cpp
   trunk/pingus/src/editor/object_selector.cpp
   trunk/pingus/src/system.cpp
Log:
- fixed tmp saves, go now to the user dir instead of datadir

Modified: trunk/pingus/TODO
===================================================================
--- trunk/pingus/TODO   2007-09-21 14:27:48 UTC (rev 3200)
+++ trunk/pingus/TODO   2007-09-21 14:37:23 UTC (rev 3201)
@@ -177,12 +177,14 @@
 Important:
 ==========
 
-- implement proper tmpfile Support (save tmp levels to ~/.pingus/tmp/
-  for backup purpose in case of editor crash or so)
+- all done!
 
 Less Important:
 ===============
 
+- implement proper tmpfile Support (save tmp levels to ~/.pingus/tmp/
+  for backup purpose in case of editor crash or so)
+
 - keyboard shortcuts need to be implemented (use input framework, but
   how without support for keymaps?)
 

Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp   2007-09-21 14:27:48 UTC (rev 
3200)
+++ trunk/pingus/src/editor/editor_screen.cpp   2007-09-21 14:37:23 UTC (rev 
3201)
@@ -273,10 +273,9 @@
 void
 EditorScreen::level_play()
 {
-  plf->save_level(path_manager.complete("levels/editortmpfile.pingus"));
-  PingusLevel level("levels/editortmpfile.pingus",
-                    Pathname("levels/editortmpfile.pingus", 
Pathname::DATA_PATH));
-
+  Pathname tmp(System::get_statdir() + "backup/editortmpfile.pingus", 
Pathname::SYSTEM_PATH);
+  plf->save_level(tmp.get_sys_path());
+  PingusLevel level(tmp);
   ScreenManager::instance()->push_screen(new PingusGameSession(level, false), 
true);
 }
 

Modified: trunk/pingus/src/editor/object_selector.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector.cpp 2007-09-21 14:27:48 UTC (rev 
3200)
+++ trunk/pingus/src/editor/object_selector.cpp 2007-09-21 14:37:23 UTC (rev 
3201)
@@ -500,7 +500,8 @@
 ObjectSelector::create_trap()
 {
   // Need to differentiate the different trap types
-  return create_objects("traps");
+  //return create_objects("traps");
+  return new ObjectSelectorSet(object_list, 48, 48);
 }
 
 ObjectSelectorSet*

Modified: trunk/pingus/src/system.cpp
===================================================================
--- trunk/pingus/src/system.cpp 2007-09-21 14:27:48 UTC (rev 3200)
+++ trunk/pingus/src/system.cpp 2007-09-21 14:37:23 UTC (rev 3201)
@@ -289,6 +289,9 @@
   // Recorded demos will per default be writen in this directory
   create_dir(statdir + "demos/");
 
+  // User created images
+  create_dir(statdir + "backup/");
+
   // Screenshots will be dumped to that directory:
   create_dir(statdir + "screenshots/");
   // create_dir(vardir);