summaryrefslogtreecommitdiff
path: root/src/engine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine.cpp')
-rw-r--r--src/engine.cpp33
1 files changed, 1 insertions, 32 deletions
diff --git a/src/engine.cpp b/src/engine.cpp
index adda6d06..2d93a842 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -272,38 +272,7 @@ void Engine::logic()
{
Being *being = (*beingIterator);
- if (being->job < 10) { // A player
- switch (being->action) {
- case WALK:
- being->frame = (get_elapsed_time(being->walk_time) * 4) /
- (being->speed);
- if (being->frame >= 4) {
- being->nextStep();
- }
- break;
- case ATTACK:
- being->frame = (get_elapsed_time(being->walk_time) * 4) /
- (being->aspd);
- if (being->frame >= 4) {
- being->nextStep();
- }
- break;
- default:
- break;
- }
-
- if (being->emotion != 0) {
- being->emotion_time--;
- if (being->emotion_time == 0) {
- being->emotion = 0;
- }
- }
- }
-
- if (get_elapsed_time(being->speech_time) > 5000)
- being->showSpeech = false;
- if (get_elapsed_time(being->damage_time) > 3000)
- being->showDamage = false;
+ being->logic();
if (being->action == MONSTER_DEAD && being->frame >= 20) {
delete being;