diff options
author | Joseph-Eugene Winzer | 2018-02-20 10:22:45 +0100 |
---|---|---|
committer | Joseph-Eugene Winzer | 2018-03-11 23:25:00 +0100 |
commit | 0274dca40b791f36de2627778621d2aa234bc2b9 (patch) | |
tree | c2d199c5fb3f5eb4f8ca209fb27db087021ca216 /engines/supernova | |
parent | 316817dc96ceacd65c63b059acbb08a60a050a43 (diff) | |
download | scummvm-rg350-0274dca40b791f36de2627778621d2aa234bc2b9.tar.gz scummvm-rg350-0274dca40b791f36de2627778621d2aa234bc2b9.tar.bz2 scummvm-rg350-0274dca40b791f36de2627778621d2aa234bc2b9.zip |
SUPERNOVA: Appends NULL terminator to strings
The NULL terminator is needed during parsing.
Diffstat (limited to 'engines/supernova')
-rw-r--r-- | engines/supernova/rooms.cpp | 58 | ||||
-rw-r--r-- | engines/supernova/rooms.h | 4 |
2 files changed, 31 insertions, 31 deletions
diff --git a/engines/supernova/rooms.cpp b/engines/supernova/rooms.cpp index d8b138f9a7..780c75e907 100644 --- a/engines/supernova/rooms.cpp +++ b/engines/supernova/rooms.cpp @@ -122,20 +122,20 @@ Intro::Intro(SupernovaEngine *vm, GameManager *gm) { _shouldExit = false; - introText = - _vm->getGameString(kStringIntro1) + - _vm->getGameString(kStringIntro2) + - _vm->getGameString(kStringIntro3) + - _vm->getGameString(kStringIntro4) + - _vm->getGameString(kStringIntro5) + - _vm->getGameString(kStringIntro6) + - _vm->getGameString(kStringIntro7) + - _vm->getGameString(kStringIntro8) + - _vm->getGameString(kStringIntro9) + - _vm->getGameString(kStringIntro10) + - _vm->getGameString(kStringIntro11) + - _vm->getGameString(kStringIntro12) + - _vm->getGameString(kStringIntro13); + _introText = + _vm->getGameString(kStringIntro1) + '\0' + + _vm->getGameString(kStringIntro2) + '\0' + + _vm->getGameString(kStringIntro3) + '\0' + + _vm->getGameString(kStringIntro4) + '\0' + + _vm->getGameString(kStringIntro5) + '\0' + + _vm->getGameString(kStringIntro6) + '\0' + + _vm->getGameString(kStringIntro7) + '\0' + + _vm->getGameString(kStringIntro8) + '\0' + + _vm->getGameString(kStringIntro9) + '\0' + + _vm->getGameString(kStringIntro10) + '\0' + + _vm->getGameString(kStringIntro11) + '\0' + + _vm->getGameString(kStringIntro12) + '\0' + + _vm->getGameString(kStringIntro13) + '\0'; } void Intro::onEntrance() { @@ -3174,21 +3174,21 @@ Outro::Outro(SupernovaEngine *vm, GameManager *gm) { _id = OUTRO; _shown[0] = kShownFalse; - outroText = - _vm->getGameString(kStringOutro1) + - _vm->getGameString(kStringOutro2) + - _vm->getGameString(kStringOutro3) + - _vm->getGameString(kStringOutro4) + - _vm->getGameString(kStringOutro5) + - _vm->getGameString(kStringOutro6) + - _vm->getGameString(kStringOutro7) + - _vm->getGameString(kStringOutro8) + - _vm->getGameString(kStringOutro9) + - _vm->getGameString(kStringOutro10) + - _vm->getGameString(kStringOutro11) + - _vm->getGameString(kStringOutro12) + - _vm->getGameString(kStringOutro13) + - _vm->getGameString(kStringOutro14); + _outroText = + _vm->getGameString(kStringOutro1) + '\0' + + _vm->getGameString(kStringOutro2) + '\0' + + _vm->getGameString(kStringOutro3) + '\0' + + _vm->getGameString(kStringOutro4) + '\0' + + _vm->getGameString(kStringOutro5) + '\0' + + _vm->getGameString(kStringOutro6) + '\0' + + _vm->getGameString(kStringOutro7) + '\0' + + _vm->getGameString(kStringOutro8) + '\0' + + _vm->getGameString(kStringOutro9) + '\0' + + _vm->getGameString(kStringOutro10) + '\0' + + _vm->getGameString(kStringOutro11) + '\0' + + _vm->getGameString(kStringOutro12) + '\0' + + _vm->getGameString(kStringOutro13) + '\0' + + _vm->getGameString(kStringOutro14) + '\0'; } void Outro::onEntrance() { diff --git a/engines/supernova/rooms.h b/engines/supernova/rooms.h index a16f57ee52..454034dccc 100644 --- a/engines/supernova/rooms.h +++ b/engines/supernova/rooms.h @@ -139,7 +139,7 @@ private: void leaveCutscene(); bool _shouldExit; - Common::String introText; + Common::String _introText; }; // Spaceship @@ -1381,7 +1381,7 @@ private: void animate(int filenumber, int section1, int section2, int section3, int section4, int duration, MessagePosition position, const char *text); - Common::String outroText; + Common::String _outroText; }; } |