diff options
| author | Martin Kiewitz | 2013-12-04 20:42:50 +0100 |
|---|---|---|
| committer | Martin Kiewitz | 2013-12-04 20:42:50 +0100 |
| commit | eaf6367bb26b95af7e27ebbbb090664a3ad04e65 (patch) | |
| tree | f4acee388f2591f0cfa0848aa337f9cca5733c0d /engines/parallaction/objects.h | |
| parent | 8bdffcb2fb7aefc96aa10fde1bebd372233cac9d (diff) | |
| parent | 203f562d375ac5c7cc665c8feac4020f8de2a5ff (diff) | |
| download | scummvm-rg350-eaf6367bb26b95af7e27ebbbb090664a3ad04e65.tar.gz scummvm-rg350-eaf6367bb26b95af7e27ebbbb090664a3ad04e65.tar.bz2 scummvm-rg350-eaf6367bb26b95af7e27ebbbb090664a3ad04e65.zip | |
Merge branch 'master' of github.com:scummvm/scummvm
Diffstat (limited to 'engines/parallaction/objects.h')
| -rw-r--r-- | engines/parallaction/objects.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/parallaction/objects.h b/engines/parallaction/objects.h index 81761b2c6b..89e8134431 100644 --- a/engines/parallaction/objects.h +++ b/engines/parallaction/objects.h @@ -147,7 +147,7 @@ typedef Common::List<CommandPtr> CommandList; struct Answer { Common::String _text; uint16 _mood; - Common::String _followingName; + Common::String _followingName; CommandList _commands; uint32 _noFlags; @@ -188,7 +188,7 @@ struct Dialogue { ~Dialogue(); }; -#define MAX_WALKPOINT_LISTS 20 +#define MAX_WALKPOINT_LISTS 20 #define FREE_HEAR_CHANNEL -1 #define MUSIC_HEAR_CHANNEL -2 @@ -452,7 +452,7 @@ struct Program { uint16 _numLocals; uint32 _ip; - uint32 _loopStart; + uint32 _loopStart; InstructionList _instructions; uint32 _status; |