summaryrefslogtreecommitdiff
path: root/src/monster.h
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2008-09-25 00:15:44 +0000
committerIra Rice <irarice@gmail.com>2008-09-25 00:15:44 +0000
commit489a429bea6739dfa25503b9329bd9e33bffb856 (patch)
tree8112f6fd988fdc0610329b6bc14ee3f9d5801092 /src/monster.h
parent2dc8eadff1e67bb70b1772ecc19c9e1e2e40a5b4 (diff)
downloadMana-489a429bea6739dfa25503b9329bd9e33bffb856.tar.gz
Mana-489a429bea6739dfa25503b9329bd9e33bffb856.tar.bz2
Mana-489a429bea6739dfa25503b9329bd9e33bffb856.tar.xz
Mana-489a429bea6739dfa25503b9329bd9e33bffb856.zip
Merged the Tametomo branch into trunk.
Diffstat (limited to 'src/monster.h')
-rw-r--r--src/monster.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/monster.h b/src/monster.h
index b613e96d..4839966a 100644
--- a/src/monster.h
+++ b/src/monster.h
@@ -38,7 +38,7 @@ class Monster : public Being
virtual void logic();
- virtual void setAction(Uint8 action);
+ virtual void setAction(Action action);
virtual Type getType() const;