diff -ur scummvm-0.8.2.original//sound/adpcm.cpp scummvm-0.8.2/sound/adpcm.cpp
old
|
new
|
|
142 | 142 | |
143 | 143 | // Decode Linear to ADPCM |
144 | 144 | int16 ADPCMInputStream::decodeOKI(byte code) { |
145 | | int16 diff, E, SS, samp; |
| 145 | int16 diff, E, SS_, samp; |
146 | 146 | |
147 | | SS = okiStepSize[_status.stepIndex]; |
148 | | E = SS/8; |
| 147 | SS_ = okiStepSize[_status.stepIndex]; |
| 148 | E = SS_/8; |
149 | 149 | if (code & 0x01) |
150 | | E += SS/4; |
| 150 | E += SS_/4; |
151 | 151 | if (code & 0x02) |
152 | | E += SS/2; |
| 152 | E += SS_/2; |
153 | 153 | if (code & 0x04) |
154 | | E += SS; |
| 154 | E += SS_; |
155 | 155 | diff = (code & 0x08) ? -E : E; |
156 | 156 | samp = _status.last + diff; |
157 | 157 | |
… |
… |
|
189 | 189 | }; |
190 | 190 | |
191 | 191 | int16 ADPCMInputStream::decodeMSIMA(byte code) { |
192 | | int32 diff, E, SS, samp; |
| 192 | int32 diff, E, SS_, samp; |
193 | 193 | |
194 | | SS = imaStepTable[_status.stepIndex]; |
195 | | E = SS >> 3; |
| 194 | SS_ = imaStepTable[_status.stepIndex]; |
| 195 | E = SS_ >> 3; |
196 | 196 | if (code & 0x04) |
197 | | E += SS; |
| 197 | E += SS_; |
198 | 198 | if (code & 0x02) |
199 | | E += SS >> 1; |
| 199 | E += SS_ >> 1; |
200 | 200 | if (code & 0x01) |
201 | | E += SS >> 2; |
| 201 | E += SS_ >> 2; |
202 | 202 | diff = (code & 0x08) ? -E : E; |
203 | 203 | samp = _status.last + diff; |
204 | 204 | |
diff -ur scummvm-0.8.2.original//sword1/router.cpp scummvm-0.8.2/sword1/router.cpp
old
|
new
|
|
289 | 289 | int32 dSD; |
290 | 290 | int32 dDS; |
291 | 291 | int32 dDD; |
292 | | int32 SS; |
293 | | int32 SD; |
294 | | int32 DS; |
295 | | int32 DD; |
| 292 | int32 SS_; |
| 293 | int32 SD_; |
| 294 | int32 DS_; |
| 295 | int32 DD_; |
296 | 296 | int32 i; |
297 | 297 | int32 j; |
298 | 298 | int32 temp; |
… |
… |
|
367 | 367 | dDD = dDS; |
368 | 368 | } |
369 | 369 | // rate each option |
370 | | SS = dS + dSS + 3; // Split routes look crap so weight against them |
371 | | SD = dS + dDD; |
372 | | DS = dD + dSS; |
373 | | DD = dD + dDD + 3; |
| 370 | SS_ = dS + dSS + 3; // Split routes look crap so weight against them |
| 371 | SD_ = dS + dDD; |
| 372 | DS_ = dD + dSS; |
| 373 | DD_ = dD + dDD + 3; |
374 | 374 | // set up turns as a sorted array of the turn values |
375 | | tempturns[0] = SS; |
| 375 | tempturns[0] = SS_; |
376 | 376 | turns[0] = 0; |
377 | | tempturns[1] = SD; |
| 377 | tempturns[1] = SD_; |
378 | 378 | turns[1] = 1; |
379 | | tempturns[2] = DS; |
| 379 | tempturns[2] = DS_; |
380 | 380 | turns[2] = 2; |
381 | | tempturns[3] = DD; |
| 381 | tempturns[3] = DD_; |
382 | 382 | turns[3] = 3; |
383 | 383 | i = 0; |
384 | 384 | do |
diff -ur scummvm-0.8.2.original//sword2/router.cpp scummvm-0.8.2/sword2/router.cpp
old
|
new
|
|
414 | 414 | // Rate each option. Split routes look crap so weight against |
415 | 415 | // them |
416 | 416 | |
417 | | int32 SS = dS + dSS + 3; |
418 | | int32 SD = dS + dDD; |
419 | | int32 DS = dD + dSS; |
420 | | int32 DD = dD + dDD + 3; |
| 417 | int32 SS_ = dS + dSS + 3; |
| 418 | int32 SD_ = dS + dDD; |
| 419 | int32 DS_ = dD + dSS; |
| 420 | int32 DD_ = dD + dDD + 3; |
421 | 421 | |
422 | 422 | // set up turns as a sorted array of the turn values |
423 | 423 | |
424 | | tempturns[0] = SS; |
| 424 | tempturns[0] = SS_; |
425 | 425 | turns[0] = 0; |
426 | | tempturns[1] = SD; |
| 426 | tempturns[1] = SD_; |
427 | 427 | turns[1] = 1; |
428 | | tempturns[2] = DS; |
| 428 | tempturns[2] = DS_; |
429 | 429 | turns[2] = 2; |
430 | | tempturns[3] = DD; |
| 430 | tempturns[3] = DD_; |
431 | 431 | turns[3] = 3; |
432 | 432 | |
433 | 433 | for (i = 0; i < 3; i++) { |