diff options
author | Strangerke | 2013-10-05 14:37:20 +0200 |
---|---|---|
committer | Strangerke | 2013-10-05 14:37:20 +0200 |
commit | b6d6c17727755fe50bbbb02ddc126ab7c887683c (patch) | |
tree | d235da483c3f06dede1268ff652efd204ca8b9ad /engines/avalanche/closing.cpp | |
parent | d3cd7e237a017af32962bc20c4dd8f510a4b7c80 (diff) | |
download | scummvm-rg350-b6d6c17727755fe50bbbb02ddc126ab7c887683c.tar.gz scummvm-rg350-b6d6c17727755fe50bbbb02ddc126ab7c887683c.tar.bz2 scummvm-rg350-b6d6c17727755fe50bbbb02ddc126ab7c887683c.zip |
AVALANCHE: Replace static strings by static char*
Diffstat (limited to 'engines/avalanche/closing.cpp')
-rw-r--r-- | engines/avalanche/closing.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/avalanche/closing.cpp b/engines/avalanche/closing.cpp index 93caa029cb..00a75897a2 100644 --- a/engines/avalanche/closing.cpp +++ b/engines/avalanche/closing.cpp @@ -52,14 +52,14 @@ void Closing::putIn(Common::String str, uint16 where) { } void Closing::exitGame() { - static const Common::String nouns[12] = { - "sackbut", "harpsichord", "camel", "conscience", "ice-cream", "serf", - "abacus", "castle", "carrots", "megaphone", "manticore", "drawbridge" + static const char nouns[12][14] = { + "sackbut", "harpsichord", "camel", "conscience", "ice-cream", "serf", + "abacus", "castle", "carrots", "megaphone", "manticore", "drawbridge" }; - static const Common::String verbs[12] = { - "haunt", "daunt", "tickle", "gobble", "erase", "provoke", "surprise", - "ignore", "stare at", "shriek at", "frighten", "quieten" + static const char verbs[12][12] = { + "haunt", "daunt", "tickle", "gobble", "erase", "provoke", + "surprise", "ignore", "stare at", "shriek at", "frighten", "quieten" }; _vm->_sound->stopSound(); @@ -67,7 +67,7 @@ void Closing::exitGame() { getScreen(kScreenNagScreen); byte nounId = _vm->_rnd->getRandomNumber(11); byte verbId = _vm->_rnd->getRandomNumber(11); - Common::String result = nouns[nounId] + " will " + verbs[verbId] + " you"; + Common::String result = Common::String::format("%s will %d you", nouns[nounId], verbs[verbId]); putIn(result, 1628); showScreen(); // No halt- it's already set up. } |