thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged o_printStr() into o1_screenTextMsg().

Browse source 
svn-id: r21758
This commit is contained in:
Torbjörn Andersson 2006-04-10 08:42:29 +00:00
parent 7ab84e4d99
commit ea4e5dbb82
3 changed files with 25 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

26
engines/simon/items.cpp
View file

@ -1329,7 +1329,31 @@ void SimonEngine::o1_screenTextBox() {
void SimonEngine::o1_screenTextMsg() { void SimonEngine::o1_screenTextMsg() {
// 162: print string // 162: print string
o_printStr(); uint vgaSpriteId = getVarOrByte();
uint color = getVarOrByte();
uint stringId = getNextStringID();
const byte *string_ptr = NULL;
uint speech_id = 0;
TextLocation *tl;
if (stringId != 0xFFFF)
string_ptr = getStringPtrByID(stringId);
if (getFeatures() & GF_TALKIE)
speech_id = (uint16)getNextWord();
if (getGameType() == GType_FF)
vgaSpriteId = 1;
tl = getTextLocation(vgaSpriteId);
if (_speech && speech_id != 0)
playSpeech(speech_id, vgaSpriteId);
if ((getGameType() == GType_SIMON2) && (getFeatures() & GF_TALKIE) && speech_id == 0)
o_kill_sprite_simon2(2, vgaSpriteId + 2);
if (string_ptr != NULL && (speech_id == 0 || _subtitles))
printScreenText(vgaSpriteId, color, (const char *)string_ptr, tl->x, tl->y, tl->width);
} }
void SimonEngine::o1_playEffect() { void SimonEngine::o1_playEffect() {

28
engines/simon/simon.cpp
View file

@ -2144,34 +2144,6 @@ TextLocation *SimonEngine::getTextLocation(uint a) {
return NULL; return NULL;
} }
void SimonEngine::o_printStr() {
uint vgaSpriteId = getVarOrByte();
uint color = getVarOrByte();
uint stringId = getNextStringID();
const byte *string_ptr = NULL;
uint speech_id = 0;
TextLocation *tl;
if (stringId != 0xFFFF)
string_ptr = getStringPtrByID(stringId);
if (getFeatures() & GF_TALKIE)
speech_id = (uint16)getNextWord();
if (getGameType() == GType_FF)
vgaSpriteId = 1;
tl = getTextLocation(vgaSpriteId);
if (_speech && speech_id != 0)
playSpeech(speech_id, vgaSpriteId);
if ((getGameType() == GType_SIMON2) && (getFeatures() & GF_TALKIE) && speech_id == 0)
o_kill_sprite_simon2(2, vgaSpriteId + 2);
if (string_ptr != NULL && (speech_id == 0 || _subtitles))
printScreenText(vgaSpriteId, color, (const char *)string_ptr, tl->x, tl->y, tl->width);
}
void SimonEngine::loadZone(uint vga_res) { void SimonEngine::loadZone(uint vga_res) {
VgaPointersEntry *vpe; VgaPointersEntry *vpe;

1
engines/simon/simon.h
View file

@ -585,7 +585,6 @@ protected:
void o_fadeToBlack(); void o_fadeToBlack();
TextLocation *getTextLocation(uint a); TextLocation *getTextLocation(uint a);
void o_printStr();
void o_setup_cond_c(); void o_setup_cond_c();
void setup_cond_c_helper(); void setup_cond_c_helper();