projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8f02752
)
make sure all tiles are loaded
author
Matthias Braun
<matze@braunis.de>
Sun, 3 Apr 2005 21:07:14 +0000
(21:07 +0000)
committer
Matthias Braun
<matze@braunis.de>
Sun, 3 Apr 2005 21:07:14 +0000
(21:07 +0000)
SVN-Revision: 2322
src/object/tilemap.cpp
patch
|
blob
|
history
diff --git
a/src/object/tilemap.cpp
b/src/object/tilemap.cpp
index
59557d1
..
578bb51
100644
(file)
--- a/
src/object/tilemap.cpp
+++ b/
src/object/tilemap.cpp
@@
-83,6
+83,10
@@
TileMap::TileMap(const lisp::Lisp& reader)
if(int(tiles.size()) != width*height) {
throw std::runtime_error("wrong number of tiles in tilemap.");
}
if(int(tiles.size()) != width*height) {
throw std::runtime_error("wrong number of tiles in tilemap.");
}
+
+ // make sure all tiles are loaded
+ for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i)
+ tilemanager->get(*i);
}
TileMap::TileMap(int layer_, bool solid_, size_t width_, size_t height_)
}
TileMap::TileMap(int layer_, bool solid_, size_t width_, size_t height_)
@@
-200,6
+204,10
@@
TileMap::set(int newwidth, int newheight, const std::vector<unsigned int>&newt,
solid = newsolid;
if(solid)
flags |= FLAG_SOLID;
solid = newsolid;
if(solid)
flags |= FLAG_SOLID;
+
+ // make sure all tiles are loaded
+ for(Tiles::iterator i = tiles.begin(); i != tiles.end(); ++i)
+ tilemanager->get(*i);
}
void
}
void