projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a178705
)
Check return value of some lisp.get calls
author
Tobias Markus
<tobbi@mozilla-uk.org>
Mon, 16 Mar 2015 13:05:37 +0000
(14:05 +0100)
committer
Tobias Markus
<tobbi@mozilla-uk.org>
Mon, 16 Mar 2015 13:05:37 +0000
(14:05 +0100)
src/object/candle.cpp
patch
|
blob
|
history
diff --git
a/src/object/candle.cpp
b/src/object/candle.cpp
index
ec0ff01
..
0f93126
100644
(file)
--- a/
src/object/candle.cpp
+++ b/
src/object/candle.cpp
@@
-31,12
+31,26
@@
Candle::Candle(const Reader& lisp)
candle_light_1(SpriteManager::current()->create("images/objects/candle/candle-light-1.sprite")),
candle_light_2(SpriteManager::current()->create("images/objects/candle/candle-light-2.sprite"))
{
candle_light_1(SpriteManager::current()->create("images/objects/candle/candle-light-1.sprite")),
candle_light_2(SpriteManager::current()->create("images/objects/candle/candle-light-2.sprite"))
{
- lisp.get("name", name);
- lisp.get("burning", burning);
- lisp.get("flicker", flicker);
+
+ if(!lisp.get("name", name))
+ {
+ log_warning << "Couldn't get \"name\" property for candle." << std::endl;
+ }
+ if(!lisp.get("burning", burning))
+ {
+ log_warning << "Couldn't get \"burning\" property for candle." << std::endl;
+ }
+ if(!lisp.get("flicker", flicker))
+ {
+ log_warning << "Couldn't get \"flicker\" property for candle." << std::endl;
+ }
//get color from lisp
std::vector<float> vColor;
//get color from lisp
std::vector<float> vColor;
- lisp.get("color", vColor);
+ if(lisp.get("color", vColor))
+ {
+ log_warning << "Couldn't get \"color\" property for candle." << std::endl;
+ }
+
//change the light color if defined
if (vColor.size() >= 3) {
lightcolor = Color(vColor);
//change the light color if defined
if (vColor.size() >= 3) {
lightcolor = Color(vColor);