diff options
author | Max Horn | 2002-12-25 21:04:47 +0000 |
---|---|---|
committer | Max Horn | 2002-12-25 21:04:47 +0000 |
commit | fca9ec09e7709ff4400d2a9a7fd76f4f21781006 (patch) | |
tree | 2c9dd18841983469c4780c75d90762f8a167c048 /scumm/actor.h | |
parent | f1808d20ac90f4212fd14aeaf544a8aaac6a3fbc (diff) | |
download | scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.tar.gz scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.tar.bz2 scummvm-rg350-fca9ec09e7709ff4400d2a9a7fd76f4f21781006.zip |
moved CharsetRendere into its own header/source file; changed Scumm::_charset into a pointer, to make it possible to use different implementations of it
svn-id: r6147
Diffstat (limited to 'scumm/actor.h')
-rw-r--r-- | scumm/actor.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/actor.h b/scumm/actor.h index 3aad3e4300..f1e993f863 100644 --- a/scumm/actor.h +++ b/scumm/actor.h @@ -24,10 +24,9 @@ #ifndef ACTOR_H #define ACTOR_H -#include <string.h> -#include "scummsys.h" +#include "common/scummsys.h" -class Scumm; +#include "scumm.h" enum MoveFlags { MF_NEW_LEG = 1, @@ -158,6 +157,7 @@ public: bool isInCurrentRoom() { return room == _vm->_currentRoom; } + int getRoom() { return room; } |