aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/gui_mr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/kyra/gui_mr.cpp')
-rw-r--r--engines/kyra/gui_mr.cpp39
1 files changed, 0 insertions, 39 deletions
diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui_mr.cpp
index 902977bdf6..926f2c702f 100644
--- a/engines/kyra/gui_mr.cpp
+++ b/engines/kyra/gui_mr.cpp
@@ -38,7 +38,6 @@
namespace Kyra {
void KyraEngine_MR::loadButtonShapes() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadButtonShapes()");
_res->exists("BUTTONS.SHP", true);
uint8 *data = _res->fileData("BUTTONS.SHP", 0);
assert(data);
@@ -108,7 +107,6 @@ int KyraEngine_MR::callbackButton3(Button *button) {
}
void KyraEngine_MR::showMessage(const char *string, uint8 c0, uint8 c1) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::showMessage('%s', %d, %d)", string, c0, c1);
_shownMessage = string;
_screen->hideMouse();
@@ -129,12 +127,10 @@ void KyraEngine_MR::showMessage(const char *string, uint8 c0, uint8 c1) {
}
void KyraEngine_MR::showMessageFromCCode(int string, uint8 c0, int) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::showMessageFromCCode(%d, %d, -)", string, c0);
showMessage((const char*)getTableEntry(_cCodeFile, string), c0, 0xF0);
}
void KyraEngine_MR::updateItemCommand(int item, int str, uint8 c0) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::updateItemCommand(%d, %d, %d)", item, str, c0);
char buffer[100];
char *src = (char*)getTableEntry(_itemFile, item);
@@ -152,7 +148,6 @@ void KyraEngine_MR::updateItemCommand(int item, int str, uint8 c0) {
}
void KyraEngine_MR::updateCommandLine() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::updateCommandLine()");
if (_restoreCommandLine) {
restoreCommandLine();
_restoreCommandLine = false;
@@ -160,13 +155,11 @@ void KyraEngine_MR::updateCommandLine() {
}
void KyraEngine_MR::restoreCommandLine() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::restoreCommandLine()");
int y = _inventoryState ? 144 : 188;
_screen->copyBlockToPage(0, 0, y, 320, 12, _interfaceCommandLine);
}
void KyraEngine_MR::updateCLState() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::updateCLState()");
if (_inventoryState)
_commandLineY = 145;
else
@@ -174,7 +167,6 @@ void KyraEngine_MR::updateCLState() {
}
void KyraEngine_MR::showInventory() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::showInventory()");
if (!_screen->isMouseVisible())
return;
if (queryGameFlag(3))
@@ -253,7 +245,6 @@ void KyraEngine_MR::showInventory() {
}
void KyraEngine_MR::hideInventory() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::hideInventory()");
if (queryGameFlag(3))
return;
@@ -317,7 +308,6 @@ void KyraEngine_MR::hideInventory() {
}
void KyraEngine_MR::drawMalcolmsMoodText() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::drawMalcolmsMoodText()");
static const int stringId[] = { 0x32, 0x37, 0x3C };
if (queryGameFlag(0x219))
@@ -352,7 +342,6 @@ void KyraEngine_MR::drawMalcolmsMoodText() {
}
void KyraEngine_MR::drawMalcolmsMoodPointer(int frame, int page) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::drawMalcolmsMoodPointer(%d, %d)", frame, page);
static const uint8 stateTable[] = {
1, 6, 11
};
@@ -373,7 +362,6 @@ void KyraEngine_MR::drawMalcolmsMoodPointer(int frame, int page) {
}
void KyraEngine_MR::drawJestersStaff(int type, int page) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::drawJestersStaff(%d, %d)", type, page);
int y = 155;
if (page == 30) {
page = 2;
@@ -385,7 +373,6 @@ void KyraEngine_MR::drawJestersStaff(int type, int page) {
}
void KyraEngine_MR::drawScore(int page, int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::drawScore(%d, %d, %d)", page, x, y);
if (page == 30) {
page = 2;
y -= 144;
@@ -403,7 +390,6 @@ void KyraEngine_MR::drawScore(int page, int x, int y) {
}
void KyraEngine_MR::drawScoreCounting(int oldScore, int newScore, int drawOld, const int x) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::drawScoreCounting(%d, %d, %d, %d)", oldScore, newScore, drawOld, x);
int y = 189;
if (_inventoryState)
y -= 44;
@@ -438,7 +424,6 @@ void KyraEngine_MR::drawScoreCounting(int oldScore, int newScore, int drawOld, c
}
int KyraEngine_MR::getScoreX(const char *str) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::getScoreX('%s')", str);
Screen::FontId oldFont = _screen->setFont(Screen::FID_8_FNT);
_screen->_charWidth = -2;
@@ -451,7 +436,6 @@ int KyraEngine_MR::getScoreX(const char *str) {
}
void KyraEngine_MR::redrawInventory(int page) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::redrawInventory(%d)", page);
int yOffset = 0;
if (page == 30) {
@@ -479,7 +463,6 @@ void KyraEngine_MR::redrawInventory(int page) {
}
void KyraEngine_MR::clearInventorySlot(int slot, int page) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::clearInventorySlot(%d, %d)", slot, page);
int yOffset = 0;
if (page == 30) {
page = 2;
@@ -490,7 +473,6 @@ void KyraEngine_MR::clearInventorySlot(int slot, int page) {
}
void KyraEngine_MR::drawInventorySlot(int page, int item, int slot) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::drawInventorySlot(%d, %d, %d)", page, item, slot);
int yOffset = 0;
if (page == 30) {
page = 2;
@@ -501,7 +483,6 @@ void KyraEngine_MR::drawInventorySlot(int page, int item, int slot) {
}
int KyraEngine_MR::buttonInventory(Button *button) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::buttonInventory(%p)", (const void*)button);
setNextIdleAnimTimer();
if (!_enableInventory || !_inventoryState || !_screen->isMouseVisible())
return 0;
@@ -555,7 +536,6 @@ int KyraEngine_MR::buttonInventory(Button *button) {
}
int KyraEngine_MR::buttonMoodChange(Button *button) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::buttonMoodChange(%p)", (const void*)button);
if (queryGameFlag(0x219)) {
snd_playSoundEffect(0x0D, 0xC8);
return 0;
@@ -623,7 +603,6 @@ int KyraEngine_MR::buttonMoodChange(Button *button) {
}
int KyraEngine_MR::buttonShowScore(Button *button) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::buttonShowScore(%p)", (const void*)button);
strcpy(_stringBuffer, (const char*)getTableEntry(_cCodeFile, 18));
char *buffer = _stringBuffer;
@@ -647,7 +626,6 @@ int KyraEngine_MR::buttonShowScore(Button *button) {
}
int KyraEngine_MR::buttonJesterStaff(Button *button) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::buttonJesterStaff(%p)", (const void*)button);
makeCharFacingMouse();
if (_itemInHand == 27) {
_screen->hideMouse();
@@ -679,7 +657,6 @@ int KyraEngine_MR::buttonJesterStaff(Button *button) {
}
void KyraEngine_MR::showAlbum() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::showAlbum()");
if (!_screen->isMouseVisible() || queryGameFlag(4) || _mouseState != -1)
return;
@@ -744,7 +721,6 @@ void KyraEngine_MR::showAlbum() {
}
void KyraEngine_MR::loadAlbumPage() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadAlbumPage()");
char filename[16];
int num = _album.curPage / 2;
@@ -764,7 +740,6 @@ void KyraEngine_MR::loadAlbumPage() {
}
void KyraEngine_MR::loadAlbumPageWSA() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadAlbumPageWSA()");
char filename[16];
_album.leftPage.curFrame = 0;
@@ -789,7 +764,6 @@ void KyraEngine_MR::loadAlbumPageWSA() {
}
void KyraEngine_MR::printAlbumPageText() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::printAlbumPageText()");
static const uint8 posY[] = {
0x41, 0x55, 0x55, 0x55, 0x55, 0x55, 0x5A, 0x5A,
@@ -815,7 +789,6 @@ void KyraEngine_MR::printAlbumPageText() {
}
void KyraEngine_MR::printAlbumText(int page, const char *str, int x, int y, uint8 c0) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::printAlbumText(%d, '%s', %d, %d, %d)", page, str, x, y, c0);
int oldPage = _screen->_curPage;
_screen->_curPage = page;
@@ -833,7 +806,6 @@ void KyraEngine_MR::printAlbumText(int page, const char *str, int x, int y, uint
}
void KyraEngine_MR::processAlbum() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::processAlbum()");
Button albumButtons[5];
GUI_V2_BUTTON(albumButtons[0], 36, 0, 0, 1, 1, 1, 0x4487, 0, 130, 190, 10, 10, 0xFF, 0xF0, 0xFF, 0xF0, 0xFF, 0xF0, 0);
@@ -898,7 +870,6 @@ void KyraEngine_MR::processAlbum() {
}
void KyraEngine_MR::albumNewPage() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumNewPage()");
int page = _album.nextPage / 2;
if (!queryGameFlag(0x84+page)) {
albumAnim1();
@@ -923,7 +894,6 @@ void KyraEngine_MR::albumNewPage() {
}
void KyraEngine_MR::albumUpdateAnims() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumUpdateAnims()");
if (_album.nextPage == 14 && !_album.isPage14)
return;
@@ -966,7 +936,6 @@ void KyraEngine_MR::albumUpdateAnims() {
}
void KyraEngine_MR::albumAnim1() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumAnim1()");
for (int i = 6; i >= 3; --i) {
albumRestoreRect();
@@ -982,7 +951,6 @@ void KyraEngine_MR::albumAnim1() {
}
void KyraEngine_MR::albumAnim2() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumAnim2()");
for (int i = 3; i <= 6; ++i) {
albumRestoreRect();
@@ -997,23 +965,19 @@ void KyraEngine_MR::albumAnim2() {
}
void KyraEngine_MR::albumBackUpRect() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumBackUpRect()");
_screen->copyRegionToBuffer(2, 0, 146, 62, 50, _album.backUpRect);
}
void KyraEngine_MR::albumRestoreRect() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumRestoreRect()");
_screen->copyBlockToPage(2, 0, 146, 62, 50, _album.backUpRect);
}
void KyraEngine_MR::albumUpdateRect() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumUpdateRect()");
_screen->copyRegion(0, 146, 0, 146, 62, 50, 2, 0, Screen::CR_NO_P_CHECK);
_screen->updateScreen();
}
void KyraEngine_MR::albumSwitchPages(int oldPage, int newPage, int srcPage) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumSwitchPages(%d, %d, %d)", oldPage, newPage, srcPage);
if (newPage > oldPage) {
_screen->wsaFrameAnimationStep(0xA0, 0x07, 0xA0, 0x07, 0x96, 0xBA, 0x64, 0xBA, srcPage, 0, 2);
@@ -1072,7 +1036,6 @@ void KyraEngine_MR::albumSwitchPages(int oldPage, int newPage, int srcPage) {
}
int KyraEngine_MR::albumNextPage(Button *caller) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumNextPage(%p)", (const void *)caller);
_album.nextPage = _album.curPage + 2;
if (_album.nextPage >= 16) {
_album.nextPage -= 2;
@@ -1082,7 +1045,6 @@ int KyraEngine_MR::albumNextPage(Button *caller) {
}
int KyraEngine_MR::albumPrevPage(Button *caller) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumPrevPage(%p)", (const void *)caller);
_album.nextPage = _album.curPage - 2;
if (_album.nextPage < 0) {
_album.nextPage = 0;
@@ -1092,7 +1054,6 @@ int KyraEngine_MR::albumPrevPage(Button *caller) {
}
int KyraEngine_MR::albumClose(Button *caller) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumClose(%p)", (const void *)caller);
_album.running = false;
return 0;
}