diff options
author | Paul Gilbert | 2018-04-27 20:45:20 -0400 |
---|---|---|
committer | Paul Gilbert | 2018-04-27 20:45:20 -0400 |
commit | 461171ced17993aec5ec6ff6dacaf5057870eb62 (patch) | |
tree | c57dcde6c804651787e75af9f920a94f39238651 /engines/xeen/worldofxeen | |
parent | 3955a38923d334daef0106df313a9a31ac63d2c0 (diff) | |
download | scummvm-rg350-461171ced17993aec5ec6ff6dacaf5057870eb62.tar.gz scummvm-rg350-461171ced17993aec5ec6ff6dacaf5057870eb62.tar.bz2 scummvm-rg350-461171ced17993aec5ec6ff6dacaf5057870eb62.zip |
XEEN: Move some few overlooked strings and spell array into xeen.ccs
Diffstat (limited to 'engines/xeen/worldofxeen')
-rw-r--r-- | engines/xeen/worldofxeen/clouds_cutscenes.cpp | 1 | ||||
-rw-r--r-- | engines/xeen/worldofxeen/darkside_cutscenes.cpp | 1 | ||||
-rw-r--r-- | engines/xeen/worldofxeen/worldofxeen_resources.cpp | 61 | ||||
-rw-r--r-- | engines/xeen/worldofxeen/worldofxeen_resources.h | 48 |
4 files changed, 0 insertions, 111 deletions
diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp index 5c64ade6d0..8af4fbcc66 100644 --- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp +++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp @@ -21,7 +21,6 @@ */ #include "xeen/worldofxeen/clouds_cutscenes.h" -#include "xeen/worldofxeen/worldofxeen_resources.h" #include "xeen/sound.h" namespace Xeen { diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp index d7f821fe6b..ef5c1df157 100644 --- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp +++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp @@ -24,7 +24,6 @@ #include "xeen/xeen.h" #include "xeen/worldofxeen/darkside_cutscenes.h" #include "xeen/worldofxeen/worldofxeen.h" -#include "xeen/worldofxeen/worldofxeen_resources.h" #define WAIT(TIME) if (_subtitles.wait(TIME)) return false diff --git a/engines/xeen/worldofxeen/worldofxeen_resources.cpp b/engines/xeen/worldofxeen/worldofxeen_resources.cpp deleted file mode 100644 index f0d35c9090..0000000000 --- a/engines/xeen/worldofxeen/worldofxeen_resources.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#include "xeen/worldofxeen/worldofxeen_resources.h" - -namespace Xeen { -namespace WorldOfXeen { - -// FIXME: These should really go into into the xeen.ccs datafile -const char *const WorldOfXeenResources::CLOUDS_INTRO1 = "\f00\v082\t040\x3" - "cKing Burlock\v190\t040Peasants\v082\t247" - "Lord Xeen\v190\t258Xeen's Pet\v179\t150Crodo"; - -const char *const WorldOfXeenResources::DARKSIDE_ENDING1 = "\n\x3" "cCongratulations\n" - "\n" - "Your Final Score is:\n" - "\n" - "%010lu\n" - "\x3" "l\n" - "Please send this score to the Ancient's Headquarters " - "where you'll be added to the Hall of Legends!\n" - "\n" - "Ancient's Headquarters\n" - "New World Computing, Inc.\n" - "P.O. Box 4302\n" - "Hollywood, CA 90078"; - -const char *const WorldOfXeenResources::DARKSIDE_ENDING2 = "\n" - "Adventurers,\n" - "\n" - "I will save your game in Castleview.\n" - "\n" - "The World of Xeen still needs you!\n" - "\n" - "Load your game afterwards and come visit me in the " - "Great Pyramid for further instructions"; - -const char *const WorldOfXeenResources::PHAROAH_ENDING_TEXT1 = "\fd\v001\t001%s\x3" "c\t000\v180Press a Key!\x3" "l"; -const char *const WorldOfXeenResources::PHAROAH_ENDING_TEXT2 = "\f04\v000\t000%s\x3" "c\t000\v180Press a Key!\x3" "l\fd"; - -} // End of namespace WorldOfXeen -} // End of namespace Xeen diff --git a/engines/xeen/worldofxeen/worldofxeen_resources.h b/engines/xeen/worldofxeen/worldofxeen_resources.h deleted file mode 100644 index e69f52028d..0000000000 --- a/engines/xeen/worldofxeen/worldofxeen_resources.h +++ /dev/null @@ -1,48 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef XEEN_WORLDOFXEEN_RESOURCES_H -#define XEEN_WORLDOFXEEN_RESOURCES_H - -#include "xeen/resources.h" - -namespace Xeen { -namespace WorldOfXeen { - -#ifdef Res -#undef Res -#endif -#define Res (*(WorldOfXeenResources *)g_resources) - -class WorldOfXeenResources : public Resources { -public: - static const char *const CLOUDS_INTRO1; - static const char *const DARKSIDE_ENDING1; - static const char *const DARKSIDE_ENDING2; - static const char *const PHAROAH_ENDING_TEXT1; - static const char *const PHAROAH_ENDING_TEXT2; -}; - -} // End of namespace WorldOfXeen -} // End of namespace Xeen - -#endif /* XEEN_RESOURCES_H */ |