projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implemented a new object factory mechanism which is now really independent of the...
[supertux.git]
/
src
/
object
/
coin.cpp
diff --git
a/src/object/coin.cpp
b/src/object/coin.cpp
index
7bdded4
..
c091018
100644
(file)
--- a/
src/object/coin.cpp
+++ b/
src/object/coin.cpp
@@
-5,7
+5,11
@@
#include "video/drawing_context.h"
#include "special/sprite_manager.h"
#include "player.h"
#include "video/drawing_context.h"
#include "special/sprite_manager.h"
#include "player.h"
+#include "sector.h"
#include "scene.h"
#include "scene.h"
+#include "gameobjs.h"
+#include "statistics.h"
+#include "object_factory.h"
Coin::Coin(const Vector& pos)
{
Coin::Coin(const Vector& pos)
{
@@
-14,6
+18,14
@@
Coin::Coin(const Vector& pos)
sprite = sprite_manager->create("coin");
}
sprite = sprite_manager->create("coin");
}
+Coin::Coin(const lisp::Lisp& reader)
+{
+ reader.get("x", bbox.p1.x);
+ reader.get("y", bbox.p1.y);
+ bbox.set_size(32, 32);
+ sprite = sprite_manager->create("coin");
+}
+
Coin::~Coin()
{
delete sprite;
Coin::~Coin()
{
delete sprite;
@@
-30,6
+42,15
@@
Coin::draw(DrawingContext& context)
sprite->draw(context, get_pos(), LAYER_TILES);
}
sprite->draw(context, get_pos(), LAYER_TILES);
}
+void
+Coin::collect()
+{
+ Sector::current()->player->get_status().incCoins();
+ Sector::current()->add_object(new BouncyCoin(get_pos()));
+ global_stats.add_points(COINS_COLLECTED_STAT, 1);
+ remove_me();
+}
+
HitResponse
Coin::collision(GameObject& other, const CollisionHit& )
{
HitResponse
Coin::collision(GameObject& other, const CollisionHit& )
{
@@
-37,8
+58,8
@@
Coin::collision(GameObject& other, const CollisionHit& )
if(player == 0)
return ABORT_MOVE;
if(player == 0)
return ABORT_MOVE;
- player->get_status().incCoins();
- remove_me();
+ collect();
return ABORT_MOVE;
}
return ABORT_MOVE;
}
+IMPLEMENT_FACTORY(Coin, "coin");