diff options
| author | strangerke | 2011-03-27 14:29:21 +0200 |
|---|---|---|
| committer | strangerke | 2011-03-27 14:29:21 +0200 |
| commit | 2caaf045f6c7545abb5fd58aa6e0c36015c88d90 (patch) | |
| tree | fc3c909a0e118ac2ec0e765c5c30bbf046c356ae | |
| parent | ea744d0b2e3ceb9fc7a28f8ac84a749a6952a587 (diff) | |
| parent | e2af308ad2c4b35d8325dbf8357d299dd9606fc0 (diff) | |
| download | scummvm-rg350-2caaf045f6c7545abb5fd58aa6e0c36015c88d90.tar.gz scummvm-rg350-2caaf045f6c7545abb5fd58aa6e0c36015c88d90.tar.bz2 scummvm-rg350-2caaf045f6c7545abb5fd58aa6e0c36015c88d90.zip | |
Merge remote branch 'dreammaster/tsage'
Conflicts:
engines/tsage/module.mk
engines/tsage/ringworld_logic.cpp
engines/tsage/ringworld_logic.h
| -rw-r--r-- | engines/tsage/ringworld_logic.cpp | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/engines/tsage/ringworld_logic.cpp b/engines/tsage/ringworld_logic.cpp index 3dcde522fe..8eadefc29d 100644 --- a/engines/tsage/ringworld_logic.cpp +++ b/engines/tsage/ringworld_logic.cpp @@ -430,13 +430,33 @@ SpeakerHText::SpeakerHText() { /*--------------------------------------------------------------------------*/ -SpeakerSKText::SpeakerSKText(): ScreenSpeaker() { - _speakerName = "SKTEXT"; +SpeakerPText::SpeakerPText() { + _speakerName = "PTEXT"; + _textWidth = 240; + _textMode = ALIGN_CENTRE; + _colour1 = 5; + _hideObjects = false; +} + +/*--------------------------------------------------------------------------*/ + +SpeakerPText::SpeakerPText() { + _speakerName = "PTEXT"; _textWidth = 240; _textMode = ALIGN_CENTRE; - _colour1 = 9; + _colour1 = 5; + _hideObjects = false; +} + +/*--------------------------------------------------------------------------*/ + +SpeakerCHFText::SpeakerCHFText() { + _speakerName = "SpeakerCHFText"; + _textWidth = 240; + _textMode = ALIGN_CENTRE; + _colour1 = 56; _hideObjects = false; -}; +} /*--------------------------------------------------------------------------*/ |