diff options
Diffstat (limited to 'PE')
-rw-r--r-- | PE/compil.lex | 6 | ||||
-rw-r--r-- | PE/extract-rooms.cpp | 2 | ||||
-rw-r--r-- | PE/extract-various.cpp | 4 | ||||
-rw-r--r-- | PE/extract.cpp | 2 | ||||
-rw-r--r-- | PE/groupe-01.txt | 22 | ||||
-rw-r--r-- | PE/groupe-02.txt | 6 | ||||
-rw-r--r-- | PE/groupe-03.txt | 8 | ||||
-rw-r--r-- | PE/groupe-04.txt | 6 | ||||
-rw-r--r-- | PE/groupe-05.txt | 14 | ||||
-rw-r--r-- | PE/groupe-06.txt | 8 | ||||
-rw-r--r-- | PE/groupe-07.txt | 2 | ||||
-rw-r--r-- | PE/groupe-08.txt | 2 | ||||
-rw-r--r-- | PE/groupe-09.txt | 8 | ||||
-rw-r--r-- | PE/groupe-10.txt | 2 | ||||
-rw-r--r-- | PE/groupe-11.txt | 6 | ||||
-rw-r--r-- | PE/groupe-12.txt | 8 | ||||
-rw-r--r-- | PE/groupe-13.txt | 22 | ||||
-rw-r--r-- | PE/groupe-14.txt | 8 | ||||
-rw-r--r-- | PE/groupe-15.txt | 2 | ||||
-rw-r--r-- | PE/groupe-16.txt | 4 | ||||
-rw-r--r-- | PE/groupe-17.txt | 8 | ||||
-rw-r--r-- | PE/groupe-18.txt | 2 | ||||
-rw-r--r-- | PE/groupe-19.txt | 12 | ||||
-rw-r--r-- | PE/groupe-20.txt | 4 | ||||
-rw-r--r-- | PE/nmakefile | 2 | ||||
-rw-r--r-- | PE/reinsert.cpp | 2 |
26 files changed, 89 insertions, 83 deletions
diff --git a/PE/compil.lex b/PE/compil.lex index f5c6d22..91fe11d 100644 --- a/PE/compil.lex +++ b/PE/compil.lex @@ -67,14 +67,14 @@ } if (!trouve) { - fprintf(stderr, "Caractère inconnu: %s\n", yytext); + fprintf(stderr, "Caractère inconnu ligne %i: %s\n", yylineno, yytext);
} } %% int yywrap(void) { - return 0; + exit(0); } int main(int argc, char ** argv) { @@ -94,5 +94,5 @@ int main(int argc, char ** argv) { } fprintf(stderr, "Creating file %s\n", argv[1]); yylex(); - exit(0); + return 0; } diff --git a/PE/extract-rooms.cpp b/PE/extract-rooms.cpp index bb28e7f..d7148ff 100644 --- a/PE/extract-rooms.cpp +++ b/PE/extract-rooms.cpp @@ -32,6 +32,8 @@ virtual int startup() throw (GeneralException) { unsigned long orig, pos, truesize, ptr, sig, size; int found, empty; + verbosity = M_INFO; + f = new Input("slus_006.62"); f->seek(offset); diff --git a/PE/extract-various.cpp b/PE/extract-various.cpp index 6a73f42..9a68a3d 100644 --- a/PE/extract-various.cpp +++ b/PE/extract-various.cpp @@ -12,7 +12,9 @@ virtual int startup() throw (GeneralException) { unsigned int c, b, i, j, size, n, changed; unsigned short p, t; String fn; - + + verbosity = M_INFO; + for (c = 0; c < 6;) { b = f->readU8(); if (b <= MAXCHAR) { diff --git a/PE/extract.cpp b/PE/extract.cpp index daabb24..4fa8b2f 100644 --- a/PE/extract.cpp +++ b/PE/extract.cpp @@ -18,6 +18,8 @@ virtual int startup() throw (GeneralException) { int n1 = 0, n2 = 0, i, j, size; String fn; char buff[2048]; + + verbosity = M_INFO; s = new Input("slus_006.62"); diff --git a/PE/groupe-01.txt b/PE/groupe-01.txt index 4fdc124..a9cabc8 100644 --- a/PE/groupe-01.txt +++ b/PE/groupe-01.txt @@ -1,31 +1,31 @@ -0 1 2 3 4 5 -8 +6 9 10 11 12 13 -15 +14 16 17 -19 +18 20 21 22 23 24 -48 +25 49 -318 -358 -366 -371 +50 +319 +359 +367 372 -376 +373 377 -430 +378 +431 diff --git a/PE/groupe-02.txt b/PE/groupe-02.txt index dd29cf3..b3bb53f 100644 --- a/PE/groupe-02.txt +++ b/PE/groupe-02.txt @@ -1,4 +1,3 @@ -25 26 27 28 @@ -7,5 +6,6 @@ 31 32 33 -333 -347 +34 +334 +348 diff --git a/PE/groupe-03.txt b/PE/groupe-03.txt index d02dd2c..eb69951 100644 --- a/PE/groupe-03.txt +++ b/PE/groupe-03.txt @@ -1,10 +1,10 @@ -34 35 36 37 38 39 -258 -350 +40 +259 351 -359 +352 +360 diff --git a/PE/groupe-04.txt b/PE/groupe-04.txt index 8d6c934..45d94b8 100644 --- a/PE/groupe-04.txt +++ b/PE/groupe-04.txt @@ -1,12 +1,12 @@ -40 41 42 -44 +43 45 46 -50 +47 51 52 53 54 55 +56 diff --git a/PE/groupe-05.txt b/PE/groupe-05.txt index 9fd30cd..3685a20 100644 --- a/PE/groupe-05.txt +++ b/PE/groupe-05.txt @@ -1,12 +1,11 @@ -43 -47 -97 +44 +48 98 99 -101 +100 102 103 -105 +104 106 107 108 @@ -19,9 +18,10 @@ 115 116 117 -119 +118 120 121 122 123 -336 +124 +337 diff --git a/PE/groupe-06.txt b/PE/groupe-06.txt index 109fb9a..28ffb57 100644 --- a/PE/groupe-06.txt +++ b/PE/groupe-06.txt @@ -1,4 +1,3 @@ -56 57 58 59 @@ -22,7 +21,7 @@ 77 78 79 -81 +80 82 83 84 @@ -30,5 +29,6 @@ 86 87 88 -357 -373 +89 +358 +374 diff --git a/PE/groupe-07.txt b/PE/groupe-07.txt index d15a2cc..d88e313 100644 --- a/PE/groupe-07.txt +++ b/PE/groupe-07.txt @@ -1 +1 @@ -80 +81 diff --git a/PE/groupe-08.txt b/PE/groupe-08.txt index 95d25e1..9c000ee 100644 --- a/PE/groupe-08.txt +++ b/PE/groupe-08.txt @@ -1,4 +1,3 @@ -89 90 91 92 @@ -6,3 +5,4 @@ 94 95 96 +97 diff --git a/PE/groupe-09.txt b/PE/groupe-09.txt index 06b600f..962a41d 100644 --- a/PE/groupe-09.txt +++ b/PE/groupe-09.txt @@ -1,4 +1,3 @@ -124 125 126 127 @@ -34,7 +33,7 @@ 157 158 159 -319 +160 320 321 322 @@ -47,6 +46,7 @@ 329 330 331 -338 -379 +332 +339 380 +381 diff --git a/PE/groupe-10.txt b/PE/groupe-10.txt index ce9c994..eda4c5f 100644 --- a/PE/groupe-10.txt +++ b/PE/groupe-10.txt @@ -1,5 +1,5 @@ -160 161 162 163 164 +165 diff --git a/PE/groupe-11.txt b/PE/groupe-11.txt index b45f6fb..483b409 100644 --- a/PE/groupe-11.txt +++ b/PE/groupe-11.txt @@ -1,4 +1,3 @@ -165 166 167 168 @@ -9,7 +8,7 @@ 173 174 175 -177 +176 178 179 180 @@ -22,4 +21,5 @@ 187 188 189 -432 +190 +433 diff --git a/PE/groupe-12.txt b/PE/groupe-12.txt index 048e4e7..79b487b 100644 --- a/PE/groupe-12.txt +++ b/PE/groupe-12.txt @@ -1,5 +1,3 @@ -190 -220 -232 -238 -255 +191 +239 +256 diff --git a/PE/groupe-13.txt b/PE/groupe-13.txt index 06bde55..2fc5a3e 100644 --- a/PE/groupe-13.txt +++ b/PE/groupe-13.txt @@ -1,7 +1,6 @@ -191 192 193 -195 +194 196 197 198 @@ -13,7 +12,7 @@ 204 205 206 -208 +207 209 210 211 @@ -25,7 +24,7 @@ 217 218 219 -221 +220 222 223 224 @@ -33,14 +32,14 @@ 226 227 228 -230 +229 231 -233 +232 234 235 236 237 -239 +238 240 241 242 @@ -56,14 +55,15 @@ 252 253 254 -256 +255 257 -339 +258 340 341 342 343 344 345 -370 -378 +346 +371 +379 diff --git a/PE/groupe-14.txt b/PE/groupe-14.txt index 20187c2..cf57d8f 100644 --- a/PE/groupe-14.txt +++ b/PE/groupe-14.txt @@ -1,9 +1,9 @@ -259 -261 +260 262 -264 +263 265 266 267 268 -332 +269 +333 diff --git a/PE/groupe-15.txt b/PE/groupe-15.txt index 591da49..05fac93 100644 --- a/PE/groupe-15.txt +++ b/PE/groupe-15.txt @@ -1,2 +1,2 @@ -270 271 +272 diff --git a/PE/groupe-16.txt b/PE/groupe-16.txt index f3fa8d2..509bc91 100644 --- a/PE/groupe-16.txt +++ b/PE/groupe-16.txt @@ -1,2 +1,2 @@ -272 -431 +273 +432 diff --git a/PE/groupe-17.txt b/PE/groupe-17.txt index bcd1100..1a51030 100644 --- a/PE/groupe-17.txt +++ b/PE/groupe-17.txt @@ -1,6 +1,5 @@ -274 275 -277 +276 278 279 280 @@ -10,10 +9,11 @@ 284 285 286 -349 -424 +287 +350 425 426 427 428 429 +430 diff --git a/PE/groupe-18.txt b/PE/groupe-18.txt index 209ac45..ea80947 100644 --- a/PE/groupe-18.txt +++ b/PE/groupe-18.txt @@ -1 +1 @@ -287 +288 diff --git a/PE/groupe-19.txt b/PE/groupe-19.txt index 067126b..ae57c92 100644 --- a/PE/groupe-19.txt +++ b/PE/groupe-19.txt @@ -1,4 +1,3 @@ -289 290 291 292 @@ -27,12 +26,12 @@ 315 316 317 -334 -382 +318 +335 383 384 385 -387 +386 388 389 390 @@ -59,7 +58,7 @@ 411 412 413 -415 +414 416 417 418 @@ -68,7 +67,8 @@ 421 422 423 -433 +424 434 435 436 +437 diff --git a/PE/groupe-20.txt b/PE/groupe-20.txt index 7dd0c6f..83f9b2f 100644 --- a/PE/groupe-20.txt +++ b/PE/groupe-20.txt @@ -1,2 +1,2 @@ -346 -381 +347 +382 diff --git a/PE/nmakefile b/PE/nmakefile index 58d0230..ceca938 100644 --- a/PE/nmakefile +++ b/PE/nmakefile @@ -9,7 +9,7 @@ _LIBS = "..\MSVC\Baltisot - generic\Release\Baltisot - generic.lib" "..\MSVC\PSX #------------------------------------------------------------------
-TARGETS = extract.exe extract-rooms.exe extract-various.exe reinsert.exe compil.c compil.exe
+TARGETS = extract.exe extract-rooms.exe extract-various.exe reinsert.exe compil.c compil.exe compilall.exe
all : $(TARGETS)
diff --git a/PE/reinsert.cpp b/PE/reinsert.cpp index 1c6530b..61372aa 100644 --- a/PE/reinsert.cpp +++ b/PE/reinsert.cpp @@ -14,6 +14,8 @@ virtual int startup() throw (GeneralException) { Handle * iw; cdutils * cd; + verbosity = M_INFO; + ir = new Input("PE1.bin"); iw = new Output("PE1.bin", 0, 0); cd = new cdutils(ir, iw); |