[Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.h,1.36,1.37 d_sound.cpp,1.146,1.147 render.cpp,1.75,1.76 sprite.cpp,1.48,1.49

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19769/driver

Modified Files:
	animation.h d_sound.cpp render.cpp sprite.cpp 
Log Message:
Cleanup. Most of is simply moves the credits code out of Logic and into
Screen. I've also added an unused "splash screen" function that displays
the image that used to be shown by CacheNewCluster() while copying a data
file from CD to hard disk. ScummVM doesn't do that, but it's a nice image
that I wish we could do something useful with, and it's easier to have the
code here for reference than having to dig through old revisions of the
resource manager.


Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- animation.h	25 Apr 2005 05:23:21 -0000	1.36
+++ animation.h	2 May 2005 05:41:01 -0000	1.37
@@ -54,7 +54,7 @@
 #endif
 
 	void clearScreen();
-	void updateScreen(void);
+	void updateScreen();
 
 private:
 	void drawYUV(int width, int height, byte *const *dat);

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- d_sound.cpp	12 Mar 2005 18:56:09 -0000	1.146
+++ d_sound.cpp	2 May 2005 05:41:01 -0000	1.147
@@ -618,7 +618,7 @@
  * @return the time left for the current music, in seconds.
  */
 
-int32 Sound::musicTimeRemaining(void) {
+int32 Sound::musicTimeRemaining() {
 	Common::StackLock lock(_mutex);
 
 	for (int i = 0; i < MAXMUS; i++) {
@@ -653,7 +653,7 @@
  * Stops the speech dead in its tracks.
  */
 
-void Sound::pauseSpeech(void) {
+void Sound::pauseSpeech() {
 	_speechPaused = true;
 	_vm->_mixer->pauseHandle(_soundHandleSpeech, true);
 }
@@ -662,7 +662,7 @@
  * Restarts the speech from where it was stopped.
  */
 
-void Sound::unpauseSpeech(void) {
+void Sound::unpauseSpeech() {
 	_speechPaused = false;
 	_vm->_mixer->pauseHandle(_soundHandleSpeech, false);
 }

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/render.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- render.cpp	27 Apr 2005 20:29:19 -0000	1.75
+++ render.cpp	2 May 2005 05:41:01 -0000	1.76
@@ -294,7 +294,7 @@
  * Initialises the timers before the render loop is entered.
  */
 
-void Screen::initialiseRenderCycle(void) {
+void Screen::initialiseRenderCycle() {
 	_initialTime = _vm->_system->getMillis();
 	_totalTime = _initialTime + MILLISECSPERCYCLE;
 }
@@ -304,7 +304,7 @@
  * render cycle.
  */
 
-void Screen::startRenderCycle(void) {
+void Screen::startRenderCycle() {
 	_scrollXOld = _scrollX;
 	_scrollYOld = _scrollY;
 
@@ -332,7 +332,7 @@
  *         or false if it should continue
  */
 
-bool Screen::endRenderCycle(void) {
+bool Screen::endRenderCycle() {
 	static int32 renderTimeLog[4] = { 60, 60, 60, 60 };
 	static int32 renderCountIndex = 0;
 	int32 time;
@@ -398,7 +398,7 @@
  * Reset scrolling stuff. This function is called from initBackground()
  */
 
-void Screen::resetRenderEngine(void) {
+void Screen::resetRenderEngine() {
 	_parallaxScrollX = 0;
 	_parallaxScrollY = 0;
 	_scrollX = 0;
@@ -529,7 +529,7 @@
  * Should be called once after leaving the room to free up memory.
  */
 
-void Screen::closeBackgroundLayer(void) {
+void Screen::closeBackgroundLayer() {
 	debug(2, "CloseBackgroundLayer");
 
 	for (int i = 0; i < MAXLAYERS; i++) {

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/sprite.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- sprite.cpp	27 Feb 2005 16:11:19 -0000	1.48
+++ sprite.cpp	2 May 2005 05:41:01 -0000	1.49
@@ -635,7 +635,7 @@
  * Closes the light masking sprite for a room.
  */
 
-int32 Screen::closeLightMask(void) {
+int32 Screen::closeLightMask() {
 	if (!_lightMask)
 		return RDERR_NOTOPEN;