projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unified Messaging Subsystem
[supertux.git]
/
src
/
tile_manager.cpp
diff --git
a/src/tile_manager.cpp
b/src/tile_manager.cpp
index
c9db17f
..
474b8f2
100644
(file)
--- a/
src/tile_manager.cpp
+++ b/
src/tile_manager.cpp
@@
-26,6
+26,7
@@
#include <assert.h>
#include <SDL.h>
#include "video/drawing_context.hpp"
#include <assert.h>
#include <SDL.h>
#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"
@@
-40,7
+41,7
@@
TileManager::TileManager(const std::string& filename)
#endif
load_tileset(filename);
#ifdef DEBUG
#endif
load_tileset(filename);
#ifdef DEBUG
-
printf("Tiles loaded in %f seconds\n", (SDL_GetTicks() - ticks) / 1000.0
);
+
msg_debug("Tiles loaded in " << (SDL_GetTicks() - ticks) / 1000.0 << "seconds"
);
#endif
}
#endif
}
@@
-80,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")
;
}
tiles[tile->id] = tile;
} else if(iter.item() == "tilegroup") {
}
tiles[tile->id] = tile;
} else if(iter.item() == "tilegroup") {
@@
-137,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")
;
}
}
}
}
}
}