[Scummvm-cvs-logs] CVS: scummvm/saga module.mk,1.4,1.5 reinherit.h,1.4,1.5 render.cpp,1.2,1.3 saga.cpp,1.6,1.7 systimer.cpp,1.1,1.2 systimer.h,1.2,1.3 sys_fs.cpp,1.1,NONE
Max Horn
fingolfin at users.sourceforge.net
Tue Apr 27 04:23:02 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga expr.cpp,1.2,1.3 scene.cpp,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga sys_interface.h,1.2,1.3 xmidi.cpp,1.2,1.3 xmidi.h,1.2,1.3 ys_binread.cpp,1.2,1.3 ys_binwrite.cpp,1.1,1.2 ys_dl_list.cpp,1.1,1.2 yslib.h,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6220
Modified Files:
module.mk reinherit.h render.cpp saga.cpp systimer.cpp
systimer.h
Removed Files:
sys_fs.cpp
Log Message:
cleanup
Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/module.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- module.mk 25 Apr 2004 14:42:14 -0000 1.4
+++ module.mk 27 Apr 2004 11:22:13 -0000 1.5
@@ -47,8 +47,7 @@
saga/systimer.o \
saga/sysmusic.o \
saga/syssound.o \
- saga/sysio.o \
- saga/sys_fs.o
+ saga/sysio.o
MODULE_DIRS += \
saga
Index: reinherit.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/reinherit.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- reinherit.h 25 Apr 2004 15:14:46 -0000 1.4
+++ reinherit.h 27 Apr 2004 11:22:13 -0000 1.5
@@ -185,14 +185,6 @@
int SYSIO_Shutdown(void);
/*
- * System : Filesystem
-\*--------------------------------------------------------------------------*/
-
-int SYSFS_GetFileLen(FILE * file_p, ulong * len);
-int SYSFS_GetFQFN(const char *f_dir,
- const char *f_name, char *buf, size_t buf_len);
-
-/*
* System : Sound
\*--------------------------------------------------------------------------*/
int SYSSOUND_Init(int enabled);
@@ -266,22 +258,6 @@
int SYSGFX_BlackToPal(R_SURFACE * surface, PALENTRY * src_pal, double percent);
/*
- * System : Timer
-\*--------------------------------------------------------------------------*/
-typedef struct R_SYSTIMER_tag R_SYSTIMER;
-
-typedef void (*R_SYSTIMER_CALLBACK) (unsigned long, void *);
-
-int SYSTIMER_InitMSCounter(void);
-unsigned long SYSTIMER_ReadMSCounter(void);
-
-int SYSTIMER_ResetMSCounter(void);
-int SYSTIMER_Sleep(uint msec);
-int SYSTIMER_CreateTimer(R_SYSTIMER **,
- unsigned long, void *, R_SYSTIMER_CALLBACK);
-int SYSTIMER_DestroyTimer(R_SYSTIMER *);
-
-/*
* System : Input
\*--------------------------------------------------------------------------*/
int SYSINPUT_Init(void);
Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/render.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- render.cpp 25 Apr 2004 14:42:14 -0000 1.2
+++ render.cpp 27 Apr 2004 11:22:13 -0000 1.3
@@ -30,6 +30,8 @@
#include "reinherit.h"
+#include "systimer.h"
+
#include "yslib.h"
#include <SDL.h>
Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- saga.cpp 25 Apr 2004 14:42:14 -0000 1.6
+++ saga.cpp 27 Apr 2004 11:22:13 -0000 1.7
@@ -34,6 +34,8 @@
#include "reinherit.h"
+#include "systimer.h"
+
#include "rscfile_mod.h"
#include "render_mod.h"
#include "actor_mod.h"
Index: systimer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/systimer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- systimer.cpp 12 Apr 2004 21:40:48 -0000 1.1
+++ systimer.cpp 27 Apr 2004 11:22:13 -0000 1.2
@@ -31,7 +31,31 @@
namespace Saga {
-R_SYSTIMER_DATA R_TimerData;
+struct R_SYSTIMER {
+
+ int t_running;
+
+ unsigned long t_interval;
+ void *t_param;
+
+ R_SYSTIMER_CALLBACK t_callback_f;
+ SDL_TimerID t_sdl_timerid;
+};
+
+struct R_SYSTIMER_DATA {
+
+ int initialized;
+
+ Uint32 t_start_ticks;
+
+ Uint32 t_current_ticks;
+ Uint32 t_previous_ticks;
+
+};
+
+static R_SYSTIMER_DATA R_TimerData;
+
+static Uint32 SYSTIMER_Callback(Uint32 interval, void *param);
int SYSTIMER_InitMSCounter(void)
{
Index: systimer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/systimer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- systimer.h 25 Apr 2004 14:42:14 -0000 1.2
+++ systimer.h 27 Apr 2004 11:22:13 -0000 1.3
@@ -25,29 +25,19 @@
namespace Saga {
-struct R_SYSTIMER_DATA {
-
- int initialized;
-
- Uint32 t_start_ticks;
-
- Uint32 t_current_ticks;
- Uint32 t_previous_ticks;
-
-};
-
-struct R_SYSTIMER_tag {
+typedef void (*R_SYSTIMER_CALLBACK) (unsigned long, void *);
- int t_running;
+struct R_SYSTIMER;
- unsigned long t_interval;
- void *t_param;
+int SYSTIMER_InitMSCounter(void);
+unsigned long SYSTIMER_ReadMSCounter(void);
- R_SYSTIMER_CALLBACK t_callback_f;
- SDL_TimerID t_sdl_timerid;
-};
+int SYSTIMER_ResetMSCounter(void);
+int SYSTIMER_Sleep(uint msec);
+int SYSTIMER_CreateTimer(R_SYSTIMER **,
+ unsigned long, void *, R_SYSTIMER_CALLBACK);
+int SYSTIMER_DestroyTimer(R_SYSTIMER *);
-Uint32 SYSTIMER_Callback(Uint32 interval, void *param);
} // End of namespace Saga
--- sys_fs.cpp DELETED ---
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga expr.cpp,1.2,1.3 scene.cpp,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga sys_interface.h,1.2,1.3 xmidi.cpp,1.2,1.3 xmidi.h,1.2,1.3 ys_binread.cpp,1.2,1.3 ys_binwrite.cpp,1.1,1.2 ys_dl_list.cpp,1.1,1.2 yslib.h,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list