summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bratch <l_bratch@yahoo.co.uk>2010-11-25 20:52:08 +0000
committerLuke Bratch <l_bratch@yahoo.co.uk>2010-11-25 20:52:08 +0000
commitfd98c5d4687f4721826e78a626fead8bec7ac98b (patch)
tree40a68ff79e3f811d89d2c21399bbc9751346dec5
parent413302330666a135389b759139ff9d5b6eb20052 (diff)
Sprite: Rename loadImage to setImage, change image to a pointer, implement setImage
-rw-r--r--Sprite.cpp4
-rw-r--r--Sprite.h5
2 files changed, 5 insertions, 4 deletions
diff --git a/Sprite.cpp b/Sprite.cpp
index b8a8e72..d87368a 100644
--- a/Sprite.cpp
+++ b/Sprite.cpp
@@ -26,6 +26,6 @@ bool Sprite::visible() {
return isVisible;
}
-bool Sprite::loadImage(std::string path) {
- std::cout << "Sprite::loadImage(): Loading sprite " << path << ".\n";
+bool Sprite::setImage(std::string path) {
+ image = loadImage(path);
}
diff --git a/Sprite.h b/Sprite.h
index 59a4399..74f9bea 100644
--- a/Sprite.h
+++ b/Sprite.h
@@ -4,6 +4,7 @@
#include <string>
#include "SDL/SDL.h"
#include "SDL/SDL_image.h"
+#include "intensemarcus.h"
class Sprite {
public:
@@ -20,9 +21,9 @@ class Sprite {
bool visible();
// Load in this sprite's image
- bool loadImage(std::string path);
+ bool setImage(std::string path);
// This sprite's image
- SDL_Surface image;
+ SDL_Surface *image;
protected:
// Coordinates