diff options
| author | Nicola Mettifogo | 2007-10-14 20:59:46 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-10-14 20:59:46 +0000 |
| commit | 652069f1a639cac69d5c4fd87149f1f068251c38 (patch) | |
| tree | 46d5e7a7612cfb9941c13c78cb78add08aee050b /engines/parallaction/parallaction.h | |
| parent | 0e693cbbfb4b115490fb503e9b28eb1248879c8d (diff) | |
| download | scummvm-rg350-652069f1a639cac69d5c4fd87149f1f068251c38.tar.gz scummvm-rg350-652069f1a639cac69d5c4fd87149f1f068251c38.tar.bz2 scummvm-rg350-652069f1a639cac69d5c4fd87149f1f068251c38.zip | |
Made location parser more fault-tolerant, in that it prints out a warning message instead of exiting ScummVM when it encounters an unexpected keywords in the scripts.
svn-id: r29220
Diffstat (limited to 'engines/parallaction/parallaction.h')
| -rw-r--r-- | engines/parallaction/parallaction.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index 87c071ab2b..5238f8f913 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -723,7 +723,8 @@ protected: int numZones; } _locParseCtxt; - DECLARE_UNQUALIFIED_LOCATION_PARSER(invalid); + void warning_unexpected(); + DECLARE_UNQUALIFIED_LOCATION_PARSER(endlocation); DECLARE_UNQUALIFIED_LOCATION_PARSER(location); DECLARE_UNQUALIFIED_LOCATION_PARSER(disk); @@ -738,8 +739,6 @@ protected: DECLARE_UNQUALIFIED_LOCATION_PARSER(endcomment); DECLARE_UNQUALIFIED_LOCATION_PARSER(sound); DECLARE_UNQUALIFIED_LOCATION_PARSER(music); - DECLARE_UNQUALIFIED_LOCATION_PARSER(redundant); - DECLARE_UNQUALIFIED_ZONE_PARSER(invalid); DECLARE_UNQUALIFIED_ZONE_PARSER(limits); DECLARE_UNQUALIFIED_ZONE_PARSER(moveto); DECLARE_UNQUALIFIED_ZONE_PARSER(type); @@ -748,7 +747,6 @@ protected: DECLARE_UNQUALIFIED_ZONE_PARSER(flags); DECLARE_UNQUALIFIED_ZONE_PARSER(endzone); DECLARE_UNQUALIFIED_ZONE_PARSER(null); - DECLARE_UNQUALIFIED_ANIM_PARSER(invalid); DECLARE_UNQUALIFIED_ANIM_PARSER(script); DECLARE_UNQUALIFIED_ANIM_PARSER(commands); DECLARE_UNQUALIFIED_ANIM_PARSER(type); @@ -758,7 +756,6 @@ protected: DECLARE_UNQUALIFIED_ANIM_PARSER(position); DECLARE_UNQUALIFIED_ANIM_PARSER(moveto); DECLARE_UNQUALIFIED_ANIM_PARSER(endanimation); - DECLARE_UNQUALIFIED_COMMAND_PARSER(invalid); DECLARE_UNQUALIFIED_COMMAND_PARSER(flags); DECLARE_UNQUALIFIED_COMMAND_PARSER(animation); DECLARE_UNQUALIFIED_COMMAND_PARSER(zone); |