[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.150,1.151 events.cpp,1.53,1.54 font.cpp,1.28,1.29 game.cpp,1.71,1.72 gfx.cpp,1.50,1.51 ite_introproc.cpp,1.55,1.56 palanim.cpp,1.22,1.23 saga.cpp,1.117,1.118 scene.cpp,1.114,1.115 script.cpp,1.69,1.70 sfuncs.cpp,1.132,1.133 sndres.cpp,1.43,1.44 sprite.cpp,1.53,1.54

Eugene Sandulenko sev at users.sourceforge.net
Tue Jul 5 10:01:24 CEST 2005


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26893

Modified Files:
	actor.cpp events.cpp font.cpp game.cpp gfx.cpp 
	ite_introproc.cpp palanim.cpp saga.cpp scene.cpp script.cpp 
	sfuncs.cpp sndres.cpp sprite.cpp 
Log Message:
Hid most of debug output to deeper levels. We're pretty close to official
launch so it should be invisible to users.


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- actor.cpp	5 Jul 2005 15:34:26 -0000	1.150
+++ actor.cpp	5 Jul 2005 16:58:29 -0000	1.151
@@ -570,7 +570,6 @@
 }
 
 void Actor::setProtagState(int state) {
-	debug(0, "STUB: setProtagState(%d)", state); //TODO: do it
 	_protagState = state;
 }
 
@@ -793,7 +792,7 @@
 		if (_activeSpeech.slowModeCharIndex >= stringLength)
 			error("Wrong string index");
 
-		debug(0 , "Slow string!");
+		warning("Slow string encountered!");
 		_activeSpeech.playingTime = 10 * talkspeed;
 		// 10 - fix it
 

Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/events.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- events.cpp	5 Jul 2005 15:15:33 -0000	1.53
+++ events.cpp	5 Jul 2005 16:58:31 -0000	1.54
@@ -44,12 +44,12 @@
 namespace Saga {
 
 Events::Events(SagaEngine *vm) : _vm(vm), _initialized(false) {
-	debug(0, "Initializing event subsystem...");
+	debug(8, "Initializing event subsystem...");
 	_initialized = true;
 }
 
 Events::~Events(void) {
-	debug(0, "Shutting down event subsystem...");
+	debug(8, "Shutting down event subsystem...");
 	freeList();
 }
 
@@ -409,7 +409,7 @@
 		switch (event->op) {
 		case EVENT_EXEC_BLOCKING:
 		case EVENT_EXEC_NONBLOCKING:
-			debug(0, "Exec module number %d script entry number %d", event->param, event->param2);
+			debug(6, "Exec module number %d script entry number %d", event->param, event->param2);
 		
 			sthread = _vm->_script->createThread(event->param, event->param2);
 			if (sthread == NULL) {

Index: font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/font.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- font.cpp	21 Jan 2005 21:55:52 -0000	1.28
+++ font.cpp	5 Jul 2005 16:58:32 -0000	1.29
@@ -60,7 +60,7 @@
 Font::~Font(void) {
 //	int i;
 
-	debug(0, "Font::~Font(): Freeing fonts.");
+	debug(8, "Font::~Font(): Freeing fonts.");
 /*
 	for (i = 0 ; i < FONT_COUNT ; i++) {
 		if (_fonts[i] != NULL) {

Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- game.cpp	8 Jun 2005 14:41:57 -0000	1.71
+++ game.cpp	5 Jul 2005 16:58:33 -0000	1.72
@@ -1078,7 +1078,7 @@
 			return FAILURE;
 		}
 
-		debug(0, "Opened resource file: %s", gameFileName);
+		debug(3, "Opened resource file: %s", gameFileName);
 		_gameFileContexts[i] = loadContext;
 	}
 	

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gfx.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- gfx.cpp	5 Jul 2005 15:33:09 -0000	1.50
+++ gfx.cpp	5 Jul 2005 16:58:33 -0000	1.51
@@ -39,7 +39,7 @@
 		_system->initSize(width, height);
 	_system->endGFXTransaction();
 
-	debug(0, "Init screen %dx%d", width, height);
+	debug(5, "Init screen %dx%d", width, height);
 	// Convert surface data to R surface data
 	back_buf.pixels = calloc(1, width * height);
 	back_buf.w = width;

Index: ite_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ite_introproc.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- ite_introproc.cpp	21 Jun 2005 21:59:24 -0000	1.55
+++ ite_introproc.cpp	5 Jul 2005 16:58:33 -0000	1.56
@@ -304,8 +304,8 @@
 
 		q_event = _vm->_events->queue(&event);
 
-		debug(0, "Intro animation procedure started.");
-		debug(0, "Linking animation resources...");
+		debug(3, "Intro animation procedure started.");
+		debug(3, "Linking animation resources...");
 
 		_vm->_anim->setFrameTime(0, ITE_INTRO_FRAMETIME);
 
@@ -332,7 +332,7 @@
 
 		_vm->_anim->setFlag(lastAnim, ANIM_ENDSCENE);
 
-		debug(0, "Beginning animation playback.");
+		debug(3, "Beginning animation playback.");
 
 		// Begin the animation
 		event.type = ONESHOT_EVENT;

Index: palanim.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/palanim.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- palanim.cpp	5 Jul 2005 15:15:34 -0000	1.22
+++ palanim.cpp	5 Jul 2005 16:58:33 -0000	1.23
@@ -62,7 +62,7 @@
 
 	_entryCount = readS.readUint16();
 
-	debug(0, "PalAnim::loadPalAnim(): Loading %d PALANIM entries.", _entryCount);
+	debug(3, "PalAnim::loadPalAnim(): Loading %d PALANIM entries.", _entryCount);
 
 	test_p = calloc(_entryCount, sizeof(PALANIM_ENTRY));
 	if (test_p == NULL) {
@@ -196,7 +196,7 @@
 		free(_entries[i].pal_index);
 	}
 
-	debug(0, "PalAnim::freePalAnim(): Freeing entries.");
+	debug(3, "PalAnim::freePalAnim(): Freeing entries.");
 
 	free(_entries);
 

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- saga.cpp	24 Jun 2005 15:23:05 -0000	1.117
+++ saga.cpp	5 Jul 2005 16:58:34 -0000	1.118
@@ -274,7 +274,7 @@
 	_music->setAdlib(adlib);
 
 	if (!_musicEnabled) {
-		debug(0, "Music disabled.");
+		debug(1, "Music disabled.");
 	}
 
 	
@@ -286,7 +286,7 @@
 	// Initialize system specific sound
 	_sound = new Sound(this, _mixer, _soundEnabled);
 	if (!_soundEnabled) {
-		debug(0, "Sound disabled.");
+		debug(1, "Sound disabled.");
 	}
 
 	_interface->converseInit();

Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- scene.cpp	5 Jul 2005 15:15:34 -0000	1.114
+++ scene.cpp	5 Jul 2005 16:58:34 -0000	1.115
@@ -66,7 +66,7 @@
 
 
 	// Load scene lookup table
-	debug(0, "Loading scene LUT from resource %u.", RSC_ConvertID(_vm->getResourceDescription()->sceneLUTResourceId));
+	debug(3, "Loading scene LUT from resource %u.", RSC_ConvertID(_vm->getResourceDescription()->sceneLUTResourceId));
 	result = RSC_LoadResource(_sceneContext, RSC_ConvertID(_vm->getResourceDescription()->sceneLUTResourceId), &scene_lut_p, &scene_lut_len);
 	if (result != SUCCESS) {
 		warning("Scene::Scene(): Error: couldn't load scene LUT");
@@ -94,9 +94,9 @@
 
 	_firstScene = _vm->getStartSceneNumber();
 
-	debug(0, "First scene set to %d.", _firstScene);
+	debug(3, "First scene set to %d.", _firstScene);
 
-	debug(0, "LUT has %d entries.", _sceneMax);
+	debug(3, "LUT has %d entries.", _sceneMax);
 
 	// Create scene module text list
 	_textList = _vm->textCreateList();
@@ -423,11 +423,11 @@
 		break;
 	}
 	
-	debug(0, "Loading scene number %u:", _sceneNumber);
+	debug(3, "Loading scene number %u:", _sceneNumber);
 
 	// Load scene descriptor and resource list resources
 	if (_loadDescription) {
-		debug(0, "Loading scene resource %u:", _sceneResourceId);
+		debug(3, "Loading scene resource %u:", _sceneResourceId);
 
 		if (loadSceneDescriptor(_sceneResourceId) != SUCCESS) {
 			error("Scene::loadScene(): Error reading scene descriptor");
@@ -437,7 +437,7 @@
 			error("Scene::loadScene(): Error reading scene resource list");
 		}
 	} else {
-		debug(0, "Loading memory scene resource.");
+		debug(3, "Loading memory scene resource.");
 	}
 
 	// Load resources from scene resource list
@@ -642,7 +642,7 @@
 			_vm->_events->queue(&event);
 		}
 
-		debug(0, "Scene started");
+		debug(3, "Scene started");
 
 	} else {
 		loadSceneParams->sceneProc(SCENE_BEGIN, this);
@@ -707,7 +707,7 @@
 
 	// Allocate memory for scene resource list 
 	_resListEntries = resource_list_len / SAGA_RESLIST_ENTRY_LEN;
-	debug(0, "Scene resource list contains %d entries.", _resListEntries);
+	debug(3, "Scene resource list contains %d entries.", _resListEntries);
 	_resList = (SCENE_RESLIST *)calloc(_resListEntries, sizeof(*_resList));
 
 	if (_resList == NULL) {
@@ -716,7 +716,7 @@
 
 	// Load scene resource list from raw scene 
 	// resource table
-	debug(0, "Loading scene resource list...");
+	debug(3, "Loading scene resource list...");
 
 	for (i = 0; i < _resListEntries; i++) {
 		_resList[i].res_number = readS.readUint16();
@@ -744,7 +744,7 @@
 				error("Scene::processSceneResources(): Multiple background resources encountered");
 			}
 
-			debug(0, "Loading background resource.");
+			debug(3, "Loading background resource.");
 			_bg.res_buf = resourceData;
 			_bg.res_len = resourceDataLength;
 			_bg.loaded = 1;
@@ -766,7 +766,7 @@
 			if (_bgMask.loaded) {
 				error("Scene::ProcessSceneResources(): Duplicate background mask resource encountered");
 			}
-			debug(0, "Loading BACKGROUND MASK resource.");
+			debug(3, "Loading BACKGROUND MASK resource.");
 			_bgMask.res_buf = resourceData;
 			_bgMask.res_len = resourceDataLength;
 			_bgMask.loaded = 1;
@@ -778,18 +778,18 @@
 			_bgMask.w = MIN(_bgMask.w, _vm->getDisplayWidth());
 			_bgMask.h = MIN(_bgMask.h, _vm->getClippedSceneHeight());
 
-			debug(0, "BACKGROUND MASK width=%d height=%d length=%d", _bgMask.w, _bgMask.h, _bgMask.buf_len);
+			debug(4, "BACKGROUND MASK width=%d height=%d length=%d", _bgMask.w, _bgMask.h, _bgMask.buf_len);
 			break;
 		case SAGA_STRINGS:
-			debug(0, "Loading scene strings resource...");
+			debug(3, "Loading scene strings resource...");
 			_vm->loadStrings(_sceneStrings, resourceData, resourceDataLength);
 			break;
 		case SAGA_OBJECT_MAP:
-			debug(0, "Loading object map resource...");
+			debug(3, "Loading object map resource...");
 			_objectMap->load(resourceData, resourceDataLength);			
 			break;
 		case SAGA_ACTION_MAP:
-			debug(0, "Loading action map resource...");
+			debug(3, "Loading action map resource...");
 			_actionMap->load(resourceData, resourceDataLength);
 			break;
 		case SAGA_ISO_IMAGES:
@@ -797,7 +797,7 @@
 				error("Scene::ProcessSceneResources(): not Iso mode");
 			}
 
-			debug(0, "Loading isometric images resource.");
+			debug(3, "Loading isometric images resource.");
 
 			_vm->_isoMap->loadImages(resourceData, resourceDataLength);
 			break;
@@ -806,7 +806,7 @@
 				error("Scene::ProcessSceneResources(): not Iso mode");
 			}
 
-			debug(0, "Loading isometric map resource.");
+			debug(3, "Loading isometric map resource.");
 
 			_vm->_isoMap->loadMap(resourceData, resourceDataLength);
 			break;
@@ -815,7 +815,7 @@
 				error("Scene::ProcessSceneResources(): not Iso mode");
 			}
 
-			debug(0, "Loading isometric platforms resource.");
+			debug(3, "Loading isometric platforms resource.");
 
 			_vm->_isoMap->loadPlatforms(resourceData, resourceDataLength);
 			break;
@@ -824,7 +824,7 @@
 				error("Scene::ProcessSceneResources(): not Iso mode");
 			}
 
-			debug(0, "Loading isometric metatiles resource.");
+			debug(3, "Loading isometric metatiles resource.");
 
 			_vm->_isoMap->loadMetaTiles(resourceData, resourceDataLength);
 			break;			
@@ -838,7 +838,7 @@
 			{
 				uint16 animId = _resList[i].res_type - SAGA_ANIM_1;
 
-				debug(0, "Loading animation resource animId=%i", animId);
+				debug(3, "Loading animation resource animId=%i", animId);
 
 				_vm->_anim->load(animId, resourceData, resourceDataLength);
 			}
@@ -848,16 +848,16 @@
 				error("Scene::ProcessSceneResources(): not Iso mode");
 			}
 
-			debug(0, "Loading isometric multi resource.");
+			debug(3, "Loading isometric multi resource.");
 
 			_vm->_isoMap->loadMulti(resourceData, resourceDataLength);
 			break;			
 		case SAGA_PAL_ANIM:
-			debug(0, "Loading palette animation resource.");
+			debug(3, "Loading palette animation resource.");
 			_vm->_palanim->loadPalAnim(resourceData, resourceDataLength);
 			break;
 		case SAGA_ENTRY:
-			debug(0, "Loading entry list resource...");
+			debug(3, "Loading entry list resource...");
 			loadSceneEntryList(resourceData, resourceDataLength);
 			break;
 		case SAGA_FACES:
@@ -914,7 +914,7 @@
 	if (!_sceneLoaded)
 		return;
 
-	debug(0, "Ending scene...");
+	debug(3, "Ending scene...");
 
 	if (_sceneProc != NULL) {
 		_sceneProc(SCENE_END, this);

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- script.cpp	10 Jun 2005 13:56:51 -0000	1.69
+++ script.cpp	5 Jul 2005 16:58:36 -0000	1.70
@@ -76,7 +76,7 @@
 	_commonBuffer = (byte*)malloc(_commonBufferSize);
 	memset(_commonBuffer, 0, _commonBufferSize);
 	
-	debug(0, "Initializing scripting subsystem");
+	debug(8, "Initializing scripting subsystem");
 	// Load script resource file context
 	_scriptContext = _vm->getFileContext(GAME_SCRIPTFILE, 0);
 	if (_scriptContext == NULL) {
@@ -88,7 +88,7 @@
 		error("Script::Script() Couldn't get resource file context");
 	}
 
-	debug(0, "Loading module LUT from resource %u.", _vm->getResourceDescription()->moduleLUTResourceId);
+	debug(3, "Loading module LUT from resource %u.", _vm->getResourceDescription()->moduleLUTResourceId);
 	result = RSC_LoadResource(resourceContext, _vm->getResourceDescription()->moduleLUTResourceId, &resourcePointer, &resourceLength);
 	if (result != SUCCESS) {
 		error("Script::Script() Couldn't load module LUT resource");
@@ -106,7 +106,7 @@
 	// Calculate number of entries
 	_modulesCount = resourceLength / _modulesLUTEntryLen;
 
-	debug(0, "LUT has %d entries.", _modulesCount);
+	debug(3, "LUT has %d entries.", _modulesCount);
 	
 	// Allocate space for logical LUT
 	_modules = (ModuleData *)malloc(_modulesCount * sizeof(*_modules));
@@ -171,7 +171,7 @@
 		error("Script not initialized");
 	}
 
-	debug(0, "Shutting down scripting subsystem.");
+	debug(8, "Shutting down scripting subsystem.");
 	
 	_mainStrings.freeMem();
 
@@ -198,7 +198,7 @@
 	}
 
 	// Initialize script data structure
-	debug(0, "Loading script module #%d", scriptModuleNumber);
+	debug(3, "Loading script module #%d", scriptModuleNumber);
 
 	result = RSC_LoadResource(_scriptContext, _modules[scriptModuleNumber].scriptResourceId, &resourcePointer, &resourceLength);
 	if (result != SUCCESS) {
@@ -247,7 +247,7 @@
 void Script::loadModuleBase(ModuleData &module, const byte *resourcePointer, size_t resourceLength) {
 	int i;
 
-	debug(0, "Loading module base...");
+	debug(3, "Loading module base...");
 
 	module.moduleBase = (byte*)malloc(resourceLength);
 	module.moduleBaseSize = resourceLength;

Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- sfuncs.cpp	3 Jul 2005 20:02:56 -0000	1.132
+++ sfuncs.cpp	5 Jul 2005 16:58:36 -0000	1.133
@@ -690,7 +690,6 @@
 	int16 flag = thread->pop();
 	HitZone *hitZone;
 
-	debug(0, "sfEnableZone(%d, %d)", objectId, flag);
 	if (objectTypeId(objectId) == kGameObjectHitZone) {
 		hitZone = _vm->_scene->_objectMap->getHitZone(objectIdToIndex(objectId));
 	} else {

Index: sndres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sndres.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- sndres.cpp	10 May 2005 23:48:38 -0000	1.43
+++ sndres.cpp	5 Jul 2005 16:58:36 -0000	1.44
@@ -59,10 +59,10 @@
 int SndRes::playSound(uint32 sound_rn, int volume, bool loop) {
 	SOUNDBUFFER snd_buffer;
 
-	debug(0, "SndRes::playSound(%ld)", sound_rn);
+	debug(4, "SndRes::playSound(%ld)", sound_rn);
 
 	if (load(_sfx_ctxt, sound_rn, &snd_buffer) != SUCCESS) {
-		debug(0, "Failed to load sound");
+		warning("Failed to load sound");
 		return FAILURE;
 	}
 
@@ -76,7 +76,7 @@
 	int result = FAILURE;
 	bool voiceFile = false;
 
-	debug(0, "SndRes::playVoice(%ld)", voice_rn);
+	debug(4, "SndRes::playVoice(%ld)", voice_rn);
 
 	if (_vm->getGameType() == GType_ITE && voice_rn == 4) {
 		// The Wyrmkeep release of Inherit the Earth provides a

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- sprite.cpp	5 Jul 2005 06:12:40 -0000	1.53
+++ sprite.cpp	5 Jul 2005 16:58:36 -0000	1.54
@@ -37,7 +37,7 @@
 namespace Saga {
 
 Sprite::Sprite(SagaEngine *vm) : _vm(vm), _initialized(false) {
-	debug(0, "Initializing sprite subsystem...");
+	debug(8, "Initializing sprite subsystem...");
 
 	// Load sprite module resource context
 	_spriteContext = _vm->getFileContext(GAME_RESOURCEFILE, 0);
@@ -62,7 +62,7 @@
 		return;
 	}
 
-	debug(0, "Shutting down sprite subsystem...");
+	debug(8, "Shutting down sprite subsystem...");
 	_mainSprites.freeMem();
 	free(_decodeBuf);
 }





More information about the Scummvm-git-logs mailing list