Update of /cvsroot/super-tux/supertux/lib/special
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15278/lib/special
Modified Files:
sprite.cpp
Log Message:
Do not free mirror surfaces.
Index: sprite.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/lib/special/sprite.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- sprite.cpp 9 Sep 2004 10:00:00 -0000 1.25
+++ sprite.cpp 9 Sep 2004 10:40:42 -0000 1.26
@@ -55,7 +55,10 @@
{
for(std::vector<Surface*>::iterator i_sur = i_act->second->surfaces.begin();
i_sur != i_act->second->surfaces.end(); ++i_sur)
- delete *i_sur;
+ {
+ if(!i_act->second->mirror)
+ delete *i_sur;
+ }
delete i_act->second;
}
}
@@ -106,7 +109,7 @@
{
std::vector<std::string> images;
if(!lispreader.read_string_vector("images", images))
- Termination::abort("Sprite contains no images: ", action->name.c_str());
+ Termination::abort("Sprite contains no images: ", action->name);
for(std::vector<std::string>::size_type i = 0; i < images.size(); i++)
{
|
