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
/
sprite
/
sprite_manager.cpp
diff --git
a/src/sprite/sprite_manager.cpp
b/src/sprite/sprite_manager.cpp
index
aea403c
..
e6ab67f
100644
(file)
--- a/
src/sprite/sprite_manager.cpp
+++ b/
src/sprite/sprite_manager.cpp
@@
-29,10
+29,17
@@
#include "lisp/parser.hpp"
#include "lisp/list_iterator.hpp"
#include "file_system.hpp"
#include "lisp/parser.hpp"
#include "lisp/list_iterator.hpp"
#include "file_system.hpp"
+#include "msg.hpp"
SpriteManager::SpriteManager(const std::string& filename)
{
SpriteManager::SpriteManager(const std::string& filename)
{
+#ifdef DEBUG
+ Uint32 ticks = SDL_GetTicks();
+#endif
load_resfile(filename);
load_resfile(filename);
+#ifdef DEBUG
+ msg_debug("Loaded sprites in " << (SDL_GetTicks() - ticks) / 1000.0f << " seconds");
+#endif
}
SpriteManager::~SpriteManager()
}
SpriteManager::~SpriteManager()
@@
-64,12
+71,12
@@
SpriteManager::load_resfile(const std::string& filename)
} else {
delete i->second;
i->second = spritedata;
} else {
delete i->second;
i->second = spritedata;
-
std::cout << "Warning:
dulpicate entry: '" << spritedata->get_name()
- << "' in spritefile."
<< std::endl
;
+
msg_warning("
dulpicate entry: '" << spritedata->get_name()
+ << "' in spritefile."
)
;
}
} else {
}
} else {
-
std::cout << "SpriteManager:
Unknown tag '" << iter.item()
- << "' in spritefile.
\n"
;
+
msg_warning("
Unknown tag '" << iter.item()
+ << "' in spritefile.
")
;
}
}
} catch(std::exception& e) {
}
}
} catch(std::exception& e) {