[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3214 - trunk/pingus/src/editor
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3214 - trunk/pingus/src/editor |
Date: |
Sat, 22 Sep 2007 03:13:20 +0200 |
Author: grumbel
Date: 2007-09-22 03:13:20 +0200 (Sat, 22 Sep 2007)
New Revision: 3214
Modified:
trunk/pingus/src/editor/editor_viewport.cpp
trunk/pingus/src/editor/object_properties.cpp
Log:
- fixed memleak
- fixed missing include
Modified: trunk/pingus/src/editor/editor_viewport.cpp
===================================================================
--- trunk/pingus/src/editor/editor_viewport.cpp 2007-09-22 01:09:12 UTC (rev
3213)
+++ trunk/pingus/src/editor/editor_viewport.cpp 2007-09-22 01:13:20 UTC (rev
3214)
@@ -423,11 +423,13 @@
for(std::vector<LevelObj*>::iterator i = selected_objs.begin(); i !=
selected_objs.end(); ++i)
(*i)->remove();
- selected_objs.clear();
-
objs.erase(std::remove_if(objs.begin(), objs.end(),
boost::mem_fn(&LevelObj::is_removed)),
objs.end());
+ for(std::vector<LevelObj*>::iterator i = selected_objs.begin(); i !=
selected_objs.end(); ++i)
+ delete (*i);
+
+ selected_objs.clear();
selection_changed(selected_objs);
}
Modified: trunk/pingus/src/editor/object_properties.cpp
===================================================================
--- trunk/pingus/src/editor/object_properties.cpp 2007-09-22 01:09:12 UTC
(rev 3213)
+++ trunk/pingus/src/editor/object_properties.cpp 2007-09-22 01:13:20 UTC
(rev 3214)
@@ -24,6 +24,7 @@
#include "level_objs.hpp"
#include "fonts.hpp"
#include "label.hpp"
+#include "gettext.h"
#include "gui_style.hpp"
#include "groundtype.hpp"
#include "combobox.hpp"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3214 - trunk/pingus/src/editor,
grumbel at BerliOS <=