[Scummvm-cvs-logs] CVS: scummvm/scumm player_v1.h,1.8,1.9 player_v2.h,2.17,2.18 player_v2a.h,2.2,2.3 player_v3a.h,1.10,1.11

Max Horn fingolfin at users.sourceforge.net
Fri Oct 3 06:45:08 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17198

Modified Files:
	player_v1.h player_v2.h player_v2a.h player_v3a.h 
Log Message:
make doxygen happy

Index: player_v1.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v1.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- player_v1.h	2 Oct 2003 22:42:02 -0000	1.8
+++ player_v1.h	3 Oct 2003 13:44:11 -0000	1.9
@@ -47,10 +47,10 @@
 	Player_V1(ScummEngine *scumm);
 	~Player_V1();
 
-	void startSound(int nr);
-	void stopAllSounds();
-	void stopSound(int nr);
-	int  getMusicTimer() const;
+	virtual void startSound(int sound);
+	virtual void stopSound(int sound);
+	virtual void stopAllSounds();
+	virtual int  getMusicTimer() const;
 
 protected:
 	virtual void nextTick();

Index: player_v2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.h,v
retrieving revision 2.17
retrieving revision 2.18
diff -u -d -r2.17 -r2.18
--- player_v2.h	2 Oct 2003 22:42:02 -0000	2.17
+++ player_v2.h	3 Oct 2003 13:44:11 -0000	2.18
@@ -77,12 +77,11 @@
 	virtual ~Player_V2();
 
 	virtual void setMasterVolume(int vol);
-
-	virtual void startSound(int nr);
-	virtual void stopSound(int nr);
+	virtual void startSound(int sound);
+	virtual void stopSound(int sound);
 	virtual void stopAllSounds();
-	virtual int  getSoundStatus(int nr) const;
 	virtual int  getMusicTimer() const;
+	virtual int  getSoundStatus(int sound) const;
 
 protected:
 	bool _isV3Game;

Index: player_v2a.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2a.h,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -d -r2.2 -r2.3
--- player_v2a.h	2 Oct 2003 22:42:02 -0000	2.2
+++ player_v2a.h	3 Oct 2003 13:44:12 -0000	2.3
@@ -41,11 +41,11 @@
 	virtual ~Player_V2A();
 
 	virtual void setMasterVolume(int vol);
-	virtual void startSound(int nr);
-	virtual void stopSound(int nr);
+	virtual void startSound(int sound);
+	virtual void stopSound(int sound);
 	virtual void stopAllSounds();
 	virtual int  getMusicTimer() const;
-	virtual int  getSoundStatus(int nr) const;
+	virtual int  getSoundStatus(int sound) const;
 
 private:
 	OSystem *_system;

Index: player_v3a.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v3a.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- player_v3a.h	2 Oct 2003 22:42:02 -0000	1.10
+++ player_v3a.h	3 Oct 2003 13:44:12 -0000	1.11
@@ -40,11 +40,11 @@
 	virtual ~Player_V3A();
 
 	virtual void setMasterVolume(int vol);
-	virtual void startSound(int nr);
-	virtual void stopSound(int nr);
+	virtual void startSound(int sound);
+	virtual void stopSound(int sound);
 	virtual void stopAllSounds();
 	virtual int  getMusicTimer() const;
-	virtual int  getSoundStatus(int nr) const;
+	virtual int  getSoundStatus(int sound) const;
 
 private:
 	OSystem *_system;





More information about the Scummvm-git-logs mailing list