Silence some warnings

This commit is contained in:
twinaphex 2017-02-18 03:49:00 +01:00
parent 9710b8f7fc
commit 0426742e74
3 changed files with 28 additions and 18 deletions

View File

@ -4523,16 +4523,18 @@ static void FxReset (struct FxInfo_s *psFxInfo)
void S9xResetSuperFX (void)
{
float frames_per_second;
float frames_per_second;
/* FIXME: Snes9x can't execute CPU and SuperFX at a time. Don't ask me what is 0.417 :P*/
if (Settings.PAL)frames_per_second = 50.0f;
else frames_per_second = 60.0f;
/* FIXME: Snes9x can't execute CPU and SuperFX at a time. Don't ask me what is 0.417 :P*/
if (Settings.PAL)
frames_per_second = 50.0f;
else
frames_per_second = 60.0f;
SuperFX.speedPerLine = (uint32) (Settings.SuperFXSpeedPerLine * ((1.0f / frames_per_second) / ((float) (Timings.V_Max))));
SuperFX.oneLineDone = FALSE;
SuperFX.vFlags = 0;
FxReset(&SuperFX);
SuperFX.speedPerLine = (uint32) (Settings.SuperFXSpeedPerLine * ((1.0f / frames_per_second) / ((float) (Timings.V_Max))));
SuperFX.oneLineDone = FALSE;
SuperFX.vFlags = 0;
FxReset(&SuperFX);
}
static bool8 fx_checkStartAddress (void)

View File

@ -2459,12 +2459,13 @@ void InitROM (void)
/* FORCIBLY DISABLE HIGH-RES */
if (
MATCH_NA("DONKEY KONG COUNTRY") /* Donkey Kong Country */
//|| MATCH_ID("ADNE") /* Donkey Kong Country 2 (US) */
|| MATCH_ID("AD8") /* Doom */
)
Settings.SupportHiRes = FALSE;
if (
MATCH_NA("DONKEY KONG COUNTRY") /* Donkey Kong Country */
//|| MATCH_ID("ADNE") /* Donkey Kong Country 2 (US) */
|| MATCH_ID("AD8") /* Doom */
)
Settings.SupportHiRes = FALSE;
/* DON'T RENDER SUBSCREEN */

View File

@ -543,7 +543,9 @@ void S9xSetST010 (uint32 Address, uint8 Byte)
case 0x03:
{
#ifdef FAST_LSB_WORD_ACCESS
ST010_Scale(*(int16 *) &Memory.SRAM[0x0004], *(int16 *) &Memory.SRAM[0x0000], *(int16 *) &Memory.SRAM[0x0002], (int32 *) Memory.SRAM[0x0010], (int32 *) Memory.SRAM[0x0014]);
ST010_Scale(*(int16_t*)&Memory.SRAM[0x0004], *(int16_t*)&Memory.SRAM[0x0000],
*(int16_t*)&Memory.SRAM[0x0002], (int32_t*)&Memory.SRAM[0x0010],
(int32_t*)&Memory.SRAM[0x0014]);
#else
int32 x1, y1;
@ -572,7 +574,8 @@ void S9xSetST010 (uint32 Address, uint8 Byte)
case 0x06:
{
#ifdef FAST_LSB_WORD_ACCESS
ST010_Multiply(*(int16 *) &Memory.SRAM[0x0000], *(int16 *) &Memory.SRAM[0x0002], (int32 *) Memory.SRAM[0x0010]);
ST010_Multiply(*(int16_t *)&Memory.SRAM[0x0000], *(int16_t *) &Memory.SRAM[0x0002],
(int32_t *)&Memory.SRAM[0x0010]);
#else
int32 Product;
@ -648,7 +651,9 @@ void S9xSetST010 (uint32 Address, uint8 Byte)
case 0x08:
{
#ifdef FAST_LSB_WORD_ACCESS
ST010_Rotate(*(int16 *) &Memory.SRAM[0x0004], *(int16 *) &Memory.SRAM[0x0000], *(int16 *) &Memory.SRAM[0x0002], (int16 *) Memory.SRAM[0x0010], (int16 *) Memory.SRAM[0x0012]);
ST010_Rotate(*(int16_t*)&Memory.SRAM[0x0004], *(int16_t*)&Memory.SRAM[0x0000],
*(int16_t*)&Memory.SRAM[0x0002], (int16_t*)&Memory.SRAM[0x0010],
(int16_t*)&Memory.SRAM[0x0012]);
#else
int16 x1, y1;
@ -677,7 +682,9 @@ void S9xSetST010 (uint32 Address, uint8 Byte)
Memory.SRAM[0x0007] = Memory.SRAM[0x0003];
#ifdef FAST_LSB_WORD_ACCESS
ST010_OP01(*(int16 *) &Memory.SRAM[0x0000], *(int16 *) &Memory.SRAM[0x0002], (int16 *)Memory.SRAM[0x0000], (int16 *) Memory.SRAM[0x0002], (int16 *) Memory.SRAM[0x0004], (int16 *) Memory.SRAM[0x0010]);
ST010_OP01(*(int16_t*)&Memory.SRAM[0x0000], *(int16_t*)&Memory.SRAM[0x0002],
(int16_t*)&Memory.SRAM[0x0000], (int16_t*)&Memory.SRAM[0x0002],
(int16_t*)&Memory.SRAM[0x0004], (int16_t*)&Memory.SRAM[0x0010]);
#else
ST010_OP01(ST010_WORD(0x0000), ST010_WORD(0x0002), &x1, &y1, &Quadrant, &Theta);