[Scummvm-cvs-logs] CVS: tools Makefile,NONE,1.1 descumm3.cpp,1.2,1.3 descumm5.cpp,1.2,1.3 descumm6.cpp,1.4,1.5 extract.c,1.2,1.3 rescumm.c,1.1,1.2

Max Horn fingolfin at users.sourceforge.net
Sun Jul 7 10:31:02 CEST 2002


Update of /cvsroot/scummvm/tools
In directory usw-pr-cvs1:/tmp/cvs-serv26848

Modified Files:
	descumm3.cpp descumm5.cpp descumm6.cpp extract.c rescumm.c 
Added Files:
	Makefile 
Log Message:
added simple Makefile; fixed various warnings & one buglet; run indent over all source file

--- NEW FILE: Makefile ---
# Where is scummvm will be installed
SCUMMVMPATH=C:/scummvm
SRC=.

CC      = cc
CFLAGS  = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar 
LDFLAGS :=

TARGETS := descumm3$(EXEEXT) descumm5$(EXEEXT) descumm6$(EXEEXT) extract$(EXEEXT) rescumm$(EXEEXT)

all: $(TARGETS)

descumm3$(EXEEXT) : descumm3.o
	$(CC) $(LFLAGS) -o $@ $+

descumm5$(EXEEXT) : descumm5.o
	$(CC) $(LFLAGS) -o $@ $+

descumm6$(EXEEXT) : descumm6.o
	$(CC) $(LFLAGS) -o $@ $+

extract$(EXEEXT) : extract.o
	$(CC) $(LFLAGS) -o $@ $+

rescumm$(EXEEXT) : rescumm.o
	$(CC) $(LFLAGS) -o $@ $+

clean:
	rm -f *.o $(TARGETS)

.cpp.o:
	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o

Index: descumm3.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm3.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- descumm3.cpp	18 Mar 2002 19:00:41 -0000	1.2
+++ descumm3.cpp	7 Jul 2002 17:30:09 -0000	1.3
@@ -112,192 +112,228 @@
 
 #if defined(SCUMM_BIG_ENDIAN)
 
-unsigned long inline TO_LE_32(unsigned long a) {
-	return ((a>>24)&0xFF) + ((a>>8)&0xFF00) + ((a<<8)&0xFF0000) + ((a<<24)&0xFF000000);
+unsigned long inline TO_LE_32(unsigned long a)
+{
+	return ((a >> 24) & 0xFF) + ((a >> 8) & 0xFF00) + ((a << 8) & 0xFF0000) +
+		((a << 24) & 0xFF000000);
 }
 
[...3010 lines suppressed...]
 		}
-	
+
 		fflush(stdout);
 	} while (cur_pos < mem + len);
-	
-	
+
+
 	printf("END\n");
-	 
+
 	free(memorg);
-	
+
 	return 0;
-	
 }
-
-

Index: descumm5.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm5.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- descumm5.cpp	26 Apr 2002 11:37:52 -0000	1.2
+++ descumm5.cpp	7 Jul 2002 17:30:09 -0000	1.3
@@ -112,192 +112,228 @@
 
 #if defined(SCUMM_BIG_ENDIAN)
 
-unsigned long inline TO_LE_32(unsigned long a) {
-	return ((a>>24)&0xFF) + ((a>>8)&0xFF00) + ((a<<8)&0xFF0000) + ((a<<24)&0xFF000000);
+unsigned long inline TO_LE_32(unsigned long a)
+{
+	return ((a >> 24) & 0xFF) + ((a >> 8) & 0xFF00) + ((a << 8) & 0xFF0000) +
+		((a << 24) & 0xFF000000);
 }
 
[...2981 lines suppressed...]
 		}
-	
+
 		fflush(stdout);
 	} while (cur_pos < mem + len);
-	
-	
+
+
 	printf("END\n");
-	 
+
 	free(memorg);
-	
+
 	return 0;
-	
 }
-
-

Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm6.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- descumm6.cpp	4 Jun 2002 23:26:07 -0000	1.4
+++ descumm6.cpp	7 Jul 2002 17:30:09 -0000	1.5
@@ -48,12 +48,15 @@
 
 #if defined(SCUMM_BIG_ENDIAN)
 
-uint32 inline TO_LE_32(uint32 a) {
-	return ((a>>24)&0xFF) + ((a>>8)&0xFF00) + ((a<<8)&0xFF0000) + ((a<<24)&0xFF000000);
+uint32 inline TO_LE_32(uint32 a)
+{
+	return ((a >> 24) & 0xFF) + ((a >> 8) & 0xFF00) + ((a << 8) & 0xFF0000) +
+		((a << 24) & 0xFF000000);
 }
 
[...1458 lines suppressed...]
 
 	do {
@@ -1569,15 +1619,10 @@
 			fflush(stdout);
 		}
 	} while (cur_pos < mem + len);
-	
-	
+
 	printf("END\n");
-	 
-	free(memorg);
-	
-	return 0;
 
+	free(memorg);
 
 	return 0;
 }
-

Index: extract.c
===================================================================
RCS file: /cvsroot/scummvm/tools/extract.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extract.c	26 Apr 2002 10:52:23 -0000	1.2
+++ extract.c	7 Jul 2002 17:30:09 -0000	1.3
@@ -21,9 +21,9 @@
   ' ', 'F', 'i', 'l', 'e', 0x1a, 0x1a, 0x00, 0x0A, 0x01, 0x29, 0x11
 };
 
-void put_int(unsigned int val) ;
+void put_int(unsigned int val);
 
-void end_of_file() {
+void end_of_file(void) {
   FILE *in;
   int idx_size = ftell(output_idx);
   int size;
@@ -88,7 +88,7 @@
   }
 }
 
-void get_part() {
+void get_part(void) {
   int id;
   int pos = ftell(input);
   int tags;
@@ -136,7 +136,9 @@
     int real_samplerate;
     char rawname[256];
     char mp3name[256];
+#ifdef DEBUG
     static int sound_num = 0;
+#endif
     
     /* Sound Data */
     printf(" Sound Data\n");

Index: rescumm.c
===================================================================
RCS file: /cvsroot/scummvm/tools/rescumm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rescumm.c	12 Mar 2002 09:02:04 -0000	1.1
+++ rescumm.c	7 Jul 2002 17:30:09 -0000	1.2
@@ -97,7 +97,7 @@
 		if (!file_name[0])
 		{
 			fprintf(stderr, "error: \'%s\'. file has no name.\n", data_file_name);
-			fclose(ofp);
+			fclose(ifp);
 			exit(0);
 		}
 		printf("extracting \'%s\'", file_name);
@@ -120,7 +120,7 @@
 		if (j==0x20)
 		{
 			fprintf(stderr, "\nerror: \'%s\'. file name not null terminated.\n", data_file_name);
-			fclose(ofp);
+			fclose(ifp);
 			exit(0);
 		}
 		printf(", saving as \'%s\'\n", file_name);





More information about the Scummvm-git-logs mailing list