[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.11,1.12 reinherit.h,1.20,1.21 rscfile.h,1.4,1.5 sthread.h,1.4,1.5
Max Horn
fingolfin at users.sourceforge.net
Fri Jun 25 13:12:05 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga gfx.cpp,1.16,1.17 input.cpp,1.2,1.3 reinherit.h,1.19,1.20 render.cpp,1.11,1.12 saga.cpp,1.20,1.21 saga.h,1.11,1.12
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga gfx.cpp,1.17,1.18 reinherit.h,1.21,1.22 saga.h,1.12,1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16862
Modified Files:
actor.cpp reinherit.h rscfile.h sthread.h
Log Message:
cleanup
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- actor.cpp 5 May 2004 13:05:30 -0000 1.11
+++ actor.cpp 25 Jun 2004 20:11:46 -0000 1.12
@@ -81,7 +81,7 @@
// Create actor lookup table
ActorModule.tbl = (YS_DL_NODE **)malloc(R_ACTORCOUNT * sizeof *ActorModule.tbl);
if (ActorModule.tbl == NULL) {
- ActorModule.err_str = R_MEMFAIL_MSG;
+ ActorModule.err_str = "Memory allocation error.";
return R_MEM;
}
@@ -93,7 +93,7 @@
ActorModule.alias_tbl = (int *)malloc(R_ACTORCOUNT * sizeof *ActorModule.alias_tbl);
if (ActorModule.alias_tbl == NULL) {
free(ActorModule.tbl);
- ActorModule.err_str = R_MEMFAIL_MSG;
+ ActorModule.err_str = "Memory allocation error.";
return R_MEM;
}
Index: reinherit.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/reinherit.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- reinherit.h 25 Jun 2004 20:01:31 -0000 1.20
+++ reinherit.h 25 Jun 2004 20:11:46 -0000 1.21
@@ -36,15 +36,13 @@
#define R_MAXPATH 512
-#define R_MEMFAIL_MSG "Memory allocation error."
-
// Define opaque types
// r_rscfile
-typedef struct R_RSCFILE_CONTEXT_tag R_RSCFILE_CONTEXT;
+struct R_RSCFILE_CONTEXT;
// r_script
-typedef struct R_SEMAPHORE_tag R_SEMAPHORE;
+struct R_SEMAPHORE;
// Define common data types
@@ -64,7 +62,6 @@
int buf_h;
int buf_pitch;
R_RECT clip_rect;
- void *impl_src;
};
#define R_RGB_RED 0x00FF0000UL
Index: rscfile.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rscfile.h 1 May 2004 13:19:15 -0000 1.4
+++ rscfile.h 25 Jun 2004 20:11:46 -0000 1.5
@@ -41,7 +41,7 @@
size_t res_size;
};
-struct R_RSCFILE_CONTEXT_tag {
+struct R_RSCFILE_CONTEXT {
const char *rc_file_fspec;
File rc_file;
int rc_file_loaded;
Index: sthread.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sthread.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sthread.h 4 May 2004 03:33:03 -0000 1.4
+++ sthread.h 25 Jun 2004 20:11:46 -0000 1.5
@@ -32,7 +32,7 @@
#define STHREAD_DEF_INSTR_COUNT 7
-struct R_SEMAPHORE_tag {
+struct R_SEMAPHORE {
int hold_count;
};
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga gfx.cpp,1.16,1.17 input.cpp,1.2,1.3 reinherit.h,1.19,1.20 render.cpp,1.11,1.12 saga.cpp,1.20,1.21 saga.h,1.11,1.12
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga gfx.cpp,1.17,1.18 reinherit.h,1.21,1.22 saga.h,1.12,1.13
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list