diff options
| author | Strangerke | 2013-10-01 23:23:07 +0200 |
|---|---|---|
| committer | Strangerke | 2013-10-01 23:23:07 +0200 |
| commit | c9432b8467ee5ef489a2d99f91edefb26dd31d60 (patch) | |
| tree | 0c4497831fe06ec9121bc35c345382d748bde400 | |
| parent | 199ba0ddf4ec0251c0e70bd56a8f4be0cb6282b7 (diff) | |
| download | scummvm-rg350-c9432b8467ee5ef489a2d99f91edefb26dd31d60.tar.gz scummvm-rg350-c9432b8467ee5ef489a2d99f91edefb26dd31d60.tar.bz2 scummvm-rg350-c9432b8467ee5ef489a2d99f91edefb26dd31d60.zip | |
AVALANCHE: more work on variables
| -rw-r--r-- | engines/avalanche/avalanche.h | 3 | ||||
| -rw-r--r-- | engines/avalanche/avalot.cpp | 3 | ||||
| -rw-r--r-- | engines/avalanche/parser.cpp | 7 | ||||
| -rw-r--r-- | engines/avalanche/parser.h | 3 |
4 files changed, 8 insertions, 8 deletions
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h index d7941ee485..a54e092d2f 100644 --- a/engines/avalanche/avalanche.h +++ b/engines/avalanche/avalanche.h @@ -179,9 +179,6 @@ public: static const uint16 kNotes[12]; static const TuneType kTune; - static const char *kVersionNum; - static const char *kCopyright; - bool _holdLeftMouse; // If this is greater than zero, the next line you type is stored in the DNA in a position dictated by the value. diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp index 4732bbbd1e..5ccb1ca6e6 100644 --- a/engines/avalanche/avalot.cpp +++ b/engines/avalanche/avalot.cpp @@ -37,9 +37,6 @@ namespace Avalanche { -const char *AvalancheEngine::kVersionNum = "1.30"; -const char *AvalancheEngine::kCopyright = "1995"; - const MouseHotspotType AvalancheEngine::kMouseHotSpots[9] = { {8,0}, // 0 - up-arrow {0,0}, // 1 - screwdriver diff --git a/engines/avalanche/parser.cpp b/engines/avalanche/parser.cpp index 979c451531..cc65386b4f 100644 --- a/engines/avalanche/parser.cpp +++ b/engines/avalanche/parser.cpp @@ -41,6 +41,9 @@ namespace Avalanche { +const char *Parser::kCopyright = "1995"; +const char *Parser::kVersionNum = "1.30"; + Parser::Parser(AvalancheEngine *vm) { _vm = vm; } @@ -1803,8 +1806,8 @@ void Parser::doThat() { toDisplay = toDisplay + "LORD AVALOT D'ARGENT" + Dialogs::kControlCenter + Dialogs::kControlNewLine + "The medi\x91val descendant of" + Dialogs::kControlNewLine + "Denarius Avaricius Sextus" + Dialogs::kControlNewLine + Dialogs::kControlNewLine - + "version " + _vm->kVersionNum + Dialogs::kControlNewLine + Dialogs::kControlNewLine + "Copyright \xEF " - + _vm->kCopyright + ", Mark, Mike and Thomas Thurman." + Dialogs::kControlRegister + 'Y' + Dialogs::kControlIcon; + + "version " + kVersionNum + Dialogs::kControlNewLine + Dialogs::kControlNewLine + "Copyright \xEF " + + kCopyright + ", Mark, Mike and Thomas Thurman." + Dialogs::kControlRegister + 'Y' + Dialogs::kControlIcon; _vm->_dialogs->displayText(toDisplay); _vm->_dialogs->_aboutBox = false; } diff --git a/engines/avalanche/parser.h b/engines/avalanche/parser.h index 4ebf559d85..98adc3bbcd 100644 --- a/engines/avalanche/parser.h +++ b/engines/avalanche/parser.h @@ -103,6 +103,9 @@ private: Common::String _title; }; + static const char *kCopyright; + static const char *kVersionNum; + Common::String _thats; byte _thing2; byte _sworeNum; // number of times you've sworn |