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

TSAGE: Cleanup after git merge epic failure

Browse source
This commit is contained in:
strangerke 2011-03-21 08:33:55 +01:00
parent efaa811d42
commit b2ce645c1e
1 changed files with 0 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

49
engines/tsage/ringworld_logic.cpp
View file

@ -417,15 +417,6 @@ SpeakerEText::SpeakerEText() {
/*--------------------------------------------------------------------------*/
SpeakerEText::SpeakerEText() {
_speakerName = "ETEXT";
_textPos = Common::Point(20, 20);
_colour1 = 22;
_hideObjects = false;
}
/*--------------------------------------------------------------------------*/
SpeakerHText::SpeakerHText() {
_speakerName = "HTEXT";
_textPos = Common::Point(160, 40);
@ -475,16 +466,6 @@ void SpeakerSKL::setText(const Common::String &msg) {
}
/*--------------------------------------------------------------------------*/
SpeakerSKText::SpeakerSKText(): ScreenSpeaker() {
_speakerName = "SKTEXT";
_textWidth = 240;
_textMode = ALIGN_CENTRE;
_colour1 = 9;
_hideObjects = false;
};
/*--------------------------------------------------------------------------*/
SpeakerPText::SpeakerPText() {
_speakerName = "PTEXT";
_textWidth = 240;
@ -505,36 +486,6 @@ SpeakerCHFText::SpeakerCHFText() {
/*--------------------------------------------------------------------------*/
SpeakerSKL::SpeakerSKL(): AnimatedSpeaker() {
_speakerName = "SKL";
_newSceneNumber = 7011;
_textPos = Common::Point(10, 30);
_colour1 = 10;
}
void SpeakerSKL::setText(const Common::String &msg) {
_object1.postInit(&_objectList);
_object1.setVisage(7013);
_object1.setStrip2(2);
_object1._frame = 1;
_object1.setPriority2(255);
_object1.changeZoom(100);
_object1.setPosition(Common::Point(203, 120));
_object1.animate(ANIM_MODE_7, 0, NULL);
_object2.postInit(&_objectList);
_object2.setVisage(7013);
_object2.setStrip2(1);
_object2.setPriority2(255);
_object2.changeZoom(100);
_object2._frame = 1;
_object2.setPosition(Common::Point(197, 80));
_object2.setAction(&_speakerAction, NULL);
Speaker::setText(msg);
}
/*--------------------------------------------------------------------------*/
SpeakerQL::SpeakerQL(): AnimatedSpeaker() {
_speakerName = "QL";
_newSceneNumber = 2610;