Use integer value for game stepping

This commit is contained in:
gm-matthew 2024-05-02 23:25:53 +01:00
parent 944e4855d9
commit 39dc16d8ba
2 changed files with 11 additions and 10 deletions

View file

@ -1017,7 +1017,7 @@ UINT8 CModel3::Read8(UINT32 addr)
// 53C810 SCSI // 53C810 SCSI
case 0xC0: // only on Step 1.x case 0xC0: // only on Step 1.x
#ifndef NET_BOARD #ifndef NET_BOARD
if (m_game.stepping != "1.0" && m_game.stepping != "1.5") if (m_stepping > 0x15)
{ {
//printf("Model3 : Read8 %x\n", addr); //printf("Model3 : Read8 %x\n", addr);
break; break;
@ -1049,7 +1049,7 @@ UINT8 CModel3::Read8(UINT32 addr)
break; break;
} }
} }
else if (m_game.stepping != "1.0" && m_game.stepping != "1.5") break; else if (m_stepping > 0x15) break;
#endif #endif
case 0xF9: case 0xF9:
case 0xC1: case 0xC1:
@ -1311,7 +1311,7 @@ UINT32 CModel3::Read32(UINT32 addr)
// 53C810 SCSI // 53C810 SCSI
case 0xC0: // only on Step 1.x case 0xC0: // only on Step 1.x
#ifndef NET_BOARD #ifndef NET_BOARD
if (m_game.stepping != "1.0" && m_game.stepping != "1.5") // check for Step 1.x if (m_stepping > 0x15) // check for Step 1.x
break; break;
#endif #endif
#ifdef NET_BOARD #ifdef NET_BOARD
@ -1346,7 +1346,7 @@ UINT32 CModel3::Read32(UINT32 addr)
} }
} }
else if (m_game.stepping != "1.0" && m_game.stepping != "1.5") break; else if (m_stepping > 0x15) break;
#endif #endif
case 0xF9: case 0xF9:
case 0xC1: case 0xC1:
@ -1468,7 +1468,7 @@ void CModel3::Write8(UINT32 addr, UINT8 data)
// 53C810 SCSI // 53C810 SCSI
case 0xC0: // only on Step 1.x case 0xC0: // only on Step 1.x
#ifndef NET_BOARD #ifndef NET_BOARD
if (m_game.stepping != "1.0" && m_game.stepping != "1.5") if (m_stepping > 0x15)
goto Unknown8; goto Unknown8;
#endif #endif
#ifdef NET_BOARD #ifdef NET_BOARD
@ -1503,7 +1503,7 @@ void CModel3::Write8(UINT32 addr, UINT8 data)
break; break;
} }
else if (m_game.stepping != "1.0" && m_game.stepping != "1.5") break; else if (m_stepping > 0x15) break;
#endif #endif
case 0xF9: case 0xF9:
case 0xC1: case 0xC1:
@ -1790,7 +1790,7 @@ void CModel3::Write32(UINT32 addr, UINT32 data)
// 53C810 SCSI // 53C810 SCSI
case 0xC0: // step 1.x only case 0xC0: // step 1.x only
#ifndef NET_BOARD #ifndef NET_BOARD
if (m_game.stepping != "1.0" && m_game.stepping != "1.5") if (m_stepping > 0x15)
goto Unknown32; goto Unknown32;
#endif #endif
#ifdef NET_BOARD #ifdef NET_BOARD
@ -1825,7 +1825,7 @@ void CModel3::Write32(UINT32 addr, UINT32 data)
break; break;
} }
else if (m_game.stepping != "1.0" && m_game.stepping != "1.5") break; else if (m_stepping > 0x15) break;
#endif #endif
case 0xF9: case 0xF9:
case 0xC1: case 0xC1:
@ -2979,8 +2979,8 @@ bool CModel3::LoadGame(const Game &game, const ROMSet &rom_set)
ppc_set_fetch(PPCFetchRegions); ppc_set_fetch(PPCFetchRegions);
// Initialize Real3D // Initialize Real3D
int stepping = ((game.stepping[0] - '0') << 4) | (game.stepping[2] - '0'); m_stepping = ((game.stepping[0] - '0') << 4) | (game.stepping[2] - '0');
GPU.SetStepping(stepping); GPU.SetStepping(m_stepping);
// MPEG board (if present) // MPEG board (if present)
if (rom_set.get_rom("mpeg_program").size) if (rom_set.get_rom("mpeg_program").size)

View file

@ -239,6 +239,7 @@ private:
// Game and hardware information // Game and hardware information
Game m_game; Game m_game;
int m_stepping;
// Game inputs and outputs // Game inputs and outputs
CInputs *Inputs; CInputs *Inputs;