projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed output message.
[supertux.git]
/
lib
/
special
/
sprite_manager.cpp
diff --git
a/lib/special/sprite_manager.cpp
b/lib/special/sprite_manager.cpp
index
1c4b72e
..
195130e
100644
(file)
--- a/
lib/special/sprite_manager.cpp
+++ b/
lib/special/sprite_manager.cpp
@@
-19,8
+19,10
@@
#include <iostream>
#include <iostream>
-#include "utils/lispreader.h"
-#include "special/sprite_manager.h"
+#include "../utils/lispreader.h"
+#include "../special/sprite_manager.h"
+
+using namespace SuperTux;
SpriteManager::SpriteManager(const std::string& filename)
{
SpriteManager::SpriteManager(const std::string& filename)
{
@@
-86,15
+88,12
@@
Sprite*
SpriteManager::load(const std::string& name)
{
Sprites::iterator i = sprites.find(name);
SpriteManager::load(const std::string& name)
{
Sprites::iterator i = sprites.find(name);
- if (i != sprites.end())
- {
- return i->second;
- }
- else
+ if (i == sprites.end())
{
{
- std::c
out << "SpriteManager
: Sprite '" << name << "' not found" << std::endl;
+ std::c
err << "Warning
: Sprite '" << name << "' not found" << std::endl;
return 0;
}
return 0;
}
+ return i->second;
}
/* EOF */
}
/* EOF */