[Scummvm-cvs-logs] CVS: scummvm/saga music.h,1.24,1.25 saveload.cpp,1.22,1.23
Eugene Sandulenko
sev at users.sourceforge.net
Thu Aug 11 15:01:28 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.175,1.176
- Next message: [Scummvm-cvs-logs] CVS: web/screenshots big_scummvm_70.png,NONE,1.1 big_scummvm_71.png,NONE,1.1 big_scummvm_72.png,NONE,1.1 big_scummvm_73.png,NONE,1.1 scummvm_70.jpg,NONE,1.1 scummvm_70.txt,NONE,1.1 scummvm_71.jpg,NONE,1.1 scummvm_71.txt,NONE,1.1 scummvm_72.jpg,NONE,1.1 scummvm_72.txt,NONE,1.1 scummvm_73.jpg,NONE,1.1 scummvm_73.txt,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17967
Modified Files:
music.h saveload.cpp
Log Message:
Fix bug #1257033 "ITE: Map music briefly plays when loading game at sanctuary"
Index: music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- music.h 19 Jul 2005 19:05:46 -0000 1.24
+++ music.h 11 Aug 2005 22:00:32 -0000 1.25
@@ -111,7 +111,8 @@
void resume(void);
void stop(void);
- void setVolume(int volume, int time);
+ void setVolume(int volume, int time = 1);
+ int getVolume() { return _currentVolume; }
private:
SagaEngine *_vm;
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saveload.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- saveload.cpp 11 Aug 2005 14:03:10 -0000 1.22
+++ saveload.cpp 11 Aug 2005 22:00:32 -0000 1.23
@@ -30,13 +30,14 @@
#include "saga/saga.h"
#include "saga/actor.h"
+#include "saga/events.h"
+#include "saga/interface.h"
#include "saga/isomap.h"
+#include "saga/music.h"
+#include "saga/render.h"
#include "saga/resnames.h"
-#include "saga/script.h"
-#include "saga/interface.h"
#include "saga/scene.h"
-#include "saga/render.h"
-#include "saga/events.h"
+#include "saga/script.h"
#define CURRENT_SAGA_VER 3
@@ -225,10 +226,15 @@
delete in;
+ // Mute volume to prevent outScene music play
+ int volume = _music->getVolume();
+ _music->setVolume(0);
+
_isoMap->setMapPosition(mapx, mapy);
_scene->clearSceneQueue();
_scene->changeScene(sceneNumber, ACTOR_NO_ENTRANCE, kTransitionNoFade);
+
_events->handleEvents(0); //dissolve back grounds
if (insetSceneNumber != sceneNumber) {
@@ -238,6 +244,8 @@
_scene->changeScene(insetSceneNumber, ACTOR_NO_ENTRANCE, kTransitionNoFade);
}
+ _music->setVolume(volume);
+
_interface->draw();
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.175,1.176
- Next message: [Scummvm-cvs-logs] CVS: web/screenshots big_scummvm_70.png,NONE,1.1 big_scummvm_71.png,NONE,1.1 big_scummvm_72.png,NONE,1.1 big_scummvm_73.png,NONE,1.1 scummvm_70.jpg,NONE,1.1 scummvm_70.txt,NONE,1.1 scummvm_71.jpg,NONE,1.1 scummvm_71.txt,NONE,1.1 scummvm_72.jpg,NONE,1.1 scummvm_72.txt,NONE,1.1 scummvm_73.jpg,NONE,1.1 scummvm_73.txt,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list