projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged gravity patch by T. Goya
[supertux.git]
/
src
/
badguy
/
badguy.hpp
diff --git
a/src/badguy/badguy.hpp
b/src/badguy/badguy.hpp
index
5824610
..
a6f0197
100644
(file)
--- a/
src/badguy/badguy.hpp
+++ b/
src/badguy/badguy.hpp
@@
-38,7
+38,7
@@
#include "audio/sound_manager.hpp"
#include "audio/sound_source.hpp"
#include "audio/sound_manager.hpp"
#include "audio/sound_source.hpp"
-class BadGuy : public MovingSprite, public Serializable
+class BadGuy : public MovingSprite, p
rotected UsesPhysic, p
ublic Serializable
{
public:
BadGuy(const Vector& pos, const std::string& sprite_name, int layer = LAYER_OBJECTS);
{
public:
BadGuy(const Vector& pos, const std::string& sprite_name, int layer = LAYER_OBJECTS);
@@
-175,8
+175,6
@@
protected:
*/
Player* get_nearest_player();
*/
Player* get_nearest_player();
- Physic physic;
-
/// is the enemy activated
bool activated;
/**
/// is the enemy activated
bool activated;
/**