[Scummvm-cvs-logs] CVS: scummvm/bs2 controls.cpp,1.14,1.15 controls.h,1.2,1.3

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Sat Sep 20 09:40:03 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv4858

Modified Files:
	controls.cpp controls.h 
Log Message:
cleanup


Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/controls.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- controls.cpp	17 Sep 2003 21:06:13 -0000	1.14
+++ controls.cpp	20 Sep 2003 16:39:17 -0000	1.15
@@ -17,28 +17,23 @@
  * $Header$
  */
 
-// FIXME: Are all of these includes really needed?
-
 #include "stdafx.h"
+#include "driver/driver96.h"
 #include "build_display.h"
 #include "console.h"
 #include "controls.h"
-#include "debug.h"
 #include "defs.h"
 #include "header.h"
 #include "interpreter.h"
 #include "layers.h"
 #include "logic.h"
-#include "maketext.h"	// for font resource variables
-#include "mem_view.h"
-#include "memory.h"
+#include "maketext.h"			// for font resource variables
 #include "mouse.h"
 #include "protocol.h"
 #include "resman.h"
 #include "router.h"
 #include "save_rest.h"
-#include "sound.h"		// for FN_stop_music()
-#include "startup.h"
+#include "sound.h"			// for FN_stop_music()
 #include "sword2.h"
 
 #define	MAX_STRING_LEN		64	// 20 was too low; better to be safe ;)

Index: controls.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/controls.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- controls.h	26 Aug 2003 06:52:59 -0000	1.2
+++ controls.h	20 Sep 2003 16:39:17 -0000	1.3
@@ -20,18 +20,15 @@
 #ifndef	_CONTROL_S
 #define	_CONTROL_S
 
-#include "common/scummsys.h"
-//#include "src\driver96.h"
-
-uint32	Restore_control(void);	//Tony20Mar97
-void	Save_control(void);	//Tony1Apr97
-void	Quit_control(void);	//Tony2Apr97
-void	Restart_control(void);	//Tony4Apr97
-void	Option_control(void);	//Pete5Jun97
-int32   ReadOptionSettings(void);	//Pete10Jun97
-void	UpdateGraphicsLevel(uint8 newLevel);	// (James13jun97)
+uint32 Restore_control(void);
+void Save_control(void);
+void Quit_control(void);
+void Restart_control(void);
+void Option_control(void);
+int32 ReadOptionSettings(void);
+void UpdateGraphicsLevel(uint8 newLevel);
 
-extern uint8 subtitles;		// text selected
+extern uint8 subtitles;			// text selected
 extern uint8 speechSelected;
 extern uint8 current_graphics_level;
 





More information about the Scummvm-git-logs mailing list