aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/text_mr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/kyra/text_mr.cpp')
-rw-r--r--engines/kyra/text_mr.cpp30
1 files changed, 0 insertions, 30 deletions
diff --git a/engines/kyra/text_mr.cpp b/engines/kyra/text_mr.cpp
index 220208e313..16c9439329 100644
--- a/engines/kyra/text_mr.cpp
+++ b/engines/kyra/text_mr.cpp
@@ -34,7 +34,6 @@ TextDisplayer_MR::TextDisplayer_MR(KyraEngine_MR *vm, Screen_MR *screen)
}
char *TextDisplayer_MR::preprocessString(const char *str) {
- debugC(9, kDebugLevelMain, "TextDisplayer_MR::preprocessString('%s')", str);
if (_talkBuffer != str)
strncpy(_talkBuffer, str, sizeof(_talkBuffer));
@@ -83,7 +82,6 @@ char *TextDisplayer_MR::preprocessString(const char *str) {
}
int TextDisplayer_MR::dropCRIntoString(char *str, int minOffs, int maxOffs) {
- debugC(9, kDebugLevelMain, "TextDisplayer_MR::dropCRIntoString('%s', %d, %d)", str, maxOffs, minOffs);
int offset = 0;
char *proc = str + minOffs;
@@ -131,7 +129,6 @@ int TextDisplayer_MR::dropCRIntoString(char *str, int minOffs, int maxOffs) {
}
void TextDisplayer_MR::printText(const char *str, int x, int y, uint8 c0, uint8 c1, uint8 c2, Screen::FontId font) {
- debugC(9, kDebugLevelMain, "TextDisplayer_MR::printText('%s', %d, %d, %d, %d, %d)", str, x, y, c0, c1, c2);
if (_vm->_albumChatActive) {
c0 = 0xEE;
c1 = 0xE3;
@@ -149,7 +146,6 @@ void TextDisplayer_MR::printText(const char *str, int x, int y, uint8 c0, uint8
}
void TextDisplayer_MR::restoreScreen() {
- debugC(9, kDebugLevelMain, "TextDisplayer_MR::restoreScreen()");
_vm->restorePage3();
_vm->drawAnimObjects();
_screen->hideMouse();
@@ -160,7 +156,6 @@ void TextDisplayer_MR::restoreScreen() {
}
void TextDisplayer_MR::calcWidestLineBounds(int &x1, int &x2, int w, int x) {
- debugC(9, kDebugLevelMain, "TextDisplayer_MR::calcWidestLineBounds(%d, %d)", w, x);
x1 = x;
x1 -= (w >> 1);
x2 = x1 + w + 1;
@@ -177,7 +172,6 @@ void TextDisplayer_MR::calcWidestLineBounds(int &x1, int &x2, int w, int x) {
#pragma mark -
int KyraEngine_MR::chatGetType(const char *str) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::chatGetType('%s')", str);
while (*str)
++str;
--str;
@@ -198,12 +192,10 @@ int KyraEngine_MR::chatGetType(const char *str) {
}
int KyraEngine_MR::chatCalcDuration(const char *str) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::chatCalcDuration('%s')", str);
return MAX<int>(120, strlen(str)*6);
}
void KyraEngine_MR::objectChat(const char *str, int object, int vocHigh, int vocLow) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::objectChat('%s', %d, %d, %d)", str, object, vocHigh, vocLow);
if (_mainCharacter.animFrame == 87 || _mainCharacter.animFrame == 0xFFFF || _mainCharacter.x1 <= 0 || _mainCharacter.y1 <= 0)
return;
@@ -247,7 +239,6 @@ void KyraEngine_MR::objectChat(const char *str, int object, int vocHigh, int voc
}
void KyraEngine_MR::objectChatInit(const char *str, int object, int vocHigh, int vocLow) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::objectChatInit('%s', %d, %d, %d)", str, object, vocHigh, vocLow);
str = _text->preprocessString(str);
int lineNum = _text->buildMessageSubstrings(str);
@@ -294,7 +285,6 @@ void KyraEngine_MR::objectChatInit(const char *str, int object, int vocHigh, int
}
void KyraEngine_MR::objectChatPrintText(const char *str, int object) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::objectChatPrintText('%s', %d)", str, object);
int c1 = _talkObjectList[object].color;
str = _text->preprocessString(str);
int lineNum = _text->buildMessageSubstrings(str);
@@ -314,7 +304,6 @@ void KyraEngine_MR::objectChatPrintText(const char *str, int object) {
}
void KyraEngine_MR::objectChatProcess(const char *script) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::objectChatProcess('%s')", script);
memset(&_chatScriptData, 0, sizeof(_chatScriptData));
memset(&_chatScriptState, 0, sizeof(_chatScriptState));
@@ -338,7 +327,6 @@ void KyraEngine_MR::objectChatProcess(const char *script) {
}
void KyraEngine_MR::objectChatWaitToFinish() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::objectChatWaitToFinish()");
int charAnimFrame = _mainCharacter.animFrame;
setCharacterAnimDim(_animShapeWidth, _animShapeHeight);
@@ -388,7 +376,6 @@ void KyraEngine_MR::objectChatWaitToFinish() {
}
void KyraEngine_MR::badConscienceChat(const char *str, int vocHigh, int vocLow) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::badConscienceChat('%s', %d, %d)", str, vocHigh, vocLow);
if (!_badConscienceShown)
return;
@@ -406,7 +393,6 @@ void KyraEngine_MR::badConscienceChat(const char *str, int vocHigh, int vocLow)
}
void KyraEngine_MR::badConscienceChatWaitToFinish() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::badConscienceChatWaitToFinish()");
if (_chatVocHigh) {
playVoice(_chatVocHigh, _chatVocLow);
_chatVocHigh = _chatVocLow = -1;
@@ -446,7 +432,6 @@ void KyraEngine_MR::badConscienceChatWaitToFinish() {
}
void KyraEngine_MR::goodConscienceChat(const char *str, int vocHigh, int vocLow) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::goodConscienceChat('%s', %d, %d)", str, vocHigh, vocLow);
if (!_goodConscienceShown)
return;
@@ -464,7 +449,6 @@ void KyraEngine_MR::goodConscienceChat(const char *str, int vocHigh, int vocLow)
}
void KyraEngine_MR::goodConscienceChatWaitToFinish() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::goodConscienceChatWaitToFinish()");
if (_chatVocHigh) {
playVoice(_chatVocHigh, _chatVocLow);
_chatVocHigh = _chatVocLow = -1;
@@ -504,7 +488,6 @@ void KyraEngine_MR::goodConscienceChatWaitToFinish() {
}
void KyraEngine_MR::albumChat(const char *str, int vocHigh, int vocLow) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumChat('%s', %d, %d)", str, vocHigh, vocLow);
_talkObjectList[1].x = 190;
_talkObjectList[1].y = 188;
@@ -525,7 +508,6 @@ void KyraEngine_MR::albumChat(const char *str, int vocHigh, int vocLow) {
}
void KyraEngine_MR::albumChatInit(const char *str, int object, int vocHigh, int vocLow) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumChatInit('%s', %d, %d, %d)", str, object, vocHigh, vocLow);
Common::String realString;
while (*str) {
@@ -585,7 +567,6 @@ void KyraEngine_MR::albumChatInit(const char *str, int object, int vocHigh, int
}
void KyraEngine_MR::albumChatWaitToFinish() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumChatWaitToFinish()");
if (_chatVocHigh) {
playVoice(_chatVocHigh, _chatVocLow);
_chatVocHigh = _chatVocLow = -1;
@@ -628,7 +609,6 @@ void KyraEngine_MR::albumChatWaitToFinish() {
}
void KyraEngine_MR::malcolmSceneStartupChat() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::malcolmSceneStartupChat()");
if (_noStartupChat)
return;
@@ -653,7 +633,6 @@ void KyraEngine_MR::malcolmSceneStartupChat() {
}
void KyraEngine_MR::updateDlgBuffer() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::updateDlgBuffer()");
char dlgFile[16];
char cnvFile[16];
@@ -679,7 +658,6 @@ void KyraEngine_MR::updateDlgBuffer() {
}
void KyraEngine_MR::loadDlgHeader(int &vocHighBase, int &vocHighIndex, int &index1, int &index2) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadDlgHeader(-, -, -, -)");
assert(_cnvFile);
vocHighIndex = _cnvFile->readSint16LE();
vocHighBase = _cnvFile->readSint16LE();
@@ -688,7 +666,6 @@ void KyraEngine_MR::loadDlgHeader(int &vocHighBase, int &vocHighIndex, int &inde
}
void KyraEngine_MR::setDlgIndex(int index) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::setDlgIndex(%d)", index);
if (_mainCharacter.dlgIndex != index) {
memset(_newSceneDlgState, 0, sizeof(_newSceneDlgState));
memset(_conversationState, -1, sizeof(_conversationState));
@@ -698,7 +675,6 @@ void KyraEngine_MR::setDlgIndex(int index) {
}
void KyraEngine_MR::updateDlgIndex() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::updateDlgIndex()");
uint16 dlgIndex = _mainCharacter.dlgIndex;
if (_currentChapter == 1) {
@@ -738,7 +714,6 @@ void KyraEngine_MR::updateDlgIndex() {
}
void KyraEngine_MR::processDialog(int vocHighIndex, int vocHighBase, int funcNum) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::processDialog(%d, %d, %d)", vocHighIndex, vocHighBase, funcNum);
bool running = true;
int script = -1;
int vocHigh = -1, vocLow = -1;
@@ -799,7 +774,6 @@ void KyraEngine_MR::processDialog(int vocHighIndex, int vocHighBase, int funcNum
}
void KyraEngine_MR::dialogStartScript(int object, int funcNum) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::dialogStartScript(%d, %d)", object, funcNum);
_dialogSceneAnim = _talkObjectList[object].sceneAnim;
_dialogSceneScript = _talkObjectList[object].sceneScript;
if (_dialogSceneAnim >= 0 && _dialogSceneScript >= 0) {
@@ -820,7 +794,6 @@ void KyraEngine_MR::dialogStartScript(int object, int funcNum) {
}
void KyraEngine_MR::dialogEndScript(int object) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::dialogEndScript(%d)", object);
_emc->init(&_dialogScriptState, &_dialogScriptData);
_emc->start(&_dialogScriptState, _dialogScriptFuncEnd);
@@ -837,7 +810,6 @@ void KyraEngine_MR::dialogEndScript(int object) {
}
void KyraEngine_MR::npcChatSequence(const char *str, int object, int vocHigh, int vocLow) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::npcChatSequence('%s', %d, %d, %d)", str, object, vocHigh, vocLow);
_chatText = str;
_chatObject = object;
@@ -876,7 +848,6 @@ void KyraEngine_MR::npcChatSequence(const char *str, int object, int vocHigh, in
}
void KyraEngine_MR::randomSceneChat() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::randomSceneChat()");
updateDlgBuffer();
int index = (_mainCharacter.sceneId - _chapterLowestScene[_currentChapter]) * 2;
@@ -896,7 +867,6 @@ void KyraEngine_MR::randomSceneChat() {
}
void KyraEngine_MR::runDialog(int dlgIndex, int funcNum) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::runDialog(%d, %d)", dlgIndex, funcNum);
switch (_currentChapter-2) {
case 0: