Ticket #7938: warning-cleanup.diff
File warning-cleanup.diff, 7.4 KB (added by , 23 years ago) |
---|
-
actor.cpp
diff -u -r -x CVS scummvm-curr/actor.cpp scummvm/actor.cpp
old new 378 378 initActorCostumeData(a); 379 379 380 380 if (frame!=0x3E) { 381 cost_decodeData(a, frame, -1);381 cost_decodeData(a, frame, (uint) -1); 382 382 } 383 383 } 384 384 -
script_v2.cpp
Only in scummvm-curr: dc diff -u -r -x CVS scummvm-curr/script_v2.cpp scummvm/script_v2.cpp
old new 2486 2486 warning("o6_miscOps: stub11(%d)", args[1]); 2487 2487 break; 2488 2488 case 12: 2489 setCursorImg(args[1], -1, args[2]);2489 setCursorImg(args[1], (uint) -1, args[2]); 2490 2490 break; 2491 2491 case 13: 2492 2492 warning("o6_miscOps: stub13(%d,%d,%d,%d)",args[1],args[2],args[3],args[4]); -
sound/fmopl.cpp
diff -u -r -x CVS scummvm-curr/sound/fmopl.cpp scummvm/sound/fmopl.cpp
old new 97 97 98 98 /* key scale level */ 99 99 /* table is 3dB/OCT , DV converts this in TL step at 6dB/OCT */ 100 #define DV (EG_STEP/2) 100 101 #define SC(mydb) ((UINT32) (mydb / (EG_STEP/2))) 102 101 103 static const UINT32 KSL_TABLE[8*16]= 102 104 { 103 105 /* OCT 0 */ 104 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,105 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,106 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,107 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,106 SC(0.000), SC(0.000), SC(0.000), SC(0.000), 107 SC(0.000), SC(0.000), SC(0.000), SC(0.000), 108 SC(0.000), SC(0.000), SC(0.000), SC(0.000), 109 SC(0.000), SC(0.000), SC(0.000), SC(0.000), 108 110 /* OCT 1 */ 109 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,110 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,111 0.000/DV, 0.750/DV, 1.125/DV, 1.500/DV,112 1.875/DV, 2.250/DV, 2.625/DV, 3.000/DV,111 SC(0.000), SC(0.000), SC(0.000), SC(0.000), 112 SC(0.000), SC(0.000), SC(0.000), SC(0.000), 113 SC(0.000), SC(0.750), SC(1.125), SC(1.500), 114 SC(1.875), SC(2.250), SC(2.625), SC(3.000), 113 115 /* OCT 2 */ 114 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,115 0.000/DV, 1.125/DV, 1.875/DV, 2.625/DV,116 3.000/DV, 3.750/DV, 4.125/DV, 4.500/DV,117 4.875/DV, 5.250/DV, 5.625/DV, 6.000/DV,116 SC(0.000), SC(0.000), SC(0.000), SC(0.000), 117 SC(0.000), SC(1.125), SC(1.875), SC(2.625), 118 SC(3.000), SC(3.750), SC(4.125), SC(4.500), 119 SC(4.875), SC(5.250), SC(5.625), SC(6.000), 118 120 /* OCT 3 */ 119 0.000/DV, 0.000/DV, 0.000/DV, 1.875/DV,120 3.000/DV, 4.125/DV, 4.875/DV, 5.625/DV,121 6.000/DV, 6.750/DV, 7.125/DV, 7.500/DV,122 7.875/DV, 8.250/DV, 8.625/DV, 9.000/DV,121 SC(0.000), SC(0.000), SC(0.000), SC(1.875), 122 SC(3.000), SC(4.125), SC(4.875), SC(5.625), 123 SC(6.000), SC(6.750), SC(7.125), SC(7.500), 124 SC(7.875), SC(8.250), SC(8.625), SC(9.000), 123 125 /* OCT 4 */ 124 0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV,125 6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV,126 9.000/DV, 9.750/DV,10.125/DV,10.500/DV,127 10.875/DV,11.250/DV,11.625/DV,12.000/DV,126 SC(0.000), SC(0.000), SC(3.000), SC(4.875), 127 SC(6.000), SC(7.125), SC(7.875), SC(8.625), 128 SC(9.000), SC(9.750), SC(10.125),SC(10.500), 129 SC(10.875),SC(11.250),SC(11.625),SC(12.000), 128 130 /* OCT 5 */ 129 0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV,130 9.000/DV,10.125/DV,10.875/DV,11.625/DV,131 12.000/DV,12.750/DV,13.125/DV,13.500/DV,132 13.875/DV,14.250/DV,14.625/DV,15.000/DV,131 SC(0.000), SC(3.000), SC(6.000), SC(7.875), 132 SC(9.000), SC(10.125),SC(10.875),SC(11.625), 133 SC(12.000),SC(12.750),SC(13.125),SC(13.500), 134 SC(13.875),SC(14.250),SC(14.625),SC(15.000), 133 135 /* OCT 6 */ 134 0.000/DV, 6.000/DV, 9.000/DV,10.875/DV,135 12.000/DV,13.125/DV,13.875/DV,14.625/DV,136 15.000/DV,15.750/DV,16.125/DV,16.500/DV,137 16.875/DV,17.250/DV,17.625/DV,18.000/DV,136 SC(0.000), SC(6.000), SC(9.000), SC(10.875), 137 SC(12.000),SC(13.125),SC(13.875),SC(14.625), 138 SC(15.000),SC(15.750),SC(16.125),SC(16.500), 139 SC(16.875),SC(17.250),SC(17.625),SC(18.000), 138 140 /* OCT 7 */ 139 0.000/DV, 9.000/DV,12.000/DV,13.875/DV,140 15.000/DV,16.125/DV,16.875/DV,17.625/DV,141 18.000/DV,18.750/DV,19.125/DV,19.500/DV,142 19.875/DV,20.250/DV,20.625/DV,21.000/DV141 SC(0.000), SC(9.000), SC(12.000),SC(13.875), 142 SC(15.000),SC(16.125),SC(16.875),SC(17.625), 143 SC(18.000),SC(18.750),SC(19.125),SC(19.500), 144 SC(19.875),SC(20.250),SC(20.625),SC(21.000) 143 145 }; 144 #undef DV146 #undef SC 145 147 146 148 /* sustain lebel table (3db per step) */ 147 149 /* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/ 148 #define SC(db) ( db*((3/EG_STEP)*(1<<ENV_BITS)))+EG_DST150 #define SC(db) ((int) (db*((3/EG_STEP)*(1<<ENV_BITS)))+EG_DST) 149 151 static const INT32 SL_TABLE[16]={ 150 152 SC( 0),SC( 1),SC( 2),SC(3 ),SC(4 ),SC(5 ),SC(6 ),SC( 7), 151 153 SC( 8),SC( 9),SC(10),SC(11),SC(12),SC(13),SC(14),SC(31) … … 371 373 int ksl = v>>6; /* 0 / 1.5 / 3 / 6 db/OCT */ 372 374 373 375 SLOT->ksl = ksl ? 3-ksl : 31; 374 SLOT->TL = ( v&0x3f)*(0.75/EG_STEP); /* 0.75db step */376 SLOT->TL = (INT32) ((v&0x3f)*(0.75/EG_STEP)); /* 0.75db step */ 375 377 376 378 if( !(OPL->mode&0x80) ) 377 379 { /* not CSM latch total level */ … … 462 464 INLINE void OPL_CALC_RH( OPL_CH *CH ) 463 465 { 464 466 UINT32 env_tam,env_sd,env_top,env_hh; 465 int whitenoise = ( rand()&1)*(WHITE_NOISE_db/EG_STEP);467 int whitenoise = (int) ((rand()&1)*(WHITE_NOISE_db/EG_STEP)); 466 468 INT32 tone8; 467 469 468 470 OPL_SLOT *SLOT; … … 555 557 if( i < 60 ) rate *= 1.0+(i&3)*0.25; /* b0-1 : x1 , x1.25 , x1.5 , x1.75 */ 556 558 rate *= 1<<((i>>2)-1); /* b2-5 : shift bit */ 557 559 rate *= (double)(EG_ENT<<ENV_BITS); 558 OPL->AR_TABLE[i] = rate / ARRATE;559 OPL->DR_TABLE[i] = rate / DRRATE;560 OPL->AR_TABLE[i] = (int) (rate / ARRATE); 561 OPL->DR_TABLE[i] = (int) (rate / DRRATE); 560 562 } 561 563 for (i = 60;i < 76;i++) 562 564 { … … 612 614 for (s = 1;s <= SIN_ENT/4;s++){ 613 615 pom = sin(2*PI*s/SIN_ENT); /* sin */ 614 616 pom = 20*log10(1/pom); /* decibel */ 615 j = pom / EG_STEP; /* TL_TABLE steps */617 j = (int) (pom / EG_STEP); /* TL_TABLE steps */ 616 618 617 619 /* degree 0 - 90 , degree 180 - 90 : plus section */ 618 620 SIN_TABLE[ s] = SIN_TABLE[SIN_ENT/2-s] = &TL_TABLE[j]; … … 643 645 for (i=0; i<AMS_ENT; i++) 644 646 { 645 647 pom = (1.0+sin(2*PI*i/AMS_ENT))/2; /* sin */ 646 AMS_TABLE[i] = ( 1.0/EG_STEP)*pom; /* 1dB */647 AMS_TABLE[AMS_ENT+i] = ( 4.8/EG_STEP)*pom; /* 4.8dB */648 AMS_TABLE[i] = (int) ((1.0/EG_STEP)*pom); /* 1dB */ 649 AMS_TABLE[AMS_ENT+i] = (int) ((4.8/EG_STEP)*pom); /* 4.8dB */ 648 650 } 649 651 /* make LFO vibrate table */ 650 652 for (i=0; i<VIB_ENT; i++) 651 653 { 652 654 /* 100cent = 1seminote = 6% ?? */ 653 655 pom = (double)VIB_RATE*0.06*sin(2*PI*i/VIB_ENT); /* +-100sect step */ 654 VIB_TABLE[i] = VIB_RATE + (pom*0.07); /* +- 7cent */655 VIB_TABLE[VIB_ENT+i] = VIB_RATE + (pom*0.14); /* +-14cent */656 VIB_TABLE[i] = (int) (VIB_RATE + (pom*0.07)); /* +- 7cent */ 657 VIB_TABLE[VIB_ENT+i] = (int) (VIB_RATE + (pom*0.14)); /* +-14cent */ 656 658 /* LOG(LOG_INF,("vib %d=%d\n",i,VIB_TABLE[VIB_ENT+i])); */ 657 659 } 658 660 return 1; … … 698 700 /* make fnumber -> increment counter table */ 699 701 for( fn=0 ; fn < 1024 ; fn++ ) 700 702 { 701 OPL->FN_TABLE[fn] = OPL->freqbase * fn * FREQ_RATE * (1<<7) / 2;703 OPL->FN_TABLE[fn] = (int) (OPL->freqbase * fn * FREQ_RATE * (1<<7) / 2); 702 704 } 703 705 /* LFO freq.table */ 704 OPL->amsIncr = OPL->rate ? (double)AMS_ENT*(1<<AMS_SHIFT) / OPL->rate * 3.7 * ((double)OPL->clock/3600000) : 0;705 OPL->vibIncr = OPL->rate ? (double)VIB_ENT*(1<<VIB_SHIFT) / OPL->rate * 6.4 * ((double)OPL->clock/3600000) : 0;706 OPL->amsIncr = (INT32) (OPL->rate ? (double)AMS_ENT*(1<<AMS_SHIFT) / OPL->rate * 3.7 * ((double)OPL->clock/3600000) : 0); 707 OPL->vibIncr = (INT32) (OPL->rate ? (double)VIB_ENT*(1<<VIB_SHIFT) / OPL->rate * 6.4 * ((double)OPL->clock/3600000) : 0); 706 708 } 707 709 708 710 /* ---------- write a OPL registers ---------- */