projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cyrillic fonts from qMax <qwiglydee@gmail.com>
[supertux.git]
/
src
/
sprite
/
sprite_data.cpp
diff --git
a/src/sprite/sprite_data.cpp
b/src/sprite/sprite_data.cpp
index
599e4e1
..
e8128b2
100644
(file)
--- a/
src/sprite/sprite_data.cpp
+++ b/
src/sprite/sprite_data.cpp
@@
-36,7
+36,7
@@
SpriteData::Action::Action()
y_offset = 0;
hitbox_w = 0;
hitbox_h = 0;
y_offset = 0;
hitbox_w = 0;
hitbox_h = 0;
- z_order = 0;
+ z_order = 0;
fps = 10;
}
fps = 10;
}
@@
-60,7
+60,7
@@
SpriteData::SpriteData(const lisp::Lisp* lisp, const std::string& basedir)
}
}
if(actions.empty())
}
}
if(actions.empty())
- throw std::runtime_error("Error: Sprite wi
ht
out actions.");
+ throw std::runtime_error("Error: Sprite wi
th
out actions.");
}
SpriteData::~SpriteData()
}
SpriteData::~SpriteData()
@@
-104,8
+104,8
@@
SpriteData::parse_action(const lisp::Lisp* lisp, const std::string& basedir)
i++) {
Surface* surface = new Surface(*(act_tmp->surfaces[i]));
surface->hflip();
i++) {
Surface* surface = new Surface(*(act_tmp->surfaces[i]));
surface->hflip();
- max_w = std::max(max_w, surface->get_width());
- max_h = std::max(max_h, surface->get_height());
+ max_w = std::max(max_w,
(float)
surface->get_width());
+ max_h = std::max(max_h,
(float)
surface->get_height());
action->surfaces.push_back(surface);
}
if (action->hitbox_w < 1) action->hitbox_w = max_w;
action->surfaces.push_back(surface);
}
if (action->hitbox_w < 1) action->hitbox_w = max_w;
@@
-124,8
+124,8
@@
SpriteData::parse_action(const lisp::Lisp* lisp, const std::string& basedir)
float max_h = 0;
for(std::vector<std::string>::size_type i = 0; i < images.size(); i++) {
Surface* surface = new Surface(basedir + images[i]);
float max_h = 0;
for(std::vector<std::string>::size_type i = 0; i < images.size(); i++) {
Surface* surface = new Surface(basedir + images[i]);
- max_w = std::max(max_w, surface->get_width());
- max_h = std::max(max_h, surface->get_height());
+ max_w = std::max(max_w,
(float)
surface->get_width());
+ max_h = std::max(max_h,
(float)
surface->get_height());
action->surfaces.push_back(surface);
}
if (action->hitbox_w < 1) action->hitbox_w = max_w;
action->surfaces.push_back(surface);
}
if (action->hitbox_w < 1) action->hitbox_w = max_w;
@@
-143,4
+143,3
@@
SpriteData::get_action(std::string act)
}
return i->second;
}
}
return i->second;
}
-