projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- beginnings of a wingling
[supertux.git]
/
src
/
sprite.cpp
diff --git
a/src/sprite.cpp
b/src/sprite.cpp
index
9d03d83
..
bb31251
100644
(file)
--- a/
src/sprite.cpp
+++ b/
src/sprite.cpp
@@
-18,8
+18,10
@@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
+#include <math.h>
#include "globals.h"
#include "sprite.h"
#include "globals.h"
#include "sprite.h"
+#include "setup.h"
Sprite::Sprite(lisp_object_t* cur)
{
Sprite::Sprite(lisp_object_t* cur)
{
@@
-27,22
+29,32
@@
Sprite::Sprite(lisp_object_t* cur)
LispReader reader(cur);
LispReader reader(cur);
- reader.read_string("name", &name);
+ if(!reader.read_string("name", &name))
+ st_abort("Sprite wihtout name", "");
reader.read_int("x-hotspot", &x_hotspot);
reader.read_int("y-hotspot", &y_hotspot);
reader.read_float("fps", &fps);
reader.read_int("x-hotspot", &x_hotspot);
reader.read_int("y-hotspot", &y_hotspot);
reader.read_float("fps", &fps);
+
std::vector<std::string> images;
std::vector<std::string> images;
- reader.read_string_vector("images", &images);
-
surfaces.resize(images.size
());
+ if(!reader.read_string_vector("images", &images))
+
st_abort("Sprite contains no images: ", name.c_str
());
for(std::vector<std::string>::size_type i = 0; i < images.size(); ++i)
{
for(std::vector<std::string>::size_type i = 0; i < images.size(); ++i)
{
- surfaces[i] = new Surface(datadir + "/images/" + images[i], USE_ALPHA);
+ surfaces.push_back(
+ new Surface(datadir + "/images/" + images[i], USE_ALPHA));
}
frame_delay = 1000.0f/fps;
}
}
frame_delay = 1000.0f/fps;
}
+Sprite::~Sprite()
+{
+ for(std::vector<Surface*>::iterator i = surfaces.begin(); i != surfaces.end();
+ ++i)
+ delete *i;
+}
+
void
Sprite::init_defaults()
{
void
Sprite::init_defaults()
{