From 0183007d0b4f3b951ef2c704894655e894ce4a71 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Thu, 7 Aug 2014 20:31:42 -0400
Subject: ACCESS: Fixes for loading room data

---
 engines/access/room.h | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'engines/access/room.h')

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);
 };
-- 
cgit v1.2.3