[Scummvm-cvs-logs] CVS: tools extract_mm_c64.c,1.2,1.3 extract_mm_nes.c,1.13,1.14 extract_zak_c64.c,1.2,1.3
kirben
kirben at users.sourceforge.net
Tue Jul 19 17:06:01 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: tools Makefile,1.53,1.54 extract_loom_tg16.c,1.3,1.4 extract_mm_c64.c,1.1,1.2 extract_mm_nes.c,1.12,1.13 extract_zak_c64.c,1.1,1.2 util.c,1.8,1.9
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.79,1.80
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28570
Modified Files:
extract_mm_c64.c extract_mm_nes.c extract_zak_c64.c
Log Message:
Add patch from Quietust:
-Fix bugs in last patch
Index: extract_mm_c64.c
===================================================================
RCS file: /cvsroot/scummvm/tools/extract_mm_c64.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extract_mm_c64.c 19 Jul 2005 23:38:30 -0000 1.2
+++ extract_mm_c64.c 20 Jul 2005 00:01:22 -0000 1.3
@@ -19,10 +19,8 @@
*
*/
-#include <stdio.h>
+#include "util.h"
#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
typedef int BOOL;
#define TRUE 1
@@ -32,18 +30,16 @@
#define vsnprintf _vsnprintf
#endif
-#ifdef MAKE_LFLS
-#define writeByte writeByteAlt
-#define writeUint16LE writeUint16LEAlt
-void writeByte(FILE *fp, uint8 b)
+void writeByteAlt(FILE *fp, uint8 b)
{
- writeByteAlt(fp, (uint8)(b ^ 0xFF));
+ writeByte(fp, (uint8)(b ^ 0xFF));
}
-void writeUint16LE(FILE *fp, uint16 value)
+void writeUint16LEAlt(FILE *fp, uint16 value)
{
- writeUint16LEAlt(fp, (uint16)(value ^ 0xFFFF));
+ writeUint16LE(fp, (uint16)(value ^ 0xFFFF));
}
-#endif
+#define writeByte writeByteAlt
+#define writeUint16LE writeUint16LEAlt
void notice(const char *s, ...) {
char buf[1024];
Index: extract_mm_nes.c
===================================================================
RCS file: /cvsroot/scummvm/tools/extract_mm_nes.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- extract_mm_nes.c 19 Jul 2005 23:38:30 -0000 1.13
+++ extract_mm_nes.c 20 Jul 2005 00:01:22 -0000 1.14
@@ -35,16 +35,16 @@
#endif
#ifdef MAKE_LFLS
-#define writeByte writeByteAlt
-#define writeUint16LE writeUint16LEAlt
-void writeByte(FILE *fp, uint8 b)
+void writeByteAlt(FILE *fp, uint8 b)
{
- writeByteAlt(fp, (uint8)(b ^ 0xFF));
+ writeByte(fp, (uint8)(b ^ 0xFF));
}
-void writeUint16LE(FILE *fp, uint16 value)
+void writeUint16LEAlt(FILE *fp, uint16 value)
{
- writeUint16LEAlt(fp, (uint16)(value ^ 0xFFFF));
+ writeUint16LE(fp, (uint16)(value ^ 0xFFFF));
}
+#define writeByte writeByteAlt
+#define writeUint16LE writeUint16LEAlt
#endif
void notice(const char *s, ...) {
Index: extract_zak_c64.c
===================================================================
RCS file: /cvsroot/scummvm/tools/extract_zak_c64.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extract_zak_c64.c 19 Jul 2005 23:38:31 -0000 1.2
+++ extract_zak_c64.c 20 Jul 2005 00:01:23 -0000 1.3
@@ -19,10 +19,8 @@
*
*/
-#include <stdio.h>
+#include "util.h"
#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
typedef int BOOL;
#define TRUE 1
@@ -32,18 +30,16 @@
#define vsnprintf _vsnprintf
#endif
-#ifdef MAKE_LFLS
-#define writeByte writeByteAlt
-#define writeUint16LE writeUint16LEAlt
-void writeByte(FILE *fp, uint8 b)
+void writeByteAlt(FILE *fp, uint8 b)
{
- writeByteAlt(fp, (uint8)(b ^ 0xFF));
+ writeByte(fp, (uint8)(b ^ 0xFF));
}
-void writeUint16LE(FILE *fp, uint16 value)
+void writeUint16LEAlt(FILE *fp, uint16 value)
{
- writeUint16LEAlt(fp, (uint16)(value ^ 0xFFFF));
+ writeUint16LE(fp, (uint16)(value ^ 0xFFFF));
}
-#endif
+#define writeByte writeByteAlt
+#define writeUint16LE writeUint16LEAlt
void notice(const char *s, ...) {
char buf[1024];
- Previous message: [Scummvm-cvs-logs] CVS: tools Makefile,1.53,1.54 extract_loom_tg16.c,1.3,1.4 extract_mm_c64.c,1.1,1.2 extract_mm_nes.c,1.12,1.13 extract_zak_c64.c,1.1,1.2 util.c,1.8,1.9
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.79,1.80
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list