projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fixed a couple of nolok's minor bugs
[supertux.git]
/
src
/
badguy
/
nolok_01.h
diff --git
a/src/badguy/nolok_01.h
b/src/badguy/nolok_01.h
index
4049892
..
ff32034
100644
(file)
--- a/
src/badguy/nolok_01.h
+++ b/
src/badguy/nolok_01.h
@@
-18,8
+18,8
@@
public:
protected:
bool collision_squished(Player& player);
Timer2 action_timer;
-
Timer2 idle_timer
;
-
Timer2 jump_timer
;
+
enum { IDLE, WALKING, JUMPING, SHOOTING }
;
+
int action
;
};
#endif