diff options
| author | Matthew Hoops | 2011-05-11 00:30:02 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-11 00:30:28 -0400 |
| commit | a1d41da096c0bcf502a85919cb1cb1ee471719c5 (patch) | |
| tree | 8c51419daa486f1d4833757db4715dadab6c3497 /engines/lure/res_struct.h | |
| parent | accb0c2a5d0c9e7b353cda4b74f511a498ed8073 (diff) | |
| parent | 33c3e19cea2a08fbf26ecbe940763e8ee1c37d28 (diff) | |
| download | scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.tar.gz scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.tar.bz2 scummvm-rg350-a1d41da096c0bcf502a85919cb1cb1ee471719c5.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
audio/decoders/qdm2.h
common/util.cpp
engines/groovie/music.cpp
engines/groovie/resource.h
video/qt_decoder.cpp
video/qt_decoder.h
Diffstat (limited to 'engines/lure/res_struct.h')
| -rw-r--r-- | engines/lure/res_struct.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/lure/res_struct.h b/engines/lure/res_struct.h index e4b8c02f6a..58ee3f4c02 100644 --- a/engines/lure/res_struct.h +++ b/engines/lure/res_struct.h @@ -27,9 +27,11 @@ #define LURE_RESSTRUCT_H #include "lure/luredefs.h" +#include "common/rect.h" #include "common/list.h" #include "common/file.h" #include "common/ptr.h" +#include "common/textconsole.h" namespace Lure { @@ -88,7 +90,7 @@ struct HotspotResource { uint16 walkY; int8 talkX; int8 talkY; - uint16 colourOffset; + uint16 colorOffset; uint16 animRecordId; uint16 hotspotScriptOffset; uint16 talkScriptOffset; @@ -538,7 +540,7 @@ public: uint16 walkY; int8 talkX; int8 talkY; - uint16 colourOffset; + uint16 colorOffset; uint16 animRecordId; uint16 hotspotScriptOffset; uint16 talkScriptOffset; |