projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for coverity #29401
[supertux.git]
/
src
/
object
/
bonus_block.hpp
diff --git
a/src/object/bonus_block.hpp
b/src/object/bonus_block.hpp
index
f993785
..
1b35529
100644
(file)
--- a/
src/object/bonus_block.hpp
+++ b/
src/object/bonus_block.hpp
@@
-1,5
+1,5
@@
// SuperTux
// SuperTux
-// Copyright (C) 2009 Ingo Ruhnke <grumbel@gm
x.de
>
+// Copyright (C) 2009 Ingo Ruhnke <grumbel@gm
ail.com
>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@
-29,16
+29,22
@@
public:
HitResponse collision(GameObject& other, const CollisionHit& hit);
void try_open(Player *player);
HitResponse collision(GameObject& other, const CollisionHit& hit);
void try_open(Player *player);
+ void try_drop(Player *player);
enum Contents {
CONTENT_COIN,
CONTENT_FIREGROW,
CONTENT_ICEGROW,
enum Contents {
CONTENT_COIN,
CONTENT_FIREGROW,
CONTENT_ICEGROW,
+ CONTENT_AIRGROW,
+ CONTENT_EARTHGROW,
CONTENT_STAR,
CONTENT_1UP,
CONTENT_CUSTOM,
CONTENT_SCRIPT,
CONTENT_STAR,
CONTENT_1UP,
CONTENT_CUSTOM,
CONTENT_SCRIPT,
- CONTENT_LIGHT
+ CONTENT_LIGHT,
+ CONTENT_TRAMPOLINE,
+ CONTENT_RAIN,
+ CONTENT_EXPLODE
};
protected:
};
protected:
@@
-46,7
+52,7
@@
protected:
public:
Contents contents;
public:
Contents contents;
-
MovingObject*
object;
+
std::shared_ptr<MovingObject>
object;
int hit_counter;
void draw(DrawingContext& context);
int hit_counter;
void draw(DrawingContext& context);