[Scummvm-cvs-logs] SF.net SVN: scummvm:[40715] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Tue May 19 03:13:30 CEST 2009
Revision: 40715
http://scummvm.svn.sourceforge.net/scummvm/?rev=40715&view=rev
Author: lordhoto
Date: 2009-05-19 01:13:29 +0000 (Tue, 19 May 2009)
Log Message:
-----------
Remov lots of superfluous debug output.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/animator_hof.cpp
scummvm/trunk/engines/kyra/animator_lok.cpp
scummvm/trunk/engines/kyra/animator_mr.cpp
scummvm/trunk/engines/kyra/animator_v2.cpp
scummvm/trunk/engines/kyra/gui.cpp
scummvm/trunk/engines/kyra/gui_lok.cpp
scummvm/trunk/engines/kyra/gui_mr.cpp
scummvm/trunk/engines/kyra/items_hof.cpp
scummvm/trunk/engines/kyra/items_lok.cpp
scummvm/trunk/engines/kyra/items_mr.cpp
scummvm/trunk/engines/kyra/items_v2.cpp
scummvm/trunk/engines/kyra/kyra_hof.cpp
scummvm/trunk/engines/kyra/kyra_lok.cpp
scummvm/trunk/engines/kyra/kyra_mr.cpp
scummvm/trunk/engines/kyra/kyra_v1.cpp
scummvm/trunk/engines/kyra/kyra_v2.cpp
scummvm/trunk/engines/kyra/lol.cpp
scummvm/trunk/engines/kyra/saveload.cpp
scummvm/trunk/engines/kyra/saveload_hof.cpp
scummvm/trunk/engines/kyra/saveload_lok.cpp
scummvm/trunk/engines/kyra/saveload_lol.cpp
scummvm/trunk/engines/kyra/saveload_mr.cpp
scummvm/trunk/engines/kyra/scene_hof.cpp
scummvm/trunk/engines/kyra/scene_lok.cpp
scummvm/trunk/engines/kyra/scene_mr.cpp
scummvm/trunk/engines/kyra/scene_v1.cpp
scummvm/trunk/engines/kyra/scene_v2.cpp
scummvm/trunk/engines/kyra/screen.cpp
scummvm/trunk/engines/kyra/screen_hof.cpp
scummvm/trunk/engines/kyra/screen_lok.cpp
scummvm/trunk/engines/kyra/screen_lol.cpp
scummvm/trunk/engines/kyra/screen_mr.cpp
scummvm/trunk/engines/kyra/screen_v2.cpp
scummvm/trunk/engines/kyra/script_mr.cpp
scummvm/trunk/engines/kyra/seqplayer.cpp
scummvm/trunk/engines/kyra/sequences_hof.cpp
scummvm/trunk/engines/kyra/sequences_lok.cpp
scummvm/trunk/engines/kyra/sequences_lol.cpp
scummvm/trunk/engines/kyra/sequences_mr.cpp
scummvm/trunk/engines/kyra/sequences_v2.cpp
scummvm/trunk/engines/kyra/sound.cpp
scummvm/trunk/engines/kyra/sound_lok.cpp
scummvm/trunk/engines/kyra/sprites.cpp
scummvm/trunk/engines/kyra/text.cpp
scummvm/trunk/engines/kyra/text_hof.cpp
scummvm/trunk/engines/kyra/text_lok.cpp
scummvm/trunk/engines/kyra/text_mr.cpp
scummvm/trunk/engines/kyra/timer.cpp
scummvm/trunk/engines/kyra/timer_hof.cpp
scummvm/trunk/engines/kyra/timer_lok.cpp
scummvm/trunk/engines/kyra/timer_lol.cpp
scummvm/trunk/engines/kyra/timer_mr.cpp
scummvm/trunk/engines/kyra/vqa.cpp
scummvm/trunk/engines/kyra/wsamovie.cpp
Modified: scummvm/trunk/engines/kyra/animator_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator_hof.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/animator_hof.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -31,12 +31,10 @@
namespace Kyra {
void KyraEngine_HoF::restorePage3() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_HoF::restorePage3()");
screen()->copyBlockToPage(2, 0, 0, 320, 144, _gamePlayBuffer);
}
void KyraEngine_HoF::clearAnimObjects() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_HoF::clearAnimObjects()");
_animObjects[0].index = 0;
_animObjects[0].type = 0;
_animObjects[0].enabled = 1;
@@ -61,7 +59,6 @@
}
void KyraEngine_HoF::drawAnimObjects() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_HoF::drawAnimObjects()");
for (AnimObj *curObject = _animList; curObject; curObject = curObject->nextObject) {
if (!curObject->enabled)
continue;
@@ -86,7 +83,6 @@
}
void KyraEngine_HoF::refreshAnimObjects(int force) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_HoF::refreshAnimObjects(%d)", force);
for (AnimObj *curObject = _animList; curObject; curObject = curObject->nextObject) {
if (!curObject->enabled)
continue;
@@ -120,7 +116,6 @@
}
void KyraEngine_HoF::updateItemAnimations() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_HoF::updateItemAnimations()");
bool nextFrame = false;
if (_itemAnimData[0].itemIndex == -1 || _inventorySaved)
@@ -178,7 +173,6 @@
}
void KyraEngine_HoF::updateCharFacing() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_HoF::updateCharFacing()");
if (_mainCharacter.x1 > _mouseX)
_mainCharacter.facing = 5;
else
@@ -190,7 +184,6 @@
}
void KyraEngine_HoF::updateCharacterAnim(int) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_HoF::updateCharacterAnim(-)");
Character *c = &_mainCharacter;
AnimObj *animState = _animObjects;
@@ -227,7 +220,6 @@
}
void KyraEngine_HoF::updateSceneAnim(int anim, int newFrame) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_HoF::updateSceneAnim(%d, %d)", anim, newFrame);
AnimObj *animObject = &_animObjects[1+anim];
if (!animObject->enabled)
return;
@@ -272,7 +264,6 @@
}
void KyraEngine_HoF::drawSceneAnimObject(AnimObj *obj, int x, int y, int layer) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_HoF::drawSceneAnimObject(%p, %d, %d, %d)", (const void*)obj, x, y, layer);
if (obj->type == 1) {
if (obj->shapeIndex1 == 0xFFFF)
return;
@@ -303,14 +294,12 @@
}
void KyraEngine_HoF::drawCharacterAnimObject(AnimObj *obj, int x, int y, int layer) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_HoF::drawCharacterAnimObject(%p, %d, %d, %d)", (const void*)obj, x, y, layer);
if (_drawNoShapeFlag || obj->shapeIndex1 == 0xFFFF)
return;
_screen->drawShape(2, getShapePtr(obj->shapeIndex1), x, y, 2, obj->flags | 4, layer, _charScale, _charScale);
}
void KyraEngine_HoF::setCharacterAnimDim(int w, int h) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_HoF::setCharacterAnimDim(%d, %d)", w, h);
restorePage3();
_animObj0Width = _animObjects[0].width;
@@ -321,7 +310,6 @@
}
void KyraEngine_HoF::resetCharacterAnimDim() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_HoF::resetCharacterAnimDim()");
restorePage3();
_animObjects[0].width = _animObj0Width;
Modified: scummvm/trunk/engines/kyra/animator_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator_lok.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/animator_lok.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -55,7 +55,6 @@
}
void Animator_LoK::init(int actors_, int items_, int sprites_) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::init(%d, %d, %d)", actors_, items_, sprites_);
_screenObjects = new AnimObject[actors_ + items_ + sprites_];
assert(_screenObjects);
memset(_screenObjects, 0, sizeof(AnimObject) * (actors_ + items_ + sprites_));
@@ -68,7 +67,6 @@
}
void Animator_LoK::close() {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::close()");
if (_initOk) {
_initOk = false;
delete[] _screenObjects;
@@ -119,7 +117,6 @@
}
void Animator_LoK::preserveAllBackgrounds() {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::preserveAllBackgrounds()");
uint8 curPage = _screen->_curPage;
_screen->_curPage = 2;
@@ -135,7 +132,6 @@
}
void Animator_LoK::flagAllObjectsForBkgdChange() {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::flagAllObjectsForBkgdChange()");
AnimObject *curObject = _objectQueue;
while (curObject) {
curObject->bkgdChangeFlag = 1;
@@ -144,7 +140,6 @@
}
void Animator_LoK::flagAllObjectsForRefresh() {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::flagAllObjectsForRefresh()");
AnimObject *curObject = _objectQueue;
while (curObject) {
curObject->refreshFlag = 1;
@@ -153,7 +148,6 @@
}
void Animator_LoK::restoreAllObjectBackgrounds() {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::restoreAllObjectBackground()");
AnimObject *curObject = _objectQueue;
_screen->_curPage = 2;
@@ -170,7 +164,6 @@
}
void Animator_LoK::preserveAnyChangedBackgrounds() {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::preserveAnyChangedBackgrounds()");
AnimObject *curObject = _objectQueue;
_screen->_curPage = 2;
@@ -186,7 +179,6 @@
}
void Animator_LoK::preserveOrRestoreBackground(AnimObject *obj, bool restore) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::preserveOrRestoreBackground(%p, %d)", (const void *)obj, restore);
int x = 0, y = 0, width = obj->width, height = obj->height;
if (restore) {
@@ -218,7 +210,6 @@
}
void Animator_LoK::prepDrawAllObjects() {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::prepDrawAllObjects()");
AnimObject *curObject = _objectQueue;
int drawPage = 2;
int flagUnk1 = 0, flagUnk2 = 0, flagUnk3 = 0;
@@ -364,7 +355,6 @@
}
void Animator_LoK::copyChangedObjectsForward(int refreshFlag) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::copyChangedObjectsForward(%d)", refreshFlag);
for (AnimObject *curObject = _objectQueue; curObject; curObject = curObject->nextAnimObject) {
if (curObject->active) {
@@ -405,7 +395,6 @@
}
void Animator_LoK::updateAllObjectShapes() {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::updateAllObjectShapes()");
restoreAllObjectBackgrounds();
preserveAnyChangedBackgrounds();
prepDrawAllObjects();
@@ -413,7 +402,6 @@
}
void Animator_LoK::animRemoveGameItem(int index) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::animRemoveGameItem(%d)", index);
restoreAllObjectBackgrounds();
AnimObject *animObj = &_items[index];
@@ -428,7 +416,6 @@
}
void Animator_LoK::animAddGameItem(int index, uint16 sceneId) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::animRemoveGameItem(%d, %d)", index, sceneId);
restoreAllObjectBackgrounds();
assert(sceneId < _vm->_roomTableSize);
Room *currentRoom = &_vm->_roomTable[sceneId];
@@ -454,7 +441,6 @@
}
void Animator_LoK::animAddNPC(int character) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::animAddNPC(%d)", character);
restoreAllObjectBackgrounds();
AnimObject *animObj = &_actors[character];
const Character *ch = &_vm->_characterList[character];
@@ -479,7 +465,6 @@
}
Animator_LoK::AnimObject *Animator_LoK::objectRemoveQueue(AnimObject *queue, AnimObject *rem) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::objectRemoveQueue(%p, %p)", (const void *)queue, (const void *)rem);
AnimObject *cur = queue;
AnimObject *prev = queue;
@@ -513,13 +498,11 @@
}
Animator_LoK::AnimObject *Animator_LoK::objectAddHead(AnimObject *queue, AnimObject *head) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::objectAddHead(%p, %p)", (const void *)queue, (const void *)head);
head->nextAnimObject = queue;
return head;
}
Animator_LoK::AnimObject *Animator_LoK::objectQueue(AnimObject *queue, AnimObject *add) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::objectQueue(%p, %p)", (const void *)queue, (const void *)add);
if (add->drawY <= queue->drawY || !queue) {
add->nextAnimObject = queue;
return add;
@@ -545,7 +528,6 @@
}
void Animator_LoK::addObjectToQueue(AnimObject *object) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::addObjectToQueue(%p)", (const void *)object);
if (!_objectQueue)
_objectQueue = objectAddHead(0, object);
else
@@ -553,7 +535,6 @@
}
void Animator_LoK::refreshObject(AnimObject *object) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::refreshObject(%p)", (const void *)object);
_objectQueue = objectRemoveQueue(_objectQueue, object);
if (_objectQueue)
_objectQueue = objectQueue(_objectQueue, object);
@@ -562,7 +543,6 @@
}
void Animator_LoK::makeBrandonFaceMouse() {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::makeBrandonFaceMouse()");
Common::Point mouse = _vm->getMousePos();
if (mouse.x >= _vm->_currentCharacter->x1)
_vm->_currentCharacter->facing = 3;
@@ -573,21 +553,18 @@
}
int16 Animator_LoK::fetchAnimWidth(const uint8 *shape, int16 mult) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::fetchAnimWidth(%p, %d)", (const void *)shape, mult);
if (_vm->gameFlags().useAltShapeHeader)
shape += 2;
return (((int16)READ_LE_UINT16((shape+3))) * mult) >> 8;
}
int16 Animator_LoK::fetchAnimHeight(const uint8 *shape, int16 mult) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::fetchAnimHeight(%p, %d)", (const void *)shape, mult);
if (_vm->gameFlags().useAltShapeHeader)
shape += 2;
return (int16)(((int8)*(shape+2)) * mult) >> 8;
}
void Animator_LoK::setBrandonAnimSeqSize(int width, int height) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::setBrandonAnimSeqSize(%d, %d)", width, height);
restoreAllObjectBackgrounds();
_brandonAnimSeqSizeWidth = _actors[0].width;
_brandonAnimSeqSizeHeight = _actors[0].height;
@@ -597,7 +574,6 @@
}
void Animator_LoK::resetBrandonAnimSeqSize() {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::resetBrandonAnimSeqSize()");
restoreAllObjectBackgrounds();
_actors[0].width = _brandonAnimSeqSizeWidth;
_actors[0].height = _brandonAnimSeqSizeHeight;
@@ -605,7 +581,6 @@
}
void Animator_LoK::animRefreshNPC(int character) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::animRefreshNPC(%d)", character);
AnimObject *animObj = &_actors[character];
Character *ch = &_vm->characterList()[character];
@@ -664,7 +639,6 @@
}
void Animator_LoK::setCharacterDefaultFrame(int character) {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::setCharacterDefaultFrame()");
static const uint16 initFrameTable[] = {
7, 41, 77, 0, 0
};
@@ -677,7 +651,6 @@
}
void Animator_LoK::setCharactersHeight() {
- debugC(9, kDebugLevelAnimator, "Animator_LoK::setCharactersHeight()");
static const int8 initHeightTable[] = {
48, 40, 48, 47, 56,
44, 42, 47, 38, 35,
Modified: scummvm/trunk/engines/kyra/animator_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator_mr.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/animator_mr.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -30,12 +30,10 @@
namespace Kyra {
void KyraEngine_MR::restorePage3() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::restorePage3()");
screen()->copyBlockToPage(2, 0, 0, 320, 200, _gamePlayBuffer);
}
void KyraEngine_MR::clearAnimObjects() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::clearAnimObjects()");
for (int i = 0; i < 67; ++i)
_animObjects[i].enabled = false;
@@ -72,7 +70,6 @@
}
void KyraEngine_MR::animSetupPaletteEntry(AnimObj *anim) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::animSetupPaletteEntry(%p)", (const void*)anim);
int layer = _screen->getLayer(anim->xPos1, anim->yPos1) - 1;
int16 count = 0;
for (int i = 0; i < 3; ++i)
@@ -84,7 +81,6 @@
}
void KyraEngine_MR::drawAnimObjects() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::drawAnimObjects()");
for (AnimObj *curObject = _animList; curObject; curObject = curObject->nextObject) {
if (!curObject->enabled)
continue;
@@ -108,7 +104,6 @@
}
void KyraEngine_MR::drawSceneAnimObject(AnimObj *obj, int x, int y, int layer) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::drawSceneAnimObject(%p, %d, %d, %d)", (const void*)obj, x, y, layer);
if (obj->type == 1) {
if (obj->shapeIndex1 == 0xFFFF)
return;
@@ -131,7 +126,6 @@
}
void KyraEngine_MR::drawCharacterAnimObject(AnimObj *obj, int x, int y, int layer) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::drawCharacterAnimObject(%p, %d, %d, %d)", (const void*)obj, x, y, layer);
if (_drawNoShapeFlag)
return;
@@ -148,7 +142,6 @@
}
void KyraEngine_MR::refreshAnimObjects(int force) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::refreshAnimObjects(%d)", force);
for (AnimObj *curObject = _animList; curObject; curObject = curObject->nextObject) {
if (!curObject->enabled)
continue;
@@ -194,7 +187,6 @@
}
void KyraEngine_MR::updateItemAnimations() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::updateItemAnimations()");
bool nextFrame = false;
if (_itemAnimData[0].itemIndex == -1)
@@ -246,7 +238,6 @@
}
void KyraEngine_MR::updateCharacterAnim(int charId) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::updateCharacterAnim(%d)", charId);
AnimObj *obj = &_animObjects[0];
obj->needRefresh = true;
@@ -293,7 +284,6 @@
}
void KyraEngine_MR::updateSceneAnim(int anim, int newFrame) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::updateSceneAnim(%d, %d)", anim, newFrame);
AnimObj *animObject = &_animObjects[1+anim];
if (!animObject->enabled)
return;
@@ -332,8 +322,6 @@
void KyraEngine_MR::setupSceneAnimObject(int animId, uint16 flags, int x, int y, int x2, int y2, int w,
int h, int unk10, int specialSize, int unk14, int shape, const char *filename) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::setupSceneAnimObject(%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, '%s')",
- animId, flags, x, y, x2, y2, w, h, unk10, specialSize, unk14, shape, filename);
restorePage3();
SceneAnim &anim = _sceneAnims[animId];
anim.flags = flags;
@@ -413,7 +401,6 @@
}
void KyraEngine_MR::removeSceneAnimObject(int anim, int refresh) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::removeSceneAnimObject(%d, %d)", anim, refresh);
AnimObj *obj = &_animObjects[anim+1];
restorePage3();
obj->shapeIndex3 = 0xFFFF;
@@ -429,7 +416,6 @@
}
void KyraEngine_MR::setCharacterAnimDim(int w, int h) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::setCharacterAnimDim(%d, %d)", w, h);
restorePage3();
_charBackUpWidth = _animObjects[0].width;
_charBackUpWidth2 = _animObjects[0].width2;
@@ -443,7 +429,6 @@
}
void KyraEngine_MR::resetCharacterAnimDim() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::resetCharacterAnimDim()");
restorePage3();
_animObjects[0].width2 = _charBackUpWidth2;
_animObjects[0].height2 = _charBackUpHeight2;
@@ -454,7 +439,6 @@
}
void KyraEngine_MR::showIdleAnim() {
- debugC(9, kDebugLevelMain | kDebugLevelAnimator, "KyraEngine_MR::showIdleAnim()");
if (_mainCharacter.sceneId == 20 || _mainCharacter.sceneId == 21
|| _mainCharacter.sceneId == 12 || _mainCharacter.sceneId == 11)
Modified: scummvm/trunk/engines/kyra/animator_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator_v2.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/animator_v2.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -32,7 +32,6 @@
namespace Kyra {
void KyraEngine_v2::allocAnimObjects(int actors, int anims, int items) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_v2::allocAnimObjects(%d, %d, %d)", actors, anims, items);
_animObjects = new AnimObj[actors+anims+items];
assert(_animObjects);
@@ -44,13 +43,11 @@
}
KyraEngine_v2::AnimObj *KyraEngine_v2::initAnimList(AnimObj *list, AnimObj *entry) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_v2::initAnimList(%p, %p)", (const void*)list, (const void*)entry);
entry->nextObject = list;
return entry;
}
KyraEngine_v2::AnimObj *KyraEngine_v2::addToAnimListSorted(AnimObj *list, AnimObj *add) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_v2::addToAnimListSorted(%p, %p)", (const void*)list, (const void*)add);
add->nextObject = 0;
if (!list)
@@ -82,7 +79,6 @@
}
KyraEngine_v2::AnimObj *KyraEngine_v2::deleteAnimListEntry(AnimObj *list, AnimObj *entry) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_v2::addToAnimListSorted(%p, %p)", (const void*)list, (const void*)entry);
if (!list)
return 0;
@@ -123,7 +119,6 @@
}
void KyraEngine_v2::refreshAnimObjectsIfNeed() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_v2::refreshAnimObjectsIfNeed()");
for (AnimObj *curEntry = _animList; curEntry; curEntry = curEntry->nextObject) {
if (curEntry->enabled && curEntry->needRefresh) {
restorePage3();
@@ -136,19 +131,16 @@
}
void KyraEngine_v2::flagAnimObjsForRefresh() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_v2::flagAnimObjsForRefresh()");
for (AnimObj *curEntry = _animList; curEntry; curEntry = curEntry->nextObject)
curEntry->needRefresh = 1;
}
void KyraEngine_v2::flagAnimObjsSpecialRefresh() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_v2::flagAnimObjsSpecialRefresh()");
for (AnimObj *curEntry = _animList; curEntry; curEntry = curEntry->nextObject)
curEntry->specialRefresh = 1;
}
void KyraEngine_v2::addItemToAnimList(int item) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_v2::addItemToAnimList(%d)", item);
assert(item < _itemListSize);
restorePage3();
@@ -181,7 +173,6 @@
}
void KyraEngine_v2::deleteItemAnimEntry(int item) {
- debugC(9, kDebugLevelAnimator, "KyraEngine_v2::deleteItemAnimEntry(%d)", item);
assert(item < _itemListSize);
AnimObj *animObj = _animItems + item;
Modified: scummvm/trunk/engines/kyra/gui.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/gui.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -434,7 +434,6 @@
}
int MainMenu::handle(int dim) {
- debugC(9, kDebugLevelMain, "MainMenu::handle(%d)", dim);
int command = -1;
uint8 colorMap[16];
@@ -516,7 +515,6 @@
}
void MainMenu::draw(int select) {
- debugC(9, kDebugLevelMain, "MainMenu::draw(%d)", select);
int top = _screen->_curDim->sy;
top += _static.menuTable[1];
@@ -528,7 +526,6 @@
}
void MainMenu::drawBox(int x, int y, int w, int h, int fill) {
- debugC(9, kDebugLevelMain, "MainMenu::drawBox(%d, %d, %d, %d, %d)", x, y, w, h, fill);
--w; --h;
if (fill)
@@ -544,7 +541,6 @@
}
void MainMenu::printString(const char *format, int x, int y, int col1, int col2, int flags, ...) {
- debugC(9, kDebugLevelMain, "MainMenu::printString('%s', %d, %d, %d, %d, %d, ...)", format, x, y, col1, col2, flags);
if (!format)
return;
Modified: scummvm/trunk/engines/kyra/gui_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lok.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/gui_lok.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -509,7 +509,6 @@
}
int GUI_LoK::resumeGame(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::resumeGame()");
updateMenuButton(button);
_displayMenu = false;
@@ -548,7 +547,6 @@
}
int GUI_LoK::saveGameMenu(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::saveGameMenu()");
updateSaveList();
updateMenuButton(button);
@@ -589,7 +587,6 @@
}
int GUI_LoK::loadGameMenu(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::loadGameMenu()");
updateSaveList();
if (_vm->_menuDirectlyToLoad) {
@@ -679,7 +676,6 @@
}
int GUI_LoK::saveGame(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::saveGame()");
updateMenuButton(button);
_vm->_gameToLoad = _menu[2].item[button->index-0xC].saveSlot;
@@ -730,7 +726,6 @@
}
int GUI_LoK::savegameConfirm(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::savegameConfirm()");
updateMenuButton(button);
_displaySubMenu = false;
@@ -738,7 +733,6 @@
}
int GUI_LoK::loadGame(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::loadGame()");
updateMenuButton(button);
_displaySubMenu = false;
_vm->_gameToLoad = _menu[2].item[button->index-0xC].saveSlot;
@@ -747,7 +741,6 @@
}
int GUI_LoK::cancelSubMenu(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::cancelSubMenu()");
updateMenuButton(button);
_displaySubMenu = false;
_cancelSubMenu = true;
@@ -756,7 +749,6 @@
}
int GUI_LoK::quitPlaying(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::quitPlaying()");
updateMenuButton(button);
if (quitConfirm(_vm->_guiStrings[14])) { // Are you sure you want to quit playing?
@@ -770,7 +762,6 @@
}
bool GUI_LoK::quitConfirm(const char *str) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::quitConfirm()");
_screen->loadPageFromDisk("SEENPAGE.TMP", 0);
_screen->savePageToDisk("SEENPAGE.TMP", 0);
@@ -794,7 +785,6 @@
}
int GUI_LoK::quitConfirmYes(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::quitConfirmYes()");
updateMenuButton(button);
_displaySubMenu = false;
_cancelSubMenu = false;
@@ -803,7 +793,6 @@
}
int GUI_LoK::quitConfirmNo(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::quitConfirmNo()");
updateMenuButton(button);
_displaySubMenu = false;
_cancelSubMenu = true;
@@ -812,7 +801,6 @@
}
int GUI_LoK::gameControlsMenu(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::gameControlsMenu()");
_vm->readSettings();
@@ -862,7 +850,6 @@
}
void GUI_LoK::setupControls(Menu &menu) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::setupControls()");
switch (_vm->_configMusic) {
case 0:
@@ -959,7 +946,6 @@
}
int GUI_LoK::controlsChangeMusic(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::controlsChangeMusic()");
updateMenuButton(button);
_vm->_configMusic = ++_vm->_configMusic % ((_vm->gameFlags().platform == Common::kPlatformFMTowns) ? 3 : 2);
@@ -968,7 +954,6 @@
}
int GUI_LoK::controlsChangeSounds(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::controlsChangeSounds()");
updateMenuButton(button);
_vm->_configSounds = !_vm->_configSounds;
@@ -977,7 +962,6 @@
}
int GUI_LoK::controlsChangeWalk(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::controlsChangeWalk()");
updateMenuButton(button);
_vm->_configWalkspeed = ++_vm->_configWalkspeed % 5;
@@ -987,7 +971,6 @@
}
int GUI_LoK::controlsChangeText(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::controlsChangeText()");
updateMenuButton(button);
_vm->_configTextspeed = ++_vm->_configTextspeed % 4;
@@ -996,7 +979,6 @@
}
int GUI_LoK::controlsChangeVoice(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::controlsChangeVoice()");
updateMenuButton(button);
_vm->_configVoice = ++_vm->_configVoice % 3;
@@ -1005,13 +987,11 @@
}
int GUI_LoK::controlsApply(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::controlsApply()");
_vm->writeSettings();
return cancelSubMenu(button);
}
int GUI_LoK::scrollUp(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::scrollUp()");
updateMenuButton(button);
if (_savegameOffset > 0) {
@@ -1023,7 +1003,6 @@
}
int GUI_LoK::scrollDown(Button *button) {
- debugC(9, kDebugLevelGUI, "GUI_LoK::scrollDown()");
updateMenuButton(button);
_savegameOffset++;
@@ -1066,7 +1045,6 @@
#pragma mark -
void KyraEngine_LoK::drawAmulet() {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::drawAmulet()");
static const int16 amuletTable1[] = {0x167, 0x162, 0x15D, 0x158, 0x153, 0x150, 0x155, 0x15A, 0x15F, 0x164, 0x145, -1};
static const int16 amuletTable3[] = {0x167, 0x162, 0x15D, 0x158, 0x153, 0x14F, 0x154, 0x159, 0x15E, 0x163, 0x144, -1};
static const int16 amuletTable2[] = {0x167, 0x162, 0x15D, 0x158, 0x153, 0x152, 0x157, 0x15C, 0x161, 0x166, 0x147, -1};
Modified: scummvm/trunk/engines/kyra/gui_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_mr.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/gui_mr.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -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 @@
}
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::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::updateCommandLine() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::updateCommandLine()");
if (_restoreCommandLine) {
restoreCommandLine();
_restoreCommandLine = false;
@@ -160,13 +155,11 @@
}
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::showInventory() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::showInventory()");
if (!_screen->isMouseVisible())
return;
if (queryGameFlag(3))
@@ -253,7 +245,6 @@
}
void KyraEngine_MR::hideInventory() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::hideInventory()");
if (queryGameFlag(3))
return;
@@ -317,7 +308,6 @@
}
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::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::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::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::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 @@
}
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 @@
}
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::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::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 @@
}
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::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::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::buttonJesterStaff(Button *button) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::buttonJesterStaff(%p)", (const void*)button);
makeCharFacingMouse();
if (_itemInHand == 27) {
_screen->hideMouse();
@@ -679,7 +657,6 @@
}
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::loadAlbumPage() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadAlbumPage()");
char filename[16];
int num = _album.curPage / 2;
@@ -764,7 +740,6 @@
}
void KyraEngine_MR::loadAlbumPageWSA() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadAlbumPageWSA()");
char filename[16];
_album.leftPage.curFrame = 0;
@@ -789,7 +764,6 @@
}
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::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::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::albumNewPage() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumNewPage()");
int page = _album.nextPage / 2;
if (!queryGameFlag(0x84+page)) {
albumAnim1();
@@ -923,7 +894,6 @@
}
void KyraEngine_MR::albumUpdateAnims() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumUpdateAnims()");
if (_album.nextPage == 14 && !_album.isPage14)
return;
@@ -966,7 +936,6 @@
}
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::albumAnim2() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumAnim2()");
for (int i = 3; i <= 6; ++i) {
albumRestoreRect();
@@ -997,23 +965,19 @@
}
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 @@
}
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::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::albumClose(Button *caller) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::albumClose(%p)", (const void *)caller);
_album.running = false;
return 0;
}
Modified: scummvm/trunk/engines/kyra/items_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/items_hof.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/items_hof.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -28,7 +28,6 @@
namespace Kyra {
int KyraEngine_HoF::checkItemCollision(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::checkItemCollision(%d, %d)", x, y);
int itemPos = -1, yPos = -1;
for (int i = 0; i < 30; ++i) {
@@ -59,7 +58,6 @@
}
void KyraEngine_HoF::updateWaterFlasks() {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::updateWaterFlasks()");
for (int i = 22; i < 24; i++) {
if (_itemInHand == i)
setHandItem(i - 1);
@@ -82,7 +80,6 @@
}
bool KyraEngine_HoF::dropItem(int unk1, uint16 item, int x, int y, int unk2) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::dropItem(%d, %u, %d, %d, %d)", unk1, item, x, y, unk2);
if (_mouseState <= -1)
return false;
@@ -97,7 +94,6 @@
}
bool KyraEngine_HoF::processItemDrop(uint16 sceneId, uint16 item, int x, int y, int unk1, int unk2) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::processItemDrop(%u, %u, %d, %d, %d, %d)", sceneId, item, x, y, unk1, unk2);
int itemPos = checkItemCollision(x, y);
if (unk1)
@@ -205,7 +201,6 @@
}
void KyraEngine_HoF::itemDropDown(int startX, int startY, int dstX, int dstY, int itemSlot, uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::itemDropDown(%d, %d, %d, %d, %d, %u)", startX, startY, dstX, dstY, itemSlot, item);
uint8 *itemShape = getShapePtr(item + 64);
if (startX == dstX && startY == dstY) {
@@ -310,7 +305,6 @@
}
void KyraEngine_HoF::exchangeMouseItem(int itemPos) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::exchangeMouseItem(%d)", itemPos);
_screen->hideMouse();
deleteItemAnimEntry(itemPos);
@@ -334,7 +328,6 @@
}
bool KyraEngine_HoF::pickUpItem(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::pickUpItem(%d, %d)", x, y);
int itemPos = checkItemCollision(x, y);
if (itemPos <= -1)
@@ -365,7 +358,6 @@
}
bool KyraEngine_HoF::isDropable(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::isDropable(%d, %d)", x, y);
if (x < 14 || x > 304 || y < 14 || y > 136)
return false;
@@ -381,7 +373,6 @@
}
int KyraEngine_HoF::getItemCommandStringDrop(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::getItemCommandStringDrop(%u)", item);
assert(item < _itemStringMapSize);
int stringId = _itemStringMap[item];
@@ -394,7 +385,6 @@
}
int KyraEngine_HoF::getItemCommandStringPickUp(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::getItemCommandStringPickUp(%u)", item);
assert(item < _itemStringMapSize);
int stringId = _itemStringMap[item];
@@ -407,7 +397,6 @@
}
int KyraEngine_HoF::getItemCommandStringInv(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::getItemCommandStringInv(%u)", item);
assert(item < _itemStringMapSize);
int stringId = _itemStringMap[item];
@@ -420,7 +409,6 @@
}
bool KyraEngine_HoF::itemIsFlask(int item) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::itemIsFlask(%d)", item);
for (int i = 0; _flaskTable[i] != -1; ++i) {
if (_flaskTable[i] == item)
return true;
@@ -430,7 +418,6 @@
}
void KyraEngine_HoF::setMouseCursor(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::setMouseCursor(%u)", item);
int shape = 0;
int hotX = 1;
int hotY = 1;
Modified: scummvm/trunk/engines/kyra/items_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/items_lok.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/items_lok.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -56,7 +56,6 @@
}
void KyraEngine_LoK::addToNoDropRects(int x, int y, int w, int h) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::addToNoDropRects(%d, %d, %d, %d)", x, y, w, h);
for (int rect = 0; rect < ARRAYSIZE(_noDropRects); ++rect) {
if (_noDropRects[rect].top == -1) {
_noDropRects[rect].left = x;
@@ -69,12 +68,10 @@
}
void KyraEngine_LoK::clearNoDropRects() {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::clearNoDropRects()");
memset(_noDropRects, -1, sizeof(_noDropRects));
}
byte KyraEngine_LoK::findFreeItemInScene(int scene) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::findFreeItemInScene(%d)", scene);
assert(scene < _roomTableSize);
Room *room = &_roomTable[scene];
for (int i = 0; i < 12; ++i) {
@@ -85,7 +82,6 @@
}
byte KyraEngine_LoK::findItemAtPos(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::findItemAtPos(%d, %d)", x, y);
assert(_currentCharacter->sceneId < _roomTableSize);
const uint8 *itemsTable = _roomTable[_currentCharacter->sceneId].itemsTable;
const uint16 *xposOffset = _roomTable[_currentCharacter->sceneId].itemsXPos;
@@ -121,7 +117,6 @@
}
void KyraEngine_LoK::placeItemInGenericMapScene(int item, int index) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::placeItemInGenericMapScene(%d, %d)", item, index);
static const uint16 itemMapSceneMinTable[] = {
0x0000, 0x0011, 0x006D, 0x0025, 0x00C7, 0x0000
};
@@ -176,7 +171,6 @@
}
void KyraEngine_LoK::setHandItem(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::setHandItem(%u)", item);
_screen->hideMouse();
setMouseItem(item);
_itemInHand = item;
@@ -184,7 +178,6 @@
}
void KyraEngine_LoK::removeHandItem() {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::removeHandItem()");
_screen->hideMouse();
_screen->setMouseCursor(1, 1, _shapes[0]);
_itemInHand = -1;
@@ -192,7 +185,6 @@
}
void KyraEngine_LoK::setMouseItem(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::setMouseItem(%u)", item);
if (item == 0xFFFF)
_screen->setMouseCursor(1, 1, _shapes[6]);
else
@@ -200,7 +192,6 @@
}
void KyraEngine_LoK::wipeDownMouseItem(int xpos, int ypos) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::wipeDownMouseItem(%d, %d)", xpos, ypos);
if (_itemInHand == -1)
return;
xpos -= 8;
@@ -227,7 +218,6 @@
}
void KyraEngine_LoK::setupSceneItems() {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::setupSceneItems()");
uint16 sceneId = _currentCharacter->sceneId;
assert(sceneId < _roomTableSize);
Room *currentRoom = &_roomTable[sceneId];
@@ -265,7 +255,6 @@
}
int KyraEngine_LoK::countItemsInScene(uint16 sceneId) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::countItemsInScene(%d)", sceneId);
assert(sceneId < _roomTableSize);
Room *currentRoom = &_roomTable[sceneId];
@@ -280,7 +269,6 @@
}
int KyraEngine_LoK::processItemDrop(uint16 sceneId, uint8 item, int x, int y, int unk1, int unk2) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::processItemDrop(%d, %d, %d, %d, %d, %d)", sceneId, item, x, y, unk1, unk2);
int freeItem = -1;
uint8 itemIndex = findItemAtPos(x, y);
if (unk1)
@@ -433,7 +421,6 @@
}
void KyraEngine_LoK::exchangeItemWithMouseItem(uint16 sceneId, int itemIndex) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::exchangeItemWithMouseItem(%d, %d)", sceneId, itemIndex);
_screen->hideMouse();
_animator->animRemoveGameItem(itemIndex);
assert(sceneId < _roomTableSize);
@@ -453,7 +440,6 @@
}
void KyraEngine_LoK::addItemToRoom(uint16 sceneId, uint8 item, int itemIndex, int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::addItemToRoom(%d, %d, %d, %d, %d)", sceneId, item, itemIndex, x, y);
assert(sceneId < _roomTableSize);
Room *currentRoom = &_roomTable[sceneId];
currentRoom->itemsTable[itemIndex] = item;
@@ -463,7 +449,6 @@
}
int KyraEngine_LoK::checkNoDropRects(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::checkNoDropRects(%d, %d)", x, y);
if (_lastProcessedItemHeight < 1 || _lastProcessedItemHeight > 16)
_lastProcessedItemHeight = 16;
if (_noDropRects[0].left == -1)
@@ -493,7 +478,6 @@
}
int KyraEngine_LoK::isDropable(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::isDropable(%d, %d)", x, y);
x -= 8;
y -= 1;
@@ -508,7 +492,6 @@
}
void KyraEngine_LoK::itemDropDown(int x, int y, int destX, int destY, byte freeItem, int item) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::itemDropDown(%d, %d, %d, %d, %d, %d)", x, y, destX, destY, freeItem, item);
assert(_currentCharacter->sceneId < _roomTableSize);
Room *currentRoom = &_roomTable[_currentCharacter->sceneId];
if (x == destX && y == destY) {
@@ -592,7 +575,6 @@
}
void KyraEngine_LoK::dropItem(int unk1, int item, int x, int y, int unk2) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::dropItem(%d, %d, %d, %d, %d)", unk1, item, x, y, unk2);
if (processItemDrop(_currentCharacter->sceneId, item, x, y, unk1, unk2))
return;
snd_playSoundEffect(54);
@@ -604,7 +586,6 @@
}
void KyraEngine_LoK::itemSpecialFX(int x, int y, int item) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::itemSpecialFX(%d, %d, %d)", x, y, item);
if (item == 41)
itemSpecialFX1(x, y, item);
else
@@ -612,7 +593,6 @@
}
void KyraEngine_LoK::itemSpecialFX1(int x, int y, int item) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::itemSpecialFX1(%d, %d, %d)", x, y, item);
uint8 *shape = _shapes[216+item];
x -= 8;
int startY = y;
@@ -633,7 +613,6 @@
}
void KyraEngine_LoK::itemSpecialFX2(int x, int y, int item) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::itemSpecialFX2(%d, %d, %d)", x, y, item);
x -= 8;
y -= 15;
int yAdd = (int8)(((16 - _itemTable[item].height) >> 1) & 0xFF);
@@ -661,7 +640,6 @@
}
void KyraEngine_LoK::magicOutMouseItem(int animIndex, int itemPos) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::magicOutMouseItem(%d, %d)", animIndex, itemPos);
int videoPageBackUp = _screen->_curPage;
_screen->_curPage = 0;
int x = 0, y = 0;
@@ -745,7 +723,6 @@
}
void KyraEngine_LoK::magicInMouseItem(int animIndex, int item, int itemPos) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::magicInMouseItem(%d, %d, %d)", animIndex, item, itemPos);
int videoPageBackUp = _screen->_curPage;
_screen->_curPage = 0;
int x = 0, y = 0;
@@ -818,7 +795,6 @@
}
void KyraEngine_LoK::specialMouseItemFX(int shape, int x, int y, int animIndex, int tableIndex, int loopStart, int maxLoops) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::specialMouseItemFX(%d, %d, %d, %d, %d, %d, %d)", shape, x, y, animIndex, tableIndex, loopStart, maxLoops);
static const uint8 table1[] = {
0x23, 0x45, 0x55, 0x72, 0x84, 0xCF, 0x00, 0x00
};
@@ -841,7 +817,6 @@
}
void KyraEngine_LoK::processSpecialMouseItemFX(int shape, int x, int y, int tableValue, int loopStart, int maxLoops) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::processSpecialMouseItemFX(%d, %d, %d, %d, %d, %d)", shape, x, y, tableValue, loopStart, maxLoops);
uint8 shapeColorTable[16];
uint8 *shapePtr = _shapes[shape] + 10;
if (_flags.useAltShapeHeader)
@@ -860,7 +835,6 @@
}
void KyraEngine_LoK::updatePlayerItemsForScene() {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::updatePlayerItemsForScene()");
if (_itemInHand >= 29 && _itemInHand < 33) {
++_itemInHand;
if (_itemInHand > 33)
@@ -917,25 +891,21 @@
}
void KyraEngine_LoK::backUpItemRect0(int xpos, int ypos) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::backUpItemRect0(%d, %d)", xpos, ypos);
_screen->rectClip(xpos, ypos, 3<<3, 24);
_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 3<<3, 24, _itemBkgBackUp[0]);
}
void KyraEngine_LoK::restoreItemRect0(int xpos, int ypos) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::restoreItemRect0(%d, %d)", xpos, ypos);
_screen->rectClip(xpos, ypos, 3<<3, 24);
_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 3<<3, 24, _itemBkgBackUp[0]);
}
void KyraEngine_LoK::backUpItemRect1(int xpos, int ypos) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::backUpItemRect1(%d, %d)", xpos, ypos);
_screen->rectClip(xpos, ypos, 4<<3, 32);
_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 4<<3, 32, _itemBkgBackUp[1]);
}
void KyraEngine_LoK::restoreItemRect1(int xpos, int ypos) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::restoreItemRect1(%d, %d)", xpos, ypos);
_screen->rectClip(xpos, ypos, 4<<3, 32);
_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 4<<3, 32, _itemBkgBackUp[1]);
}
Modified: scummvm/trunk/engines/kyra/items_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/items_mr.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/items_mr.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -29,7 +29,6 @@
namespace Kyra {
void KyraEngine_MR::removeTrashItems() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::removeTrashItems()");
for (int i = 0; _trashItemList[i] != 0xFF; ++i) {
for (int item = findItem(_trashItemList[i]); item != -1; item = findItem(_trashItemList[i])) {
if (_itemList[item].sceneId != _mainCharacter.sceneId)
@@ -41,7 +40,6 @@
}
int KyraEngine_MR::findFreeInventorySlot() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::findFreeInventorySlot()");
for (int i = 0; i < 10; ++i) {
if (_mainCharacter.inventory[i] == 0xFFFF)
return i;
@@ -50,7 +48,6 @@
}
int KyraEngine_MR::checkItemCollision(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::checkItemCollision(%d, %d)", x, y);
int itemIndex = -1;
int maxItemY = -1;
@@ -80,7 +77,6 @@
}
void KyraEngine_MR::setMouseCursor(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::setMouseCursor(%u)", item);
int shape = 0;
int hotX = 1;
int hotY = 1;
@@ -96,7 +92,6 @@
}
void KyraEngine_MR::setItemMouseCursor() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::setItemMouseCursor()");
_mouseState = _itemInHand;
if (_itemInHand == -1)
_screen->setMouseCursor(0, 0, _gameShapes[0]);
@@ -105,7 +100,6 @@
}
bool KyraEngine_MR::dropItem(int unk1, uint16 item, int x, int y, int unk2) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::dropItem(%d, %d, %d, %d, %d)", unk1, item, x, y, unk2);
if (_mouseState <= -1)
return false;
@@ -130,7 +124,6 @@
}
bool KyraEngine_MR::processItemDrop(uint16 sceneId, uint16 item, int x, int y, int unk1, int unk2) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::processItemDrop(%d, %d, %d, %d, %d, %d)", sceneId, item, x, y, unk1, unk2);
int itemPos = checkItemCollision(x, y);
@@ -236,7 +229,6 @@
}
void KyraEngine_MR::itemDropDown(int startX, int startY, int dstX, int dstY, int itemSlot, uint16 item, int remove) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::itemDropDown(%d, %d, %d, %d, %d, %u, %d)", startX, startY, dstX, dstY, itemSlot, item, remove);
if (startX == dstX && startY == dstY) {
_itemList[itemSlot].x = dstX;
_itemList[itemSlot].y = dstY;
@@ -321,7 +313,6 @@
}
void KyraEngine_MR::exchangeMouseItem(int itemPos, int runScript) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::exchangeMouseItem(%d, %d)", itemPos, runScript);
if (itemListMagic(_itemInHand, itemPos))
return;
@@ -354,7 +345,6 @@
}
bool KyraEngine_MR::pickUpItem(int x, int y, int runScript) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::pickUpItem(%d, %d, %d)", x, y, runScript);
int itemPos = checkItemCollision(x, y);
if (itemPos <= -1)
@@ -386,7 +376,6 @@
}
bool KyraEngine_MR::isDropable(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::isDropable(%d, %d)", x, y);
if (y < 14 || y > 187)
return false;
@@ -401,7 +390,6 @@
}
bool KyraEngine_MR::itemListMagic(int handItem, int itemSlot) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::itemListMagic(%d, %d)", handItem, itemSlot);
uint16 item = _itemList[itemSlot].id;
if (_currentChapter == 1 && handItem == 3 && item == 3 && queryGameFlag(0x76)) {
@@ -481,7 +469,6 @@
}
bool KyraEngine_MR::itemInventoryMagic(int handItem, int invSlot) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::itemInventoryMagic(%d, %d)", handItem, invSlot);
uint16 item = _mainCharacter.inventory[invSlot];
if (_currentChapter == 1 && handItem == 3 && item == 3 && queryGameFlag(0x76)) {
@@ -542,21 +529,18 @@
}
int KyraEngine_MR::getItemCommandStringDrop(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::getItemCommandStringDrop(%u)", item);
assert(item < _itemStringMapSize);
int stringId = _itemStringMap[item];
return _itemStringDrop[stringId];
}
int KyraEngine_MR::getItemCommandStringPickUp(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::getItemCommandStringPickUp(%u)", item);
assert(item < _itemStringMapSize);
int stringId = _itemStringMap[item];
return _itemStringPickUp[stringId];
}
int KyraEngine_MR::getItemCommandStringInv(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::getItemCommandStringInv(%u)", item);
assert(item < _itemStringMapSize);
int stringId = _itemStringMap[item];
return _itemStringInv[stringId];
Modified: scummvm/trunk/engines/kyra/items_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/items_v2.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/items_v2.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -29,7 +29,6 @@
namespace Kyra {
void KyraEngine_v2::initItemList(int size) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::initItemList(%d)", size);
delete[] _itemList;
_itemList = new Item[size];
@@ -41,7 +40,6 @@
}
int KyraEngine_v2::findFreeItem() {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::findFreeItem()");
for (int i = 0; i < _itemListSize; ++i) {
if (_itemList[i].id == 0xFFFF)
return i;
@@ -50,7 +48,6 @@
}
int KyraEngine_v2::countAllItems() {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::countAllItems()");
int num = 0;
for (int i = 0; i < _itemListSize; ++i) {
if (_itemList[i].id != 0xFFFF)
@@ -60,7 +57,6 @@
}
int KyraEngine_v2::findItem(uint16 sceneId, uint16 id) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::findItem(%u, %u)", sceneId, id);
for (int i = 0; i < _itemListSize; ++i) {
if (_itemList[i].id == id && _itemList[i].sceneId == sceneId)
return i;
@@ -69,7 +65,6 @@
}
int KyraEngine_v2::findItem(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::findItem(%u)", item);
for (int i = 0; i < _itemListSize; ++i) {
if (_itemList[i].id == item)
return i;
@@ -78,13 +73,11 @@
}
void KyraEngine_v2::resetItemList() {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::resetItemList()");
for (int i = 0; i < _itemListSize; ++i)
resetItem(i);
}
void KyraEngine_v2::resetItem(int index) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::resetItem(%d)", index);
_itemList[index].id = 0xFFFF;
_itemList[index].sceneId = 0xFFFF;
_itemList[index].x = 0;
@@ -92,7 +85,6 @@
}
void KyraEngine_v2::setHandItem(uint16 item) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::setHandItem(%u)", item);
Screen *scr = screen();
scr->hideMouse();
@@ -107,7 +99,6 @@
}
void KyraEngine_v2::removeHandItem() {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::removeHandItem()");
Screen *scr = screen();
scr->hideMouse();
scr->setMouseCursor(0, 0, getShapePtr(0));
Modified: scummvm/trunk/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/kyra_hof.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -1453,7 +1453,6 @@
#pragma mark -
void KyraEngine_HoF::openTalkFile(int newFile) {
- debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine_HoF::openTalkFile(%d)", newFile);
char talkFilename[16];
if (_oldTalkFile > 0) {
@@ -1481,7 +1480,6 @@
}
void KyraEngine_HoF::snd_playVoiceFile(int id) {
- debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine_HoF::snd_playVoiceFile(%d)", id);
char vocFile[9];
assert(id >= 0 && id <= 9999999);
sprintf(vocFile, "%07d", id);
@@ -1498,7 +1496,6 @@
}
void KyraEngine_HoF::snd_loadSoundFile(int id) {
- debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine_HoF::snd_loadSoundFile(%d)", id);
if (id < 0 || !_trackMap)
return;
@@ -1509,7 +1506,6 @@
}
void KyraEngine_HoF::playVoice(int high, int low) {
- debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine_HoF::playVoice(%d, %d)", high, low);
if (!_flags.isTalkie)
return;
int vocFile = high * 10000 + low * 10;
@@ -1518,7 +1514,6 @@
}
void KyraEngine_HoF::snd_playSoundEffect(int track, int volume) {
- debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine_HoF::snd_playSoundEffect(%d, %d)", track, volume);
if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) {
if (track == 10)
Modified: scummvm/trunk/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/kyra_lok.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -316,7 +316,6 @@
void KyraEngine_LoK::startup() {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::startup()");
static const uint8 colorMap[] = { 0, 0, 0, 0, 12, 12, 12, 0, 0, 0, 0, 0 };
_screen->setTextColorMap(colorMap);
_sound->setSoundList(&_soundData[kMusicIngame]);
@@ -399,7 +398,6 @@
}
void KyraEngine_LoK::mainLoop() {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::mainLoop()");
_eventList.clear();
@@ -532,7 +530,6 @@
#pragma mark -
void KyraEngine_LoK::setupShapes123(const Shape *shapeTable, int endShape, int flags) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::setupShapes123(%p, %d, %d)", (const void *)shapeTable, endShape, flags);
for (int i = 123; i <= 172; ++i)
_shapes[i] = 0;
@@ -561,7 +558,6 @@
}
void KyraEngine_LoK::freeShapes123() {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::freeShapes123()");
for (int i = 123; i <= 172; ++i) {
delete[] _shapes[i];
@@ -581,7 +577,6 @@
}
void KyraEngine_LoK::setBrandonPoisonFlags(int reset) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::setBrandonPoisonFlags(%d)", reset);
_brandonStatusBit |= 1;
if (reset)
@@ -598,7 +593,6 @@
}
void KyraEngine_LoK::resetBrandonPoisonFlags() {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::resetBrandonPoisonFlags()");
_brandonStatusBit = 0;
for (int i = 0; i < 0x100; ++i)
@@ -610,7 +604,6 @@
#pragma mark -
void KyraEngine_LoK::processInput(int xpos, int ypos) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::processInput(%d, %d)", xpos, ypos);
if (processInputHelper(xpos, ypos))
return;
@@ -662,7 +655,6 @@
}
int KyraEngine_LoK::processInputHelper(int xpos, int ypos) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::processInputHelper(%d, %d)", xpos, ypos);
uint8 item = findItemAtPos(xpos, ypos);
if (item != 0xFF) {
if (_itemInHand == -1) {
@@ -689,7 +681,6 @@
}
int KyraEngine_LoK::clickEventHandler(int xpos, int ypos) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::clickEventHandler(%d, %d)", xpos, ypos);
_emc->init(&_scriptClick, &_scriptClickData);
_scriptClick.regs[1] = xpos;
_scriptClick.regs[2] = ypos;
@@ -816,7 +807,6 @@
}
bool KyraEngine_LoK::hasClickedOnExit(int xpos, int ypos) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::hasClickedOnExit(%d, %d)", xpos, ypos);
if (xpos < 16 || xpos >= 304)
return true;
@@ -830,7 +820,6 @@
}
void KyraEngine_LoK::clickEventHandler2() {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::clickEventHandler2()");
Common::Point mouse = getMousePos();
@@ -846,7 +835,6 @@
}
int KyraEngine_LoK::checkForNPCScriptRun(int xpos, int ypos) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::checkForNPCScriptRun(%d, %d)", xpos, ypos);
int returnValue = -1;
const Character *currentChar = _currentCharacter;
int charLeft = 0, charRight = 0, charTop = 0, charBottom = 0;
@@ -895,7 +883,6 @@
}
void KyraEngine_LoK::runNpcScript(int func) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::runNpcScript(%d)", func);
_emc->init(&_npcScript, &_npcScriptData);
_emc->start(&_npcScript, func);
_npcScript.regs[0] = _currentCharacter->sceneId;
@@ -907,7 +894,6 @@
}
void KyraEngine_LoK::checkAmuletAnimFlags() {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::checkSpecialAnimFlags()");
if (_brandonStatusBit & 2) {
seq_makeBrandonNormal2();
Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -365,7 +365,6 @@
}
void KyraEngine_MR::playVQA(const char *name) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::playVQA('%s')", name);
VQAMovie vqa(this, _system);
@@ -406,7 +405,6 @@
#pragma mark -
void KyraEngine_MR::playMenuAudioFile() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::playMenuAudioFile()");
if (_soundDigital->isPlaying(_musicSoundChannel))
return;
@@ -414,7 +412,6 @@
}
void KyraEngine_MR::snd_playWanderScoreViaMap(int track, int force) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::snd_playWanderScoreViaMap(%d, %d)", track, force);
if (_musicSoundChannel != -1 && !_soundDigital->isPlaying(_musicSoundChannel))
force = 1;
@@ -438,7 +435,6 @@
}
void KyraEngine_MR::stopMusicTrack() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::stopMusicTrack()");
if (_musicSoundChannel != -1 && _soundDigital->isPlaying(_musicSoundChannel))
_soundDigital->stopSound(_musicSoundChannel);
@@ -448,7 +444,6 @@
}
int KyraEngine_MR::musicUpdate(int forceRestart) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::musicUpdate(%d)", forceRestart);
static uint32 mTimer = 0;
static uint16 lock = 0;
@@ -475,7 +470,6 @@
}
void KyraEngine_MR::fadeOutMusic(int ticks) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::fadeOutMusic(%d)", ticks);
if (_musicSoundChannel >= 0) {
_fadeOutMusicChannel = _musicSoundChannel;
_soundDigital->beginFadeOut(_musicSoundChannel, ticks);
@@ -484,7 +478,6 @@
}
void KyraEngine_MR::snd_playSoundEffect(int item, int volume) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::snd_playSoundEffect(%d, %d)", item, volume);
if (_sfxFileMap[item*2+0] != 0xFF) {
char filename[16];
assert(_sfxFileMap[item*2+0] < _sfxFileListSize);
@@ -496,12 +489,10 @@
}
void KyraEngine_MR::playVoice(int high, int low) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::playVoice(%d, %d)", high, low);
snd_playVoiceFile(high * 1000 + low);
}
void KyraEngine_MR::snd_playVoiceFile(int file) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::snd_playVoiceFile(%d)", file);
char filename[16];
snprintf(filename, 16, "%.08u", (uint)file);
@@ -510,18 +501,15 @@
}
bool KyraEngine_MR::snd_voiceIsPlaying() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::snd_voiceIsPlaying()");
return _soundDigital->isPlaying(_voiceSoundChannel);
}
void KyraEngine_MR::snd_stopVoice() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::snd_stopVoice()");
if (_voiceSoundChannel != -1)
_soundDigital->stopSound(_voiceSoundChannel);
}
void KyraEngine_MR::playStudioSFX(const char *str) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::playStudioSFX('%s')", str);
if (!_configStudio)
return;
@@ -541,7 +529,6 @@
#pragma mark -
void KyraEngine_MR::preinit() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::preinit()");
_itemBuffer1 = new int8[72];
_itemBuffer2 = new int8[144];
@@ -552,7 +539,6 @@
}
void KyraEngine_MR::initMouseShapes() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::initMouseShapes()");
uint8 *data = _res->fileData("MOUSE.SHP", 0);
assert(data);
for (int i = 0; i <= 6; ++i)
@@ -561,7 +547,6 @@
}
void KyraEngine_MR::startup() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::startup()");
_album.wsa = new WSAMovie_v2(this, _screen);
assert(_album.wsa);
@@ -701,7 +686,6 @@
}
void KyraEngine_MR::loadCostPal() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadCostPal()");
_res->exists("_COSTPAL.DAT", true);
uint32 size = 0;
_costPalBuffer = _res->fileData("_COSTPAL.DAT", &size);
@@ -710,13 +694,11 @@
}
void KyraEngine_MR::loadShadowShape() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadShadowShape()");
_screen->loadBitmap("SHADOW.CSH", 3, 3, 0);
addShapeToPool(_screen->getCPagePtr(3), 421, 0);
}
void KyraEngine_MR::loadExtrasShapes() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadExtrasShapes()");
_screen->loadBitmap("EXTRAS.CSH", 3, 3, 0);
for (int i = 0; i < 20; ++i)
addShapeToPool(_screen->getCPagePtr(3), i+433, i);
@@ -725,21 +707,18 @@
}
void KyraEngine_MR::loadInterfaceShapes() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadInterfaceShapes()");
_screen->loadBitmap("INTRFACE.CSH", 3, 3, 0);
for (int i = 422; i <= 432; ++i)
addShapeToPool(_screen->getCPagePtr(3), i, i-422);
}
void KyraEngine_MR::loadInterface() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadInterface()");
_screen->loadBitmap("INTRFACE.CPS", 3, 3, 0);
memcpy(_interface, _screen->getCPagePtr(3), 17920);
memcpy(_interfaceCommandLine, _screen->getCPagePtr(3), 3840);
}
void KyraEngine_MR::initItems() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::initItems()");
_screen->loadBitmap("ITEMS.CSH", 3, 3, 0);
@@ -765,7 +744,6 @@
}
void KyraEngine_MR::runStartupScript(int script, int unk1) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::runStartupScript(%d, %d)", script, unk1);
EMCState state;
EMCData data;
memset(&state, 0, sizeof(state));
@@ -786,7 +764,6 @@
}
void KyraEngine_MR::openTalkFile(int file) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::openTalkFile(%d)", file);
char talkFilename[16];
if (file == 0) {
@@ -814,7 +791,6 @@
#pragma mark -
void KyraEngine_MR::loadCharacterShapes(int newShapes) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadCharacterShapes(%d)", newShapes);
static const uint8 numberOffset[] = { 3, 3, 4, 4, 3, 3 };
static const uint8 startShape[] = { 0x32, 0x58, 0x78, 0x98, 0xB8, 0xD8 };
static const uint8 endShape[] = { 0x57, 0x77, 0x97, 0xB7, 0xD7, 0xF7 };
@@ -860,7 +836,6 @@
}
void KyraEngine_MR::updateMalcolmShapes() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::updateMalcolmShapes()");
assert(_characterShapeFile >= 0 && _characterShapeFile < _shapeDescsSize);
_malcolmShapeXOffset = _shapeDescs[_characterShapeFile].xOffset;
_malcolmShapeYOffset = _shapeDescs[_characterShapeFile].yOffset;
@@ -875,7 +850,6 @@
}
void KyraEngine_MR::updateCharAnimFrame(int character, int *table) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::updateCharPos(%d, %p)", character, (const void*)table);
++_mainCharacter.animFrame;
int facing = _mainCharacter.facing;
@@ -931,7 +905,6 @@
}
void KyraEngine_MR::updateCharPal(int unk1) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::updateCharPal(%d)", unk1);
int layer = _screen->getLayer(_mainCharacter.x1, _mainCharacter.y1) - 1;
const uint8 *src = _costPalBuffer + _characterShapeFile * 72;
uint8 *dst = _screen->getPalette(0) + 432;
@@ -977,7 +950,6 @@
}
bool KyraEngine_MR::checkCharCollision(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::checkCharCollision(%d, %d)", x, y);
int scale = getScale(_mainCharacter.x1, _mainCharacter.y1);
int width = (scale * 37) >> 8;
@@ -996,7 +968,6 @@
#pragma mark -
void KyraEngine_MR::runLoop() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::runLoop()");
_eventList.clear();
@@ -1035,7 +1006,6 @@
}
void KyraEngine_MR::handleInput(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::handleInput(%d, %d)", x, y);
if (_inventoryState)
return;
setNextIdleAnimTimer();
@@ -1108,7 +1078,6 @@
}
int KyraEngine_MR::inputSceneChange(int x, int y, int unk1, int unk2) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::inputSceneChange(%d, %d, %d, %d)", x, y, unk1, unk2);
uint16 curScene = _mainCharacter.sceneId;
_pathfinderFlag = 15;
@@ -1160,7 +1129,6 @@
}
void KyraEngine_MR::update() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::update()");
updateInput();
musicUpdate(0);
@@ -1176,7 +1144,6 @@
}
void KyraEngine_MR::updateWithText() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::update()");
updateInput();
musicUpdate(0);
@@ -1200,7 +1167,6 @@
}
void KyraEngine_MR::updateMouse() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::updateMouse()");
int shape = 0, offsetX = 0, offsetY = 0;
Common::Point mouse = getMousePos();
bool hasItemCollision = checkItemCollision(mouse.x, mouse.y) != -1;
@@ -1321,7 +1287,6 @@
#pragma mark -
void KyraEngine_MR::makeCharFacingMouse() {
- debugC(9, kDebugLevelAnimator, "KyraEngine_MR::makeCharFacingMouse()");
if (_mainCharacter.x1 > _mouseX)
_mainCharacter.facing = 5;
else
@@ -1334,33 +1299,28 @@
#pragma mark -
int KyraEngine_MR::getDrawLayer(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::getDrawLayer(%d, %d)", x, y);
int layer = _screen->getLayer(x, y) - 1;
layer = _sceneDatLayerTable[layer];
return MAX(0, MIN(layer, 6));
}
int KyraEngine_MR::getScale(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::getScale(%d, %d)", x, y);
return _scaleTable[_screen->getLayer(x, y) - 1];
}
#pragma mark -
void KyraEngine_MR::backUpGfxRect32x32(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::backUpGfxRect32x32(%d, %d)", x, y);
_screen->copyRegionToBuffer(_screen->_curPage, x, y, 32, 32, _gfxBackUpRect);
}
void KyraEngine_MR::restoreGfxRect32x32(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::restoreGfxRect32x32(%d, %d)", x, y);
_screen->copyBlockToPage(_screen->_curPage, x, y, 32, 32, _gfxBackUpRect);
}
#pragma mark -
char *KyraEngine_MR::appendLanguage(char *buf, int lang, int bufSize) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::appendLanguage([%p|'%s'], %d, %d)", (const void*)buf, buf, lang, bufSize);
assert(lang < _languageExtensionSize);
int size = strlen(buf) + strlen(_languageExtension[lang]);
@@ -1379,7 +1339,6 @@
}
int KyraEngine_MR::loadLanguageFile(const char *file, uint8 *&buffer) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadLanguageFile('%s', %p)", file, (const void*)buffer);
delete[] buffer;
buffer = 0;
@@ -1393,7 +1352,6 @@
}
uint8 *KyraEngine_MR::getTableEntry(uint8 *buffer, int id) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::getTableEntry(%p, %d)", (const void*)buffer, id);
uint16 tableEntries = READ_LE_UINT16(buffer);
const uint16 *indexTable = (const uint16*)(buffer + 2);
const uint16 *offsetTable = indexTable + tableEntries;
@@ -1408,7 +1366,6 @@
}
void KyraEngine_MR::getTableEntry(Common::SeekableReadStream *stream, int id, char *dst) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::getTableEntry(%p, %d, %p)", (const void*)stream, id, (const void*)dst);
stream->seek(0, SEEK_SET);
uint16 tableEntries = stream->readUint16LE();
@@ -1427,7 +1384,6 @@
#pragma mark -
bool KyraEngine_MR::talkObjectsInCurScene() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::talkObjectsInCurScene()");
for (int i = 0; i < 88; ++i) {
if (_talkObjectList[i].sceneId == _mainCharacter.sceneId)
@@ -1440,7 +1396,6 @@
#pragma mark -
bool KyraEngine_MR::updateScore(int scoreId, int strId) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::updateScore(%d, %d)", scoreId, strId);
int scoreIndex = (scoreId >> 3);
int scoreBit = scoreId & 7;
@@ -1466,7 +1421,6 @@
}
void KyraEngine_MR::scoreIncrease(int count, const char *str) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::scoreIncrease(%d, '%s')", count, str);
int drawOld = 1;
_screen->hideMouse();
@@ -1498,7 +1452,6 @@
#pragma mark -
void KyraEngine_MR::changeChapter(int newChapter, int sceneId, int malcolmShapes, int facing) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::changeChapter(%d, %d, %d, %d)", newChapter, sceneId, malcolmShapes, facing);
resetItemList();
_currentChapter = newChapter;
@@ -1534,7 +1487,6 @@
#pragma mark -
void KyraEngine_MR::registerDefaultSettings() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::registerDefaultSettings()");
KyraEngine_v1::registerDefaultSettings();
// Most settings already have sensible defaults. This one, however, is
@@ -1546,7 +1498,6 @@
}
void KyraEngine_MR::writeSettings() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::writeSettings()");
switch (_lang) {
case 1:
_flags.lang = Common::FR_FRA;
@@ -1575,7 +1526,6 @@
}
void KyraEngine_MR::readSettings() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::readSettings()");
KyraEngine_v1::readSettings();
_configStudio = ConfMan.getBool("studio_audience");
Modified: scummvm/trunk/engines/kyra/kyra_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/kyra_v1.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -226,7 +226,6 @@
}
int KyraEngine_v1::checkInput(Button *buttonList, bool mainLoop) {
- debugC(9, kDebugLevelMain, "KyraEngine_v1::checkInput(%p, %d)", (const void*)buttonList, mainLoop);
_isSaveAllowed = mainLoop;
updateInput();
_isSaveAllowed = false;
Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -144,7 +144,6 @@
}
void KyraEngine_v2::delay(uint32 amount, bool updateGame, bool isMainLoop) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::delay(%u, %d, %d)", amount, updateGame, isMainLoop);
uint32 start = _system->getMillis();
do {
@@ -170,13 +169,11 @@
}
void KyraEngine_v2::addShapeToPool(const uint8 *data, int realIndex, int shape) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::addShapeToPool(%p, %d, %d)", data, realIndex, shape);
remShapeFromPool(realIndex);
_gameShapes[realIndex] = screen_v2()->makeShapeCopy(data, shape);
}
void KyraEngine_v2::addShapeToPool(uint8 *shpData, int index) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::addShapeToPool(%p, %d)", shpData, index);
remShapeFromPool(index);
_gameShapes[index] = shpData;
}
@@ -190,7 +187,6 @@
}
uint8 *KyraEngine_v2::getShapePtr(int shape) const {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::getShapePtr(%d)", shape);
ShapeMap::iterator iter = _gameShapes.find(shape);
if (iter == _gameShapes.end())
return 0;
@@ -198,7 +194,6 @@
}
void KyraEngine_v2::moveCharacter(int facing, int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::moveCharacter(%d, %d, %d)", facing, x, y);
x &= ~3;
y &= ~1;
_mainCharacter.facing = facing;
@@ -233,13 +228,11 @@
}
void KyraEngine_v2::updateCharPosWithUpdate() {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::updateCharPosWithUpdate()");
updateCharPos(0, 0);
update();
}
int KyraEngine_v2::updateCharPos(int *table, int force) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::updateCharPos(%p, %d)", (const void*)table, force);
if (_updateCharPosNextUpdate > _system->getMillis() && !force)
return 0;
_mainCharacter.x1 += _charAddXPosTable[_mainCharacter.facing];
Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/lol.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -598,7 +598,6 @@
#pragma mark - Initialization
void LoLEngine::preInit() {
- debugC(9, kDebugLevelMain, "LoLEngine::preInit()");
_res->loadPakFile("GENERAL.PAK");
if (_flags.isTalkie)
@@ -619,7 +618,6 @@
}
void LoLEngine::loadItemIconShapes() {
- debugC(9, kDebugLevelMain, "LoLEngine::loadItemIconShapes()");
if (_itemIconShapes) {
for (int i = 0; i < _numItemIconShapes; i++)
@@ -687,7 +685,6 @@
}
int LoLEngine::mainMenu() {
- debugC(9, kDebugLevelMain, "LoLEngine::mainMenu()");
bool hasSave = saveFileLoadable(0);
@@ -925,7 +922,6 @@
#pragma mark - Localization
char *LoLEngine::getLangString(uint16 id) {
- debugC(9, kDebugLevelMain, "LoLEngine::getLangString(0x%.04X)", id);
if (id == 0xFFFF)
return 0;
@@ -958,7 +954,6 @@
}
uint8 *LoLEngine::getTableEntry(uint8 *buffer, uint16 id) {
- debugC(9, kDebugLevelMain, "LoLEngine::getTableEntry(%p, %d)", (const void *)buffer, id);
if (!buffer)
return 0;
@@ -1803,7 +1798,6 @@
}
void LoLEngine::snd_playSoundEffect(int track, int volume) {
- debugC(9, kDebugLevelMain | kDebugLevelSound, "LoLEngine::snd_playSoundEffect(%d, %d)", track, volume);
if (track == 1 && (_lastSfxTrack == -1 || _lastSfxTrack == 1))
return;
Modified: scummvm/trunk/engines/kyra/saveload.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/saveload.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -127,7 +127,6 @@
}
Common::SeekableReadStream *KyraEngine_v1::openSaveForReading(const char *filename, SaveHeader &header) {
- debugC(9, kDebugLevelMain, "KyraEngine_v1::openSaveForReading('%s', -)", filename);
Common::SeekableReadStream *in = 0;
if (!(in = _saveFileMan->openForLoading(filename)))
@@ -178,7 +177,6 @@
}
Common::WriteStream *KyraEngine_v1::openSaveForWriting(const char *filename, const char *saveName, const Graphics::Surface *thumbnail) const {
- debugC(9, kDebugLevelMain, "KyraEngine_v1::openSaveForWriting('%s', '%s', %p)", filename, saveName, (const void *)thumbnail);
if (shouldQuit())
return 0;
Modified: scummvm/trunk/engines/kyra/saveload_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_hof.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/saveload_hof.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -36,7 +36,6 @@
namespace Kyra {
Common::Error KyraEngine_HoF::saveGameState(int slot, const char *saveName, const Graphics::Surface *thumb) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::saveGame(%d, '%s', %p)", slot, saveName, (const void *)thumb);
const char *fileName = getSavegameFilename(slot);
@@ -130,7 +129,6 @@
}
Common::Error KyraEngine_HoF::loadGameState(int slot) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::loadGame(%d)", slot);
const char *fileName = getSavegameFilename(slot);
Modified: scummvm/trunk/engines/kyra/saveload_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_lok.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/saveload_lok.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -37,7 +37,6 @@
namespace Kyra {
Common::Error KyraEngine_LoK::loadGameState(int slot) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::loadGame(%d)", slot);
const char *fileName = getSavegameFilename(slot);
@@ -220,7 +219,6 @@
}
Common::Error KyraEngine_LoK::saveGameState(int slot, const char *saveName, const Graphics::Surface *thumb) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::saveGame(%d, '%s', %p)", slot, saveName, (const void *)thumb);
const char *fileName = getSavegameFilename(slot);
Modified: scummvm/trunk/engines/kyra/saveload_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_lol.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/saveload_lol.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -36,7 +36,6 @@
namespace Kyra {
Common::Error LoLEngine::loadGameState(int slot) {
- debugC(9, kDebugLevelMain, "LoLEngine::loadGameState(%d)", slot);
const uint16 *cdf[] = { _charDefsMan, _charDefsWoman, _charDefsKieran, _charDefsMan, _charDefsAkshel };
@@ -251,7 +250,6 @@
}
Common::Error LoLEngine::saveGameState(int slot, const char *saveName, const Graphics::Surface *thumbnail) {
- debugC(9, kDebugLevelMain, "LoLEngine::saveGameState(%d, '%s', %p)", slot, saveName, (const void *)thumbnail);
const char *fileName = getSavegameFilename(slot);
Modified: scummvm/trunk/engines/kyra/saveload_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_mr.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/saveload_mr.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -33,7 +33,6 @@
namespace Kyra {
Common::Error KyraEngine_MR::saveGameState(int slot, const char *saveName, const Graphics::Surface *thumb) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::saveGame(%d, '%s', %p)", slot, saveName, (const void *)thumb);
const char *fileName = getSavegameFilename(slot);
@@ -124,7 +123,6 @@
}
Common::Error KyraEngine_MR::loadGameState(int slot) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadGame(%d)", slot);
const char *fileName = getSavegameFilename(slot);
Modified: scummvm/trunk/engines/kyra/scene_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_hof.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/scene_hof.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -34,7 +34,6 @@
namespace Kyra {
void KyraEngine_HoF::enterNewScene(uint16 newScene, int facing, int unk1, int unk2, int unk3) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::enterNewScene(%d, %d, %d, %d, %d)", newScene, facing, unk1, unk2, unk3);
if (_newChapterFile != _currentTalkFile) {
_currentTalkFile = _newChapterFile;
if (_flags.isTalkie) {
@@ -148,7 +147,6 @@
}
void KyraEngine_HoF::enterNewSceneUnk1(int facing, int unk1, int unk2) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::enterNewSceneUnk1(%d, %d, %d)", facing, unk1, unk2);
int x = 0, y = 0;
int x2 = 0, y2 = 0;
bool needProc = true;
@@ -244,7 +242,6 @@
}
void KyraEngine_HoF::enterNewSceneUnk2(int unk1) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::enterNewSceneUnk2(%d)", unk1);
_unk3 = -1;
if (_flags.isTalkie) {
@@ -273,7 +270,6 @@
}
int KyraEngine_HoF::trySceneChange(int *moveTable, int unk1, int updateChar) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::trySceneChange(%p, %d, %d)", (const void*)moveTable, unk1, updateChar);
bool running = true;
bool unkFlag = false;
int8 updateType = -1;
@@ -342,7 +338,6 @@
}
int KyraEngine_HoF::checkSceneChange() {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::checkSceneChange()");
SceneDesc &curScene = _sceneList[_mainCharacter.sceneId];
int charX = _mainCharacter.x1, charY = _mainCharacter.y1;
int facing = 0;
@@ -396,14 +391,12 @@
}
void KyraEngine_HoF::unloadScene() {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::unloadScene()");
_emc->unload(&_sceneScriptData);
freeSceneShapePtrs();
freeSceneAnims();
}
void KyraEngine_HoF::loadScenePal() {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::loadScenePal()");
uint16 sceneId = _mainCharacter.sceneId;
memcpy(_screen->getPalette(1), _screen->getPalette(0), 768);
@@ -417,7 +410,6 @@
}
void KyraEngine_HoF::loadSceneMsc() {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::loadSceneMsc()");
uint16 sceneId = _mainCharacter.sceneId;
char filename[14];
strcpy(filename, _sceneList[sceneId].filename1);
@@ -426,7 +418,6 @@
}
void KyraEngine_HoF::startSceneScript(int unk1) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::startSceneScript(%d)", unk1);
uint16 sceneId = _mainCharacter.sceneId;
char filename[14];
@@ -487,7 +478,6 @@
}
void KyraEngine_HoF::runSceneScript2() {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::runSceneScript2()");
_emc->init(&_sceneScriptState, &_sceneScriptData);
_sceneScriptState.regs[4] = _itemInHand;
_emc->start(&_sceneScriptState, 2);
@@ -497,7 +487,6 @@
}
void KyraEngine_HoF::runSceneScript4(int unk1) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::runSceneScript4(%d)", unk1);
_sceneScriptState.regs[4] = _itemInHand;
_sceneScriptState.regs[5] = unk1;
@@ -507,7 +496,6 @@
}
void KyraEngine_HoF::runSceneScript7() {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::runSceneScript7()");
int oldPage = _screen->_curPage;
_screen->_curPage = 2;
@@ -519,7 +507,6 @@
}
void KyraEngine_HoF::initSceneAnims(int unk1) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::initSceneAnims(%d)", unk1);
for (int i = 0; i < 41; ++i)
_animObjects[i].enabled = 0;
@@ -678,7 +665,6 @@
}
void KyraEngine_HoF::initSceneScreen(int unk1) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::initSceneScreen(%d)", unk1);
if (_unkSceneScreenFlag1) {
_screen->copyRegion(0, 0, 0, 0, 320, 144, 2, 0, Screen::CR_NO_P_CHECK);
return;
@@ -705,14 +691,12 @@
}
void KyraEngine_HoF::freeSceneShapePtrs() {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::freeSceneShapePtrs()");
for (int i = 0; i < ARRAYSIZE(_sceneShapeTable); ++i)
delete[] _sceneShapeTable[i];
memset(_sceneShapeTable, 0, sizeof(_sceneShapeTable));
}
void KyraEngine_HoF::fadeScenePal(int srcIndex, int delayTime) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::fadeScenePal(%d, %d)", srcIndex, delayTime);
uint8 *dst = _screen->getPalette(0) + 336;
const uint8 *src = _scenePal + (srcIndex << 4)*3;
memcpy(dst, src, 48);
@@ -725,7 +709,6 @@
#pragma mark -
bool KyraEngine_HoF::lineIsPassable(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_HoF::lineIsPassable(%d, %d)", x, y);
static const int widthTable[] = { 1, 1, 1, 1, 1, 2, 4, 6, 8 };
if (_pathfinderFlag & 2) {
Modified: scummvm/trunk/engines/kyra/scene_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lok.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/scene_lok.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -41,7 +41,6 @@
namespace Kyra {
void KyraEngine_LoK::enterNewScene(int sceneId, int facing, int unk1, int unk2, int brandonAlive) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::enterNewScene(%d, %d, %d, %d, %d)", sceneId, facing, unk1, unk2, brandonAlive);
int unkVar1 = 1;
_screen->hideMouse();
@@ -193,7 +192,6 @@
}
void KyraEngine_LoK::transcendScenes(int roomIndex, int roomName) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::transcendScenes(%d, %d)", roomIndex, roomName);
assert(roomIndex < _roomTableSize);
if (_flags.isTalkie) {
@@ -219,13 +217,11 @@
}
void KyraEngine_LoK::setSceneFile(int roomIndex, int roomName) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::setSceneFile(%d, %d)", roomIndex, roomName);
assert(roomIndex < _roomTableSize);
_roomTable[roomIndex].nameIndex = roomName;
}
void KyraEngine_LoK::moveCharacterToPos(int character, int facing, int xpos, int ypos) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::moveCharacterToPos(%d, %d, %d, %d)", character, facing, xpos, ypos);
Character *ch = &_characterList[character];
ch->facing = facing;
_screen->hideMouse();
@@ -280,7 +276,6 @@
}
void KyraEngine_LoK::setCharacterPositionWithUpdate(int character) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::setCharacterPositionWithUpdate(%d)", character);
setCharacterPosition(character, 0);
_sprites->updateSceneAnims();
_timer->update();
@@ -292,7 +287,6 @@
}
int KyraEngine_LoK::setCharacterPosition(int character, int *facingTable) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::setCharacterPosition(%d, %p)", character, (const void *)facingTable);
if (character == 0) {
_currentCharacter->x1 += _charAddXPosTable[_currentCharacter->facing];
@@ -309,7 +303,6 @@
}
void KyraEngine_LoK::setCharacterPositionHelper(int character, int *facingTable) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::setCharacterPositionHelper(%d, %p)", character, (const void *)facingTable);
Character *ch = &_characterList[character];
++ch->currentAnimFrame;
int facing = ch->facing;
@@ -405,7 +398,6 @@
}
void KyraEngine_LoK::startSceneScript(int brandonAlive) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::startSceneScript(%d)", brandonAlive);
assert(_currentCharacter->sceneId < _roomTableSize);
int tableId = _roomTable[_currentCharacter->sceneId].nameIndex;
assert(tableId < _roomFilenameTableSize);
@@ -439,7 +431,6 @@
}
void KyraEngine_LoK::initSceneData(int facing, int unk1, int brandonAlive) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::initSceneData(%d, %d, %d)", facing, unk1, brandonAlive);
int16 xpos2 = 0;
int setFacing = 1;
@@ -609,7 +600,6 @@
}
void KyraEngine_LoK::initSceneObjectList(int brandonAlive) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::initSceneObjectList(%d)", brandonAlive);
for (int i = 0; i < 28; ++i)
_animator->actors()[i].active = 0;
@@ -850,7 +840,6 @@
}
int KyraEngine_LoK::handleSceneChange(int xpos, int ypos, int unk1, int frameReset) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::handleSceneChange(%d, %d, %d, %d)", xpos, ypos, unk1, frameReset);
if (queryGameFlag(0xEF))
unk1 = 0;
@@ -910,7 +899,6 @@
}
int KyraEngine_LoK::processSceneChange(int *table, int unk1, int frameReset) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::processSceneChange(%p, %d, %d)", (const void *)table, unk1, frameReset);
if (queryGameFlag(0xEF))
unk1 = 0;
@@ -992,7 +980,6 @@
}
int KyraEngine_LoK::changeScene(int facing) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::changeScene(%d)", facing);
if (queryGameFlag(0xEF)) {
if (_currentCharacter->sceneId == 5)
return 0;
@@ -1154,7 +1141,6 @@
#pragma mark -
int KyraEngine_LoK::findWay(int x, int y, int toX, int toY, int *moveTable, int moveTableSize) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::findWay(%d, %d, %d, %d, %p, %d)", x, y, toX, toY, (const void *)moveTable, moveTableSize);
int ret = KyraEngine_v1::findWay(x, y, toX, toY, moveTable, moveTableSize);
if (ret == 0x7D00)
return 0;
@@ -1162,7 +1148,6 @@
}
bool KyraEngine_LoK::lineIsPassable(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::lineIsPassable(%d, %d)", x, y);
if (queryGameFlag(0xEF)) {
if (_currentCharacter->sceneId == 5)
return true;
@@ -1223,7 +1208,6 @@
#pragma mark -
void KyraEngine_LoK::setupSceneResource(int sceneId) {
- debugC(9, kDebugLevelMain, "KyraEngine_LoK::setupSceneResource(%d)", sceneId);
if (!_flags.isTalkie)
return;
Modified: scummvm/trunk/engines/kyra/scene_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_mr.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/scene_mr.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -32,7 +32,6 @@
namespace Kyra {
void KyraEngine_MR::enterNewScene(uint16 sceneId, int facing, int unk1, int unk2, int unk3) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::enterNewScene('%d, %d, %d, %d, %d)", sceneId, facing, unk1, unk2, unk3);
++_enterNewSceneLock;
_screen->hideMouse();
@@ -196,7 +195,6 @@
}
void KyraEngine_MR::enterNewSceneUnk1(int facing, int unk1, int unk2) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::enterNewSceneUnk1(%d, %d, %d)", facing, unk1, unk2);
int x = 0, y = 0;
int x2 = 0, y2 = 0;
bool needProc = true;
@@ -294,7 +292,6 @@
}
void KyraEngine_MR::enterNewSceneUnk2(int unk1) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::enterNewSceneUnk2(%d)", unk1);
_unk3 = -1;
if (_mainCharX == -1 && _mainCharY == -1 && !unk1) {
_mainCharacter.animFrame = _characterFrameTable[_mainCharacter.facing];
@@ -312,7 +309,6 @@
}
void KyraEngine_MR::unloadScene() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::unloadScene()");
delete[] _sceneStrings;
_sceneStrings = 0;
musicUpdate(0);
@@ -325,7 +321,6 @@
}
void KyraEngine_MR::freeSceneShapes() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::freeSceneShapes()");
for (uint i = 0; i < ARRAYSIZE(_sceneShapes); ++i) {
delete[] _sceneShapes[i];
_sceneShapes[i] = 0;
@@ -333,7 +328,6 @@
}
void KyraEngine_MR::loadScenePal() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadScenePal()");
char filename[16];
memcpy(_screen->getPalette(2), _screen->getPalette(0), 768);
strcpy(filename, _sceneList[_mainCharacter.sceneId].filename1);
@@ -357,7 +351,6 @@
}
void KyraEngine_MR::loadSceneMsc() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::loadSceneMsc()");
char filename[16];
strcpy(filename, _sceneList[_mainCharacter.sceneId].filename1);
strcat(filename, ".MSC");
@@ -390,7 +383,6 @@
}
void KyraEngine_MR::initSceneScript(int unk1) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::initSceneScript(%d)", unk1);
const SceneDesc &scene = _sceneList[_mainCharacter.sceneId];
musicUpdate(0);
@@ -495,7 +487,6 @@
}
void KyraEngine_MR::initSceneAnims(int unk1) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::initSceneAnims(%d)", unk1);
for (int i = 0; i < 67; ++i)
_animObjects[i].enabled = false;
@@ -611,7 +602,6 @@
}
void KyraEngine_MR::initSceneScreen(int unk1) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::initSceneScreen(%d)", unk1);
_screen->copyBlockToPage(2, 0, 188, 320, 12, _interfaceCommandLine);
if (_unkSceneScreenFlag1) {
@@ -649,7 +639,6 @@
}
int KyraEngine_MR::trySceneChange(int *moveTable, int unk1, int updateChar) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::trySceneChange(%p, %d, %d)", (const void*)moveTable, unk1, updateChar);
bool running = true;
bool unkFlag = false;
int changedScene = 0;
@@ -709,7 +698,6 @@
}
int KyraEngine_MR::checkSceneChange() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::checkSceneChange()");
const SceneDesc &curScene = _sceneList[_mainCharacter.sceneId];
int charX = _mainCharacter.x1, charY = _mainCharacter.y1;
int facing = 0;
@@ -762,7 +750,6 @@
return 1;
}
int KyraEngine_MR::runSceneScript1(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::runSceneScript1(%d, %d)", x, y);
if (y > 187 && _unk3 > -4)
return 0;
if (_deathHandler >= 0)
@@ -782,7 +769,6 @@
}
int KyraEngine_MR::runSceneScript2() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::runSceneScript2()");
_sceneScriptState.regs[1] = _mouseX;
_sceneScriptState.regs[2] = _mouseY;
_sceneScriptState.regs[3] = 0;
@@ -796,7 +782,6 @@
}
void KyraEngine_MR::runSceneScript4(int unk1) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::runSceneScript4(%d)", unk1);
_sceneScriptState.regs[4] = _itemInHand;
_sceneScriptState.regs[5] = unk1;
_sceneScriptState.regs[3] = 0;
@@ -811,7 +796,6 @@
}
void KyraEngine_MR::runSceneScript8() {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::runSceneScript8()");
_emc->start(&_sceneScriptState, 8);
while (_emc->isValid(&_sceneScriptState)) {
musicUpdate(0);
@@ -820,7 +804,6 @@
}
bool KyraEngine_MR::lineIsPassable(int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_MR::lineIsPassable(%d, %d)", x, y);
static const uint8 widthTable[] = { 1, 1, 1, 1, 1, 2, 4, 6, 8 };
if ((_pathfinderFlag & 2) && x >= 320)
Modified: scummvm/trunk/engines/kyra/scene_v1.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_v1.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/scene_v1.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -29,7 +29,6 @@
namespace Kyra {
int KyraEngine_v1::findWay(int x, int y, int toX, int toY, int *moveTable, int moveTableSize) {
- debugC(9, kDebugLevelMain, "KyraEngine_v1::findWay(%d, %d, %d, %d, %p, %d)", x, y, toX, toY, (const void *)moveTable, moveTableSize);
x &= 0xFFFC; toX &= 0xFFFC;
y &= 0xFFFE; toY &= 0xFFFE;
x = (int16)x; y = (int16)y; toX = (int16)toX; toY = (int16)toY;
@@ -144,7 +143,6 @@
}
int KyraEngine_v1::findSubPath(int x, int y, int toX, int toY, int *moveTable, int start, int end) {
- debugC(9, kDebugLevelMain, "KyraEngine_v1::findSubPath(%d, %d, %d, %d, %p, %d, %d)", x, y, toX, toY, (const void *)moveTable, start, end);
// only used for debug specific code
//static uint16 unkTable[] = { 8, 5 };
static const int8 facingTable1[] = { 7, 0, 1, 2, 3, 4, 5, 6, 1, 2, 3, 4, 5, 6, 7, 0 };
@@ -213,7 +211,6 @@
}
int KyraEngine_v1::getFacingFromPointToPoint(int x, int y, int toX, int toY) {
- debugC(9, kDebugLevelMain, "KyraEngine_v1::getFacingFromPointToPoint(%d, %d, %d, %d)", x, y, toX, toY);
static const int facingTable[] = {
1, 0, 1, 2, 3, 4, 3, 2, 7, 0, 7, 6, 5, 4, 5, 6
};
@@ -257,7 +254,6 @@
int KyraEngine_v1::getOppositeFacingDirection(int dir) {
- debugC(9, kDebugLevelMain, "KyraEngine_v1::getOppositeFacingDirection(%d)", dir);
switch (dir) {
case 0:
return 2;
@@ -280,13 +276,11 @@
}
void KyraEngine_v1::changePosTowardsFacing(int &x, int &y, int facing) {
- debugC(9, kDebugLevelMain, "KyraEngine_v1::changePosTowardsFacing(%d, %d, %d)", x, y, facing);
x += _addXPosTable[facing];
y += _addYPosTable[facing];
}
int KyraEngine_v1::getMoveTableSize(int *moveTable) {
- debugC(9, kDebugLevelMain, "KyraEngine_v1::getMoveTableSize(%p)", (const void *)moveTable);
int retValue = 0;
if (moveTable[0] == 8)
return 0;
Modified: scummvm/trunk/engines/kyra/scene_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_v2.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/scene_v2.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -29,7 +29,6 @@
namespace Kyra {
void KyraEngine_v2::freeSceneAnims() {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::freeSceneAnims()");
for (int i = 0; i < ARRAYSIZE(_sceneAnims); ++i)
_sceneAnims[i].flags = 0;
@@ -41,7 +40,6 @@
}
void KyraEngine_v2::updateSpecialSceneScripts() {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::updateSpecialSceneScripts()");
uint32 nextTime = _system->getMillis() + _tickLength;
const int startScript = _lastProcessedSceneScript;
@@ -71,7 +69,6 @@
}
void KyraEngine_v2::runSceneScript6() {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::runSceneScript6()");
_emc->init(&_sceneScriptState, &_sceneScriptData);
_sceneScriptState.regs[0] = _mainCharacter.sceneId;
@@ -87,7 +84,6 @@
#pragma mark - pathfinder
int KyraEngine_v2::findWay(int x, int y, int toX, int toY, int *moveTable, int moveTableSize) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::findWay(%d, %d, %d, %d, %p, %d)", x, y, toX, toY, (const void *)moveTable, moveTableSize);
x &= ~3; toX &= ~3;
y &= ~1; toY &= ~1;
int size = KyraEngine_v1::findWay(x, y, toX, toY, moveTable, moveTableSize);
@@ -103,7 +99,6 @@
}
bool KyraEngine_v2::directLinePassable(int x, int y, int toX, int toY) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::directLinePassable(%d, %d, %d, %d)", x, y, toX, toY);
Screen *scr = screen();
while (x != toX || y != toY) {
@@ -118,7 +113,6 @@
}
int KyraEngine_v2::pathfinderInitPositionTable(int *moveTable) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::pathfinderInitPositionTable(%p)", (const void*)moveTable);
bool breakLoop = false;
int *moveTableCur = moveTable;
int oldEntry = *moveTableCur, curEntry = *moveTableCur;
@@ -169,7 +163,6 @@
}
int KyraEngine_v2::pathfinderAddToPositionTable(int index, int v1, int v2) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::pathfinderAddToPositionTable(%d, %d, %d)", index, v1, v2);
_pathfinderPositionTable[index<<1] = v1;
_pathfinderPositionTable[(index<<1)+1] = v2;
++index;
@@ -179,7 +172,6 @@
}
int KyraEngine_v2::pathfinderInitPositionIndexTable(int tableLen, int x, int y) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::pathfinderInitPositionIndexTable(%d, %d, %d)", tableLen, x, y);
int x1 = 0, y1 = 0;
int x2 = 0, y2 = 0;
int lastEntry = 0;
@@ -208,7 +200,6 @@
}
int KyraEngine_v2::pathfinderAddToPositionIndexTable(int index, int v) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::pathfinderAddToPositionIndexTable(%d, %d)", index, v);
_pathfinderPositionIndexTable[index] = v;
++index;
if (index >= 199)
@@ -217,7 +208,6 @@
}
void KyraEngine_v2::pathfinderFinializePath(int *moveTable, int tableLen, int x, int y, int moveTableSize) {
- debugC(9, kDebugLevelMain, "KyraEngine_v2::pathfinderFinializePath(%p, %d, %d, %d, %d)", (void *)moveTable, tableLen, x, y, moveTableSize);
int x1 = 0, y1 = 0;
int x2 = 0, y2 = 0;
int index1 = 0, index2 = 0;
Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp 2009-05-19 00:34:10 UTC (rev 40714)
+++ scummvm/trunk/engines/kyra/screen.cpp 2009-05-19 01:13:29 UTC (rev 40715)
@@ -66,7 +66,6 @@
}
bool Screen::init() {
- debugC(9, kDebugLevelScreen, "Screen::init()");
_disableScreen = false;
_debugEnabled = false;
@@ -207,7 +206,6 @@
}
void Screen::updateScreen() {
- debugC(9, kDebugLevelScreen, "Screen::updateScreen()");
if (_disableScreen)
return;
@@ -303,19 +301,16 @@
}
uint8 *Screen::getPagePtr(int pageNum) {
- debugC(9, kDebugLevelScreen, "Screen::getPagePtr(%d)", pageNum);
assert(pageNum < SCREEN_PAGE_NUM);
return _pagePtrs[pageNum];
}
const uint8 *Screen::getCPagePtr(int pageNum) const {
- debugC(9, kDebugLevelScreen, "Screen::getCPagePtr(%d)", pageNum);
assert(pageNum < SCREEN_PAGE_NUM);
return _pagePtrs[pageNum];
}
uint8 *Screen::getPageRect(int pageNum, int x, int y, int w, int h) {
- debugC(9, kDebugLevelScreen, "Screen::getPageRect(%d, %d, %d, %d, %d)", pageNum, x, y, w, h);
assert(pageNum < SCREEN_PAGE_NUM);
if (pageNum == 0 || pageNum == 1)
addDirtyRect(x, y, w, h);
@@ -323,7 +318,6 @@
}
void Screen::clearPage(int pageNum) {
- debugC(9, kDebugLevelScreen, "Screen::clearPage(%d)", pageNum);
assert(pageNum < SCREEN_PAGE_NUM);
if (pageNum == 0 || pageNum == 1)
_forceFullUpdate = true;
@@ -332,7 +326,6 @@
}
int Screen::setCurPage(int pageNum) {
- debugC(9, kDebugLevelScreen, "Screen::setCurPage(%d)", pageNum);
assert(pageNum < SCREEN_PAGE_NUM);
int previousPage = _curPage;
_curPage = pageNum;
@@ -340,7 +333,6 @@
}
void Screen::clearCurPage() {
- debugC(9, kDebugLevelScreen, "Screen::clearCurPage()");
if (_curPage == 0 || _curPage == 1)
_forceFullUpdate = true;
memset(getPagePtr(_curPage), 0, SCREEN_PAGE_SIZE);
@@ -348,14 +340,12 @@
}
uint8 Screen::getPagePixel(int pageNum, int x, int y) {
- debugC(9, kDebugLevelScreen, "Screen::getPagePixel(%d, %d, %d)", pageNum, x, y);
assert(pageNum < SCREEN_PAGE_NUM);
assert(x >= 0 && x < SCREEN_W && y >= 0 && y < SCREEN_H);
return _pagePtrs[pageNum][y * SCREEN_W + x];
}
void Screen::setPagePixel(int pageNum, int x, int y, uint8 color) {
- debugC(9, kDebugLevelScreen, "Screen::setPagePixel(%d, %d, %d, %d)", pageNum, x, y, color);
assert(pageNum < SCREEN_PAGE_NUM);
assert(x >= 0 && x < SCREEN_W && y >= 0 && y < SCREEN_H);
if (pageNum == 0 || pageNum == 1)
@@ -364,19 +354,16 @@
}
void Screen::fadeFromBlack(int delay, const UpdateFunctor *upFunc) {
- debugC(9, kDebugLevelScreen, "Screen::fadeFromBlack(%d, %p)", delay, (const void*)upFunc);
fadePalette(_currentPalette, delay, upFunc);
}
void Screen::fadeToBlack(int delay, const UpdateFunctor *upFunc) {
- debugC(9, kDebugLevelScreen, "Screen::fadeToBlack(%d, %p)", delay, (const void*)upFunc);
uint8 blackPal[768];
memset(blackPal, 0, 768);
fadePalette(blackPal, delay, upFunc);
}
void Screen::fadePalette(const uint8 *palData, int delay, const UpdateFunctor *upFunc) {
- debugC(9, kDebugLevelScreen, "Screen::fadePalette(%p, %d, %p)", (const void *)palData, delay, (const void*)upFunc);
updateScreen();
int diff = 0, delayInc = 0;
@@ -410,7 +397,6 @@
}
void Screen::getFadeParams(const uint8 *palette, int delay, int &delayInc, int &diff) {
- debugC(9, kDebugLevelScreen, "Screen::getFadeParams(%p, %d, %p, %p)", (const void *)palette, delay, (const void *)&delayInc, (const void *)&diff);
uint8 maxDiff = 0;
const int colors = (_vm->gameFlags().platform == Common::kPlatformAmiga ? 32 : 256) * 3;
@@ -432,7 +418,6 @@
}
int Screen::fadePalStep(const uint8 *palette, int diff) {
- debugC(9, kDebugLevelScreen, "Screen::fadePalStep(%p, %d)", (const void *)palette, diff);
const int colors = (_vm->gameFlags().platform == Common::kPlatformAmiga ? 32 : (_use16ColorMode ? 16 : 256)) * 3;
@@ -469,7 +454,6 @@
}
void Screen::setPaletteIndex(uint8 index, uint8 red, uint8 green, uint8 blue) {
- debugC(9, kDebugLevelScreen, "Screen::setPaletteIndex(%u, %u, %u, %u)", index, red, green, blue);
_currentPalette[index * 3 + 0] = red;
_currentPalette[index * 3 + 1] = green;
_currentPalette[index * 3 + 2] = blue;
@@ -477,7 +461,6 @@
}
void Screen::getRealPalette(int num, uint8 *dst) {
- debugC(9, kDebugLevelScreen, "Screen::getRealPalette(%d, %p)", num, (const void *)dst);
const int colors = (_vm->gameFlags().platform == Common::kPlatformAmiga ? 32 : 256);
const uint8 *palData = getPalette(num);
@@ -496,7 +479,6 @@
}
void Screen::setScreenPalette(const uint8 *palData) {
- debugC(9, kDebugLevelScreen, "Screen::setScreenPalette(%p)", (const void *)palData);
const int colors = (_vm->gameFlags().platform == Common::kPlatformAmiga ? 32 : 256);
@@ -532,7 +514,6 @@
}
void Screen::copyToPage0(int y, int h, uint8 page, uint8 *seqBuf) {
- debugC(9, kDebugLevelScreen, "Screen::copyToPage0(%d, %d, %d, %p)", y, h, page, (const void *)seqBuf);
assert(y + h <= SCREEN_H);
const uint8 *src = getPagePtr(page) + y * SCREEN_W;
uint8 *dstPage = getPagePtr(0) + y * SCREEN_W;
@@ -557,7 +538,6 @@
}
void Screen::copyRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage, int flags) {
- debugC(9, kDebugLevelScreen, "Screen::copyRegion(%d, %d, %d, %d, %d, %d, %d, %d, %d)", x1, y1, x2, y2, w, h, srcPage, dstPage, flags);
if (x2 < 0) {
if (x2 <= -w)
@@ -610,7 +590,6 @@
}
void Screen::copyRegionToBuffer(int pageNum, int x, int y, int w, int h, uint8 *dest) {
- debugC(9, kDebugLevelScreen, "Screen::copyRegionToBuffer(%d, %d, %d, %d, %d)", pageNum, x, y, w, h);
if (y < 0) {
dest += (-y) * w;
h += y;
@@ -637,7 +616,6 @@
}
void Screen::copyPage(uint8 srcPage, uint8 dstPage) {
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list