pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pingus-CVS] CVS: Games/Pingus/src/editor object_manager.cxx,1.40,1.41 o


From: grumbel
Subject: [Pingus-CVS] CVS: Games/Pingus/src/editor object_manager.cxx,1.40,1.41 object_manager.hxx,1.25,1.26
Date: 19 Feb 2003 11:33:02 -0000

Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv28273/editor

Modified Files:
        object_manager.cxx object_manager.hxx 
Log Message:
- fixed music support for levels
- removed call to delete_actions(), this causes memory leak, but gets rid of 
crashing


Index: object_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- object_manager.cxx  29 Dec 2002 23:29:01 -0000      1.40
+++ object_manager.cxx  19 Feb 2003 11:33:00 -0000      1.41
@@ -69,6 +69,7 @@
 
   start_x_pos = 0;
   start_y_pos = 0;
+  music = "none";
   width = 1200;
   height = 600;
   level_time = -1;
@@ -153,6 +154,7 @@
   author      = plf->get_author();
   start_x_pos = plf->get_startx();
   start_y_pos = plf->get_starty();
+  music       = plf->get_music();
   actions     = plf->get_actions();
 
   editor_objs.push_back(new LevelResizer(this));
@@ -230,6 +232,7 @@
       << "    <difficulty>" << difficulty << "</difficulty>\n"
       << "    <playable>" << playable << "</playable>\n"
       << "    <comment>" << comment << "</comment>\n"
+      << "    <music>" << music << "</music>\n"
       << "  </global>\n"
       << std::endl;
   

Index: object_manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_manager.hxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- object_manager.hxx  3 Dec 2002 00:51:19 -0000       1.25
+++ object_manager.hxx  19 Feb 2003 11:33:00 -0000      1.26
@@ -55,6 +55,7 @@
   bool   quit;
   bool   playable;
   int    difficulty;
+  std::string music;
   std::string comment;
 
   /** All objects which are visible in the editor */ 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]