[Scummvm-cvs-logs] CVS: tools compress_saga.c,1.2,1.3 compress_scumm_sou.c,1.2,1.3 compress_simon.c,1.2,1.3 compress_sword1.c,1.2,1.3 compress_sword2.c,1.2,1.3 extract_loom_tg16.c,1.1,1.2 extract_mm_nes.c,1.1,1.2
Max Horn
fingolfin at users.sourceforge.net
Fri Dec 24 09:29:02 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: tools compress.c,1.1,1.2
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actionmap.cpp,1.31,1.32 actionmap.h,1.14,1.15 actor.cpp,1.52,1.53 actor.h,1.25,1.26 console.cpp,1.22,1.23 console.h,1.8,1.9 interface.cpp,1.42,1.43 objectmap.cpp,1.29,1.30 objectmap.h,1.13,1.14 saga.h,1.53,1.54 scene.cpp,1.61,1.62 scene.h,1.24,1.25 script.h,1.33,1.34 sfuncs.cpp,1.51,1.52 sthread.cpp,1.48,1.49
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10659
Modified Files:
compress_saga.c compress_scumm_sou.c compress_simon.c
compress_sword1.c compress_sword2.c extract_loom_tg16.c
extract_mm_nes.c
Log Message:
Change %i to %d (purely for consistency, there is no difference between the two)
Index: compress_saga.c
===================================================================
RCS file: /cvsroot/scummvm/tools/compress_saga.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- compress_saga.c 24 Dec 2004 02:00:52 -0000 1.2
+++ compress_saga.c 24 Dec 2004 17:28:01 -0000 1.3
@@ -172,19 +172,19 @@
printf("(If one of these is specified, it must be the first parameter.)\n");
printf("\nMP3 mode params:\n");
- printf("-b <rate> <rate> is the target bitrate(ABR)/minimal bitrate(VBR) (default:%i)\n", minBitrDef);
- printf("-B <rate> <rate> is the maximum VBR/ABR bitrate (default:%i)\n", maxBitrDef);
+ printf("-b <rate> <rate> is the target bitrate(ABR)/minimal bitrate(VBR) (default:%d)\n", minBitrDef);
+ printf("-B <rate> <rate> is the maximum VBR/ABR bitrate (default:%d)\n", maxBitrDef);
printf("--vbr LAME uses the VBR mode (default)\n");
printf("--abr LAME uses the ABR mode\n");
- printf("-V <value> specifies the value (0 - 9) of VBR quality (0=best) (default:%i)\n", vbrqualDef);
- printf("-q <value> specifies the MPEG algorithm quality (0-9; 0=best) (default:%i)\n", algqualDef);
+ printf("-V <value> specifies the value (0 - 9) of VBR quality (0=best) (default:%d)\n", vbrqualDef);
+ printf("-q <value> specifies the MPEG algorithm quality (0-9; 0=best) (default:%d)\n", algqualDef);
printf("--silent the output of LAME is hidden (default:disabled)\n");
printf("\nVorbis mode params:\n");
printf("-b <rate> <rate> is the nominal bitrate (default:unset)\n");
printf("-m <rate> <rate> is the minimum bitrate (default:unset)\n");
printf("-M <rate> <rate> is the maximum bitrate (default:unset)\n");
- printf("-q <value> specifies the value (0 - 10) of VBR quality (10=best) (default:%i)\n", oggqualDef);
+ printf("-q <value> specifies the value (0 - 10) of VBR quality (10=best) (default:%d)\n", oggqualDef);
printf("--silent the output of oggenc is hidden (default:disabled)\n");
printf("\nFlac mode params:\n");
Index: compress_scumm_sou.c
===================================================================
RCS file: /cvsroot/scummvm/tools/compress_scumm_sou.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- compress_scumm_sou.c 24 Dec 2004 02:00:52 -0000 1.2
+++ compress_scumm_sou.c 24 Dec 2004 17:28:01 -0000 1.3
@@ -153,19 +153,19 @@
printf("(If one of these is specified, it must be the first parameter.)\n");
printf("\nMP3 mode params:\n");
- printf(" -b <rate> <rate> is the target bitrate(ABR)/minimal bitrate(VBR) (default:%i)\n", minBitrDef);
- printf(" -B <rate> <rate> is the maximum VBR/ABR bitrate (default:%i)\n", maxBitrDef);
+ printf(" -b <rate> <rate> is the target bitrate(ABR)/minimal bitrate(VBR) (default:%d)\n", minBitrDef);
+ printf(" -B <rate> <rate> is the maximum VBR/ABR bitrate (default:%d)\n", maxBitrDef);
printf(" --vbr LAME uses the VBR mode (default)\n");
printf(" --abr LAME uses the ABR mode\n");
- printf(" -V <value> specifies the value (0 - 9) of VBR quality (0=best) (default:%i)\n", vbrqualDef);
- printf(" -q <value> specifies the MPEG algorithm quality (0-9; 0=best) (default:%i)\n", algqualDef);
+ printf(" -V <value> specifies the value (0 - 9) of VBR quality (0=best) (default:%d)\n", vbrqualDef);
+ printf(" -q <value> specifies the MPEG algorithm quality (0-9; 0=best) (default:%d)\n", algqualDef);
printf(" --silent the output of LAME is hidden (default:disabled)\n");
printf("\nVorbis mode params:\n");
printf(" -b <rate> <rate> is the nominal bitrate (default:unset)\n");
printf(" -m <rate> <rate> is the minimum bitrate (default:unset)\n");
printf(" -M <rate> <rate> is the maximum bitrate (default:unset)\n");
- printf(" -q <value> specifies the value (0 - 10) of VBR quality (10=best) (default:%i)\n", oggqualDef);
+ printf(" -q <value> specifies the value (0 - 10) of VBR quality (10=best) (default:%d)\n", oggqualDef);
printf(" --silent the output of oggenc is hidden (default:disabled)\n");
printf("\nFlac mode params:\n");
Index: compress_simon.c
===================================================================
RCS file: /cvsroot/scummvm/tools/compress_simon.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- compress_simon.c 24 Dec 2004 02:00:52 -0000 1.2
+++ compress_simon.c 24 Dec 2004 17:28:01 -0000 1.3
@@ -130,7 +130,7 @@
printf("WAV found (pos = %d) :\n", offset);
extractAndEncodeWAV(TEMP_WAV, input, gCompMode);
} else {
- error("Unexpected data at offset: %i", offset);
+ error("Unexpected data at offset: %d", offset);
}
/* Append the converted data to the master output file */
@@ -157,19 +157,19 @@
printf("(If one of these is specified, it must be the first parameter.)\n");
printf("\nMP3 mode params:\n");
- printf(" -b <rate> <rate> is the target bitrate(ABR)/minimal bitrate(VBR) (default:%i)\n", minBitrDef);
- printf(" -B <rate> <rate> is the maximum VBR/ABR bitrate (default:%i)\n", maxBitrDef);
+ printf(" -b <rate> <rate> is the target bitrate(ABR)/minimal bitrate(VBR) (default:%d)\n", minBitrDef);
+ printf(" -B <rate> <rate> is the maximum VBR/ABR bitrate (default:%d)\n", maxBitrDef);
printf(" --vbr LAME uses the VBR mode (default)\n");
printf(" --abr LAME uses the ABR mode\n");
- printf(" -V <value> specifies the value (0 - 9) of VBR quality (0=best) (default:%i)\n", vbrqualDef);
- printf(" -q <value> specifies the MPEG algorithm quality (0-9; 0=best) (default:%i)\n", algqualDef);
+ printf(" -V <value> specifies the value (0 - 9) of VBR quality (0=best) (default:%d)\n", vbrqualDef);
+ printf(" -q <value> specifies the MPEG algorithm quality (0-9; 0=best) (default:%d)\n", algqualDef);
printf(" --silent the output of LAME is hidden (default:disabled)\n");
printf("\nVorbis mode params:\n");
printf(" -b <rate> <rate> is the nominal bitrate (default:unset)\n");
printf(" -m <rate> <rate> is the minimum bitrate (default:unset)\n");
printf(" -M <rate> <rate> is the maximum bitrate (default:unset)\n");
- printf(" -q <value> specifies the value (0 - 10) of VBR quality (10=best) (default:%i)\n", oggqualDef);
+ printf(" -q <value> specifies the value (0 - 10) of VBR quality (10=best) (default:%d)\n", oggqualDef);
printf(" --silent the output of oggenc is hidden (default:disabled)\n");
printf("\nFlac mode params:\n");
Index: compress_sword1.c
===================================================================
RCS file: /cvsroot/scummvm/tools/compress_sword1.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- compress_sword1.c 24 Dec 2004 02:00:52 -0000 1.2
+++ compress_sword1.c 24 Dec 2004 17:28:01 -0000 1.3
@@ -319,12 +319,12 @@
printf("\nMP3 mode params:\n");
printf(" -b <rate> <rate> is the target bitrate(ABR)/minimal bitrate(VBR)\n");
- printf(" (default:%i)\n", minBitrDef);
- printf(" -B <rate> <rate> is the maximum VBR/ABR bitrate (default:%i)\n", maxBitrDef);
+ printf(" (default:%d)\n", minBitrDef);
+ printf(" -B <rate> <rate> is the maximum VBR/ABR bitrate (default:%d)\n", maxBitrDef);
printf(" --vbr LAME uses the VBR mode (default)\n");
printf(" --abr LAME uses the ABR mode\n");
- printf(" -V <value> specifies the value (0 - 9) of VBR quality (0=best) (default:%i)\n", vbrqualDef);
- printf(" -q <value> specifies the MPEG algorithm quality (0-9; 0=best) (default:%i)\n", algqualDef);
+ printf(" -V <value> specifies the value (0 - 9) of VBR quality (0=best) (default:%d)\n", vbrqualDef);
+ printf(" -q <value> specifies the MPEG algorithm quality (0-9; 0=best) (default:%d)\n", algqualDef);
printf(" --silent the output of LAME is hidden (default:disabled)\n");
printf("\nVorbis mode params:\n");
@@ -332,7 +332,7 @@
printf(" -m <rate> <rate> is the minimum bitrate (default:unset)\n");
printf(" -M <rate> <rate> is the maximum bitrate (default:unset)\n");
printf(" -q <value> specifies the value (0 - 10) of VBR quality (10=best)\n");
- printf(" (default:%i)\n", oggqualDef);
+ printf(" (default:%d)\n", oggqualDef);
printf(" --silent the output of oggenc is hidden (default:disabled)\n");
printf("\n --help this help message\n");
Index: compress_sword2.c
===================================================================
RCS file: /cvsroot/scummvm/tools/compress_sword2.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- compress_sword2.c 24 Dec 2004 02:00:52 -0000 1.2
+++ compress_sword2.c 24 Dec 2004 17:28:01 -0000 1.3
@@ -39,19 +39,19 @@
printf("(If one of these is specified, it must be the first parameter.)\n");
printf("\nMP3 mode params:\n");
- printf(" -b <rate> <rate> is the target bitrate(ABR)/minimal bitrate(VBR) (default:%i)\n", minBitrDef);
- printf(" -B <rate> <rate> is the maximum VBR/ABR bitrate (default:%i)\n", maxBitrDef);
+ printf(" -b <rate> <rate> is the target bitrate(ABR)/minimal bitrate(VBR) (default:%d)\n", minBitrDef);
+ printf(" -B <rate> <rate> is the maximum VBR/ABR bitrate (default:%d)\n", maxBitrDef);
printf(" --vbr LAME uses the VBR mode (default)\n");
printf(" --abr LAME uses the ABR mode\n");
- printf(" -V <value> specifies the value (0 - 9) of VBR quality (0=best) (default:%i)\n", vbrqualDef);
- printf(" -q <value> specifies the MPEG algorithm quality (0-9; 0=best) (default:%i)\n", algqualDef);
+ printf(" -V <value> specifies the value (0 - 9) of VBR quality (0=best) (default:%d)\n", vbrqualDef);
+ printf(" -q <value> specifies the MPEG algorithm quality (0-9; 0=best) (default:%d)\n", algqualDef);
printf(" --silent the output of LAME is hidden (default:disabled)\n");
printf("\nVorbis mode params:\n");
printf(" -b <rate> <rate> is the nominal bitrate (default:unset)\n");
printf(" -m <rate> <rate> is the minimum bitrate (default:unset)\n");
printf(" -M <rate> <rate> is the maximum bitrate (default:unset)\n");
- printf(" -q <value> specifies the value (0 - 10) of VBR quality (10=best) (default:%i)\n", oggqualDef);
+ printf(" -q <value> specifies the value (0 - 10) of VBR quality (10=best) (default:%d)\n", oggqualDef);
printf(" --silent the output of oggenc is hidden (default:disabled)\n");
printf("\nFlac mode params:\n");
Index: extract_loom_tg16.c
===================================================================
RCS file: /cvsroot/scummvm/tools/extract_loom_tg16.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- extract_loom_tg16.c 24 Dec 2004 02:10:20 -0000 1.1
+++ extract_loom_tg16.c 24 Dec 2004 17:28:01 -0000 1.2
@@ -929,7 +929,7 @@
break;
#endif
default:
- debug("extract_resource - unknown resource type %i specified!",res->type);
+ debug("extract_resource - unknown resource type %d specified!",res->type);
}
}
@@ -1217,7 +1217,7 @@
lfl_index.sound_addr[entry - res_sounds] = (unsigned short)ftell(output);
break;
default:
- debug("Unknown resource type %i detected in LFL index!",entry->type);
+ debug("Unknown resource type %d detected in LFL index!",entry->type);
break;
}
extract_resource(input,output,entry);
@@ -1297,15 +1297,15 @@
dump_resource(input,"globdata.dmp",0,&res_globdata);
dump_resource(input,"charset.dmp",0,&res_charset);
for (i = 0; i < NUM_UNKNOWNS; i++)
- dump_resource(input,"unk-%i.dmp",i,&res_unknowns[i]);
+ dump_resource(input,"unk-%d.dmp",i,&res_unknowns[i]);
for (i = 0; i < NUM_ROOMS; i++)
- dump_resource(input,"room-%i.dmp",i,&res_rooms[i]);
+ dump_resource(input,"room-%d.dmp",i,&res_rooms[i]);
for (i = 0; i < NUM_COSTUMES; i++)
- dump_resource(input,"costume-%i.dmp",i,&res_costumes[i]);
+ dump_resource(input,"costume-%d.dmp",i,&res_costumes[i]);
for (i = 0; i < NUM_SCRIPTS; i++)
- dump_resource(input,"script-%i.dmp",i,&res_scripts[i]);
+ dump_resource(input,"script-%d.dmp",i,&res_scripts[i]);
for (i = 0; i < NUM_SOUNDS; i++)
- dump_resource(input,"sound-%i.dmp",i,&res_sounds[i]);
+ dump_resource(input,"sound-%d.dmp",i,&res_sounds[i]);
#endif /* MAKE_LFLS */
debug("All done!");
return 0;
Index: extract_mm_nes.c
===================================================================
RCS file: /cvsroot/scummvm/tools/extract_mm_nes.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- extract_mm_nes.c 24 Dec 2004 02:10:20 -0000 1.1
+++ extract_mm_nes.c 24 Dec 2004 17:28:01 -0000 1.2
@@ -615,7 +615,7 @@
}
}
}
- else error("extract_resource - unknown sound type %i/%i detected",val,cnt);
+ else error("extract_resource - unknown sound type %d/%d detected",val,cnt);
_assert(ftell(input) - r_offset(res) - 16 == r_length(res),"extract_resource - length mismatch while extracting sound resource (was %04X, should be %04X)",ftell(input) - r_offset(res) - 16,r_length(res));
break;
case RES_COSTUME:
@@ -630,7 +630,7 @@
write_byte(output,read_byte(input));
break;
default:
- error("extract_resource - unknown resource type %i specified!",res->type);
+ error("extract_resource - unknown resource type %d specified!",res->type);
}
}
@@ -916,27 +916,27 @@
#else /* !MAKE_LFLS */
dump_resource(input,"globdata.dmp",0,&res_globdata);
for (i = 0; i < 40; i++)
- dump_resource(input,"roomgfx-%i.dmp",i,&res_roomgfx[i]);
+ dump_resource(input,"roomgfx-%d.dmp",i,&res_roomgfx[i]);
for (i = 0; i < 2; i++)
- dump_resource(input,"costumegfx-%i.dmp",i,&res_costumegfx[i]);
+ dump_resource(input,"costumegfx-%d.dmp",i,&res_costumegfx[i]);
for (i = 0; i < 55; i++)
- dump_resource(input,"room-%i.dmp",i,&res_rooms[i]);
+ dump_resource(input,"room-%d.dmp",i,&res_rooms[i]);
for (i = 0; i < 179; i++)
- dump_resource(input,"script-%i.dmp",i,&res_scripts[i]);
+ dump_resource(input,"script-%d.dmp",i,&res_scripts[i]);
for (i = 0; i < 82; i++)
- dump_resource(input,"sound-%i.dmp",i,&res_sounds[i]);
+ dump_resource(input,"sound-%d.dmp",i,&res_sounds[i]);
for (i = 0; i < 25; i++)
- dump_resource(input,"costume-%i.dmp",i,&res_costumes[i]);
+ dump_resource(input,"costume-%d.dmp",i,&res_costumes[i]);
for (i = 0; i < 2; i++)
- dump_resource(input,"costumepal-%i.dmp",i,&res_palettes[i]);
+ dump_resource(input,"costumepal-%d.dmp",i,&res_palettes[i]);
for (i = 0; i < 2; i++)
- dump_resource(input,"cost_DD75-%i.dmp",i,&res_unk_DD75[i]);
+ dump_resource(input,"cost_DD75-%d.dmp",i,&res_unk_DD75[i]);
for (i = 0; i < 2; i++)
- dump_resource(input,"cost_DD7D-%i.dmp",i,&res_unk_DD7D[i]);
+ dump_resource(input,"cost_DD7D-%d.dmp",i,&res_unk_DD7D[i]);
for (i = 0; i < 2; i++)
- dump_resource(input,"cost_DD95-%i.dmp",i,&res_unk_DD95[i]);
+ dump_resource(input,"cost_DD95-%d.dmp",i,&res_unk_DD95[i]);
for (i = 0; i < 2; i++)
- dump_resource(input,"cost_DD9D-%i.dmp",i,&res_unk_DD9D[i]);
+ dump_resource(input,"cost_DD9D-%d.dmp",i,&res_unk_DD9D[i]);
#endif /* MAKE_LFLS */
debug("All done!");
- Previous message: [Scummvm-cvs-logs] CVS: tools compress.c,1.1,1.2
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actionmap.cpp,1.31,1.32 actionmap.h,1.14,1.15 actor.cpp,1.52,1.53 actor.h,1.25,1.26 console.cpp,1.22,1.23 console.h,1.8,1.9 interface.cpp,1.42,1.43 objectmap.cpp,1.29,1.30 objectmap.h,1.13,1.14 saga.h,1.53,1.54 scene.cpp,1.61,1.62 scene.h,1.24,1.25 script.h,1.33,1.34 sfuncs.cpp,1.51,1.52 sthread.cpp,1.48,1.49
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list