projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Messaging subsystem rewrite, step I
[supertux.git]
/
src
/
tile_manager.cpp
diff --git
a/src/tile_manager.cpp
b/src/tile_manager.cpp
index
25c4997
..
c551acd
100644
(file)
--- a/
src/tile_manager.cpp
+++ b/
src/tile_manager.cpp
@@
-24,7
+24,9
@@
#include <sstream>
#include <iostream>
#include <assert.h>
#include <sstream>
#include <iostream>
#include <assert.h>
+#include <SDL.h>
#include "video/drawing_context.hpp"
#include "video/drawing_context.hpp"
+#include "msg.hpp"
#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
#include "lisp/list_iterator.hpp"
#include "lisp/lisp.hpp"
#include "lisp/parser.hpp"
#include "lisp/list_iterator.hpp"
@@
-34,7
+36,13
@@
TileManager::TileManager(const std::string& filename)
{
TileManager::TileManager(const std::string& filename)
{
+#ifdef DEBUG
+ Uint32 ticks = SDL_GetTicks();
+#endif
load_tileset(filename);
load_tileset(filename);
+#ifdef DEBUG
+ msg_debug << "Tiles loaded in " << (SDL_GetTicks() - ticks) / 1000.0 << " seconds" << std::endl;
+#endif
}
TileManager::~TileManager()
}
TileManager::~TileManager()
@@
-73,7
+81,7
@@
void TileManager::load_tileset(std::string filename)
tiles.push_back(0);
}
if(tiles[tile->id] != 0) {
tiles.push_back(0);
}
if(tiles[tile->id] != 0) {
-
std::cout << "Warning: Tile with ID " << tile->id << " redefined\n"
;
+
msg_warning << "Tile with ID " << tile->id << " redefined" << std::endl
;
}
tiles[tile->id] = tile;
} else if(iter.item() == "tilegroup") {
}
tiles[tile->id] = tile;
} else if(iter.item() == "tilegroup") {
@@
-130,7
+138,7
@@
void TileManager::load_tileset(std::string filename)
} else if(iter.item() == "properties") {
// deprecated
} else {
} else if(iter.item() == "properties") {
// deprecated
} else {
-
std::cerr << "Unknown symbol '" << iter.item() << "' tile defintion file.\n"
;
+
msg_warning << "Unknown symbol '" << iter.item() << "' tile defintion file" << std::endl
;
}
}
}
}
}
}