aboutsummaryrefslogtreecommitdiff
path: root/engines/access/room.h
diff options
context:
space:
mode:
authorPaul Gilbert2014-08-07 20:31:42 -0400
committerPaul Gilbert2014-08-07 20:31:42 -0400
commit0183007d0b4f3b951ef2c704894655e894ce4a71 (patch)
tree883c94e6fae6888f1205812650a0508e6adc5f68 /engines/access/room.h
parent010ba5b1262f58eabd6e8fbca710309cf7e2c003 (diff)
downloadscummvm-rg350-0183007d0b4f3b951ef2c704894655e894ce4a71.tar.gz
scummvm-rg350-0183007d0b4f3b951ef2c704894655e894ce4a71.tar.bz2
scummvm-rg350-0183007d0b4f3b951ef2c704894655e894ce4a71.zip
ACCESS: Fixes for loading room data
Diffstat (limited to 'engines/access/room.h')
-rw-r--r--engines/access/room.h25
1 files changed, 15 insertions, 10 deletions
diff --git a/engines/access/room.h b/engines/access/room.h
index 70803b4f70..c42c3f1142 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -63,18 +63,23 @@ public:
void clearRoom();
};
-struct FileIdent {
- int _fileNum;
- int _subfile;
-};
-
-struct CellIdent : FileIdent {
- byte _cell;
-};
class RoomInfo {
public:
- bool _roomFlag;
+ struct FileIdent {
+ int _fileNum;
+ int _subfile;
+ };
+
+ struct CellIdent : FileIdent {
+ byte _cell;
+ };
+
+ struct SoundIdent : FileIdent {
+ int _priority;
+ };
+public:
+ int _roomFlag;
int _estIndex;
FileIdent _musicFile;
int _scaleH1;
@@ -90,7 +95,7 @@ public:
int _startColor;
int _numColors;
Common::Array<uint32> _vidTable;
- Common::Array<FileIdent> _sounds;
+ Common::Array<SoundIdent> _sounds;
public:
RoomInfo(const byte *data);
};