Moved location parsing out of the engines, to LocationParser_ns and LocationParser_br.

svn-id: r31958

1 files changed, 7 insertions, 258 deletions

diff --git a/engines/parallaction/staticres.cpp b/engines/parallaction/staticres.cpp
index 53d370a0a8..3c2051795d 100644
--- a/engines/parallaction/staticres.cpp
+++ b/engines/parallaction/staticres.cpp
@@ -216,58 +216,6 @@ byte _amigaTopazFont[2600] = {
 };
 
 
-
-const char *_zoneFlagNamesRes_ns[] = {
-	"closed",
-	"active",
-	"remove",
-	"acting",
-	"locked",
-	"fixed",
-	"noname",
-	"nomasked",
-	"looping",
-	"added",
-	"character",
-	"nowalk"
-};
-
-const char *_zoneTypeNamesRes_ns[] = {
-	"examine",
-	"door",
-	"get",
-	"merge",
-	"taste",
-	"hear",
-	"feel",
-	"speak",
-	"none",
-	"trap",
-	"yourself",
-	"Command"
-};
-
-const char *_commandsNamesRes_ns[] = {
-	"set",
-	"clear",
-	"start",
-	"speak",
-	"get",
-	"location",
-	"open",
-	"close",
-	"on",
-	"off",
-	"call",
-	"toggle",
-	"drop",
-	"quit",
-	"move",
-	"stop",
-	"endcommands",
-	"endzone"
-};
-
 const char *_instructionNamesRes_ns[] = {
 	"on",
 	"off",
@@ -318,80 +266,6 @@ const char *_callableNamesRes_ns[] = {
 	"TestResult"
 };
 
-const char *_locationStmtRes_ns[] = {
-	"endlocation",
-	"location",
-	"disk",
-	"nodes",
-	"zone",
-	"animation",
-	"localflags",
-	"commands",
-	"acommands",
-	"flags",
-	"comment",
-	"endcomment",
-	"sound",
-	"music"
-};
-
-const char *_locationZoneStmtRes_ns[] = {
-	"limits",
-	"moveto",
-	"type",
-	"commands",
-	"label",
-	"flags",
-	"endzone"
-};
-
-const char *_locationAnimStmtRes_ns[] = {
-	"script",
-	"commands",
-	"type",
-	"label",
-	"flags",
-	"file",
-	"position",
-	"moveto",
-	"endanimation"
-};
-
-const char *_zoneTypeNamesRes_br[] = {
-	"examine",
-	"door",
-	"get",
-	"merge",
-	"taste",
-	"hear",
-	"feel",
-	"speak",
-	"none",
-	"trap",
-	"you",
-	"command",
-	"path",
-	"box"
-};
-
-const char *_zoneFlagNamesRes_br[] = {
-	"closed",
-	"active",
-	"remove",
-	"acting",
-	"locked",
-	"fixed",
-	"noname",
-	"nomasked",
-	"looping",
-	"added",
-	"character",
-	"nowalk",
-	"yourself",
-	"scaled",
-	"selfuse"
-};
-
 const char *_instructionNamesRes_br[] = {
 	"on",
 	"off",
@@ -426,52 +300,6 @@ const char *_instructionNamesRes_br[] = {
 	"endscript"
 };
 
-const char *_commandsNamesRes_br[] = {
-	"set",
-	"clear",
-	"start",
-	"speak",
-	"get",
-	"location",
-	"open",
-	"close",
-	"on",
-	"off",
-	"call",
-	"toggle",
-	"drop",
-	"quit",
-	"move",
-	"stop",
-	"character",
-	"followme",
-	"onmouse",
-	"offmouse",
-	"add",
-	"leave",
-	"inc",
-	"dec",
-	"test",
-	"dummy",
-	"dummy",
-	"let",
-	"music",
-	"fix",
-	"unfix",
-	"zeta",
-	"scroll",
-	"swap",
-	"give",
-	"text",
-	"part",
-	"dummy",
-	"return",
-	"onsave",
-	"offsave",
-	"endcommands",
-	"ifchar",
-	"endif"
-};
 
 const char *_callableNamesRes_br[] = {
 	"blufade",
@@ -482,72 +310,6 @@ const char *_callableNamesRes_br[] = {
 	"password"
 };
 
-const char *_audioCommandsNamesRes_br[] = {
-	"play",
-	"stop",
-	"pause",
-	"channel_level",
-	"fadein",
-	"fadeout",
-	"volume",
-	" ",
-	"faderate",
-	" ",
-	" ",
-	" ",
-	" ",
-	" ",
-	" ",
-	" ",
-	"loop"
-};
-
-const char *_locationStmtRes_br[] = {
-	"character",
-	"endlocation",
-	"ifchar",
-	"endif",
-	"location",
-	"mask",
-	"path",
-	"disk",
-	"localflags",
-	"commands",
-	"escape",
-	"acommands",
-	"flags",
-	"comment",
-	"endcomment",
-	"zone",
-	"animation",
-	"zeta",
-	"music",
-	"sound"
-};
-
-const char *_locationZoneStmtRes_br[] = {
-	"endzone",
-	"limits",
-	"moveto",
-	"type",
-	"commands",
-	"label",
-	"flags"
-};
-
-const char *_locationAnimStmtRes_br[] = {
-	"endanimation",
-	"endzone",
-	"script",
-	"commands",
-	"type",
-	"label",
-	"flags",
-	"file",
-	"position",
-	"moveto"
-};
-
 const char *_dinoName = "dino";
 const char *_donnaName = "donna";
 const char *_doughName = "dough";
@@ -629,20 +391,14 @@ const Parallaction_br::Callable Parallaction_br::_dosCallables[] = {
 
 void Parallaction_ns::initResources() {
 
-	_zoneFlagNamesRes = _zoneFlagNamesRes_ns;
-	_zoneTypeNamesRes = _zoneTypeNamesRes_ns;
-	_commandsNamesRes = _commandsNamesRes_ns;
+//	_zoneFlagNamesRes = _zoneFlagNamesRes_ns;
+//	_zoneTypeNamesRes = _zoneTypeNamesRes_ns;
+//	_commandsNamesRes = _commandsNamesRes_ns;
 	_callableNamesRes = _callableNamesRes_ns;
 	_instructionNamesRes = _instructionNamesRes_ns;
 
 	_callableNames = new Table(ARRAYSIZE(_callableNamesRes_ns), _callableNamesRes_ns);
 	_instructionNames = new Table(ARRAYSIZE(_instructionNamesRes_ns), _instructionNamesRes_ns);
-	_zoneFlagNames = new Table(ARRAYSIZE(_zoneFlagNamesRes_ns), _zoneFlagNamesRes_ns);
-	_zoneTypeNames = new Table(ARRAYSIZE(_zoneTypeNamesRes_ns), _zoneTypeNamesRes_ns);
-	_commandsNames = new Table(ARRAYSIZE(_commandsNamesRes_ns), _commandsNamesRes_ns);
-	_locationStmt = new Table(ARRAYSIZE(_locationStmtRes_ns), _locationStmtRes_ns);
-	_locationZoneStmt = new Table(ARRAYSIZE(_locationZoneStmtRes_ns), _locationZoneStmtRes_ns);
-	_locationAnimStmt = new Table(ARRAYSIZE(_locationAnimStmtRes_ns), _locationAnimStmtRes_ns);
 
 	_localFlagNames = new FixedTable(NUM_LOCATIONS, 1);
 	_localFlagNames->addData("visited");
@@ -657,22 +413,15 @@ void Parallaction_ns::initResources() {
 
 void Parallaction_br::initResources() {
 
-	_zoneFlagNamesRes = _zoneFlagNamesRes_br;
-	_zoneTypeNamesRes = _zoneTypeNamesRes_br;
-	_commandsNamesRes = _commandsNamesRes_br;
+//	_zoneFlagNamesRes = _zoneFlagNamesRes_br;
+//	_zoneTypeNamesRes = _zoneTypeNamesRes_br;
+//	_commandsNamesRes = _commandsNamesRes_br;
 	_callableNamesRes = _callableNamesRes_br;
 	_instructionNamesRes = _instructionNamesRes_br;
-	_audioCommandsNamesRes = _audioCommandsNamesRes_br;
+//	_audioCommandsNamesRes = _audioCommandsNamesRes_br;
 
 	_callableNames = new Table(ARRAYSIZE(_callableNamesRes_br), _callableNamesRes_br);
 	_instructionNames = new Table(ARRAYSIZE(_instructionNamesRes_br), _instructionNamesRes_br);
-	_zoneFlagNames = new Table(ARRAYSIZE(_zoneFlagNamesRes_br), _zoneFlagNamesRes_br);
-	_zoneTypeNames = new Table(ARRAYSIZE(_zoneTypeNamesRes_br), _zoneTypeNamesRes_br);
-	_commandsNames = new Table(ARRAYSIZE(_commandsNamesRes_br), _commandsNamesRes_br);
-	_audioCommandsNames = new Table(ARRAYSIZE(_audioCommandsNamesRes_br), _audioCommandsNamesRes_br);
-	_locationStmt = new Table(ARRAYSIZE(_locationStmtRes_br), _locationStmtRes_br);
-	_locationZoneStmt = new Table(ARRAYSIZE(_locationZoneStmtRes_br), _locationZoneStmtRes_br);
-	_locationAnimStmt = new Table(ARRAYSIZE(_locationAnimStmtRes_br), _locationAnimStmtRes_br);
 
 	_localFlagNames = new FixedTable(NUM_LOCATIONS, 2);
 	_localFlagNames->addData("visited");