Index: Source/Core/Core/Src/HW/Memmap.cpp =================================================================== --- Source/Core/Core/Src/HW/Memmap.cpp (revision 5192) +++ Source/Core/Core/Src/HW/Memmap.cpp (working copy) @@ -466,7 +466,8 @@ // this could happen if a game forgot to icbi the new code u32 inst_mem = Memory::ReadUnchecked_U32(_Address); if (inst_mem != inst) - ERROR_LOG(POWERPC, "JIT: compiling outdated code. addr=%x, mem=%x, cache=%x", _Address, inst_mem, inst); + return inst_mem; + //ERROR_LOG(POWERPC, "JIT: compiling outdated code. addr=%x, mem=%x, cache=%x", _Address, inst_mem, inst); return inst; } Index: Source/Core/Core/Src/HW/MemmapFunctions.cpp =================================================================== --- Source/Core/Core/Src/HW/MemmapFunctions.cpp (revision 5192) +++ Source/Core/Core/Src/HW/MemmapFunctions.cpp (working copy) @@ -287,27 +287,21 @@ ERROR_LOG(MEMMAP,"WRITE: Cache address out of bounds (addr: %08x data: %08x)", em_address, data); /* PanicAlert("WRITE: Cache address %08x out of bounds", em_address); */ } - else if (bFakeVMEM && ((em_address &0xF0000000) == 0x70000000)) - { - // fake VMEM - *(T*)&m_pFakeVMEM[em_address & FAKEVMEM_MASK] = bswap(data); - } - else - { - // MMU - u32 tlb_addr = TranslateBlockAddress(em_address); - if (tlb_addr == 0) - { - tlb_addr = TranslatePageAddress(em_address, flag); - if (tlb_addr != 0) - *(T*)&m_pRAM[tlb_addr & RAM_MASK] = bswap(data); - else - PanicAlert("WRITE: Invalid address: %08x", em_address); - } - else - *(T*)&m_pRAM[tlb_addr & RAM_MASK] = bswap(data); - - } + else + { + /*if (bFakeVMEM && ((em_address & 0xFE000000) == 0x7e000000))*/ + /*F-Zero: */ if (bFakeVMEM) + { + *(T*)&m_pFakeVMEM[em_address & FAKEVMEM_MASK] = bswap(data); + return; + } + /* LOG(MEMMAP,"WRITE: %08x (PC: %08x)",em_address,PC);*/ + /*MessageBox(NULL, "WRITE: unknown Address", "1", MB_OK);*/ + u32 tmpAddress = TranslatePageAddress(effective_address, flag); + tmpAddress = (tmpAddress & 0xFFFFFFF0) | (em_address & 0xF); + *(T*)&m_pRAM[tmpAddress & RAM_MASK] = bswap(data); + } + } // ===================== Index: Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp =================================================================== --- Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp (revision 5192) +++ Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp (working copy) @@ -292,7 +292,7 @@ // check if a device with this name has been created already if (DeviceID == 0) { - if (DeviceName.find("/dev/") != std::string::npos) + /*if (DeviceName.find("/dev/") != std::string::npos) { ERROR_LOG(WII_IPC_FILEIO, "Unknown device: %s", DeviceName.c_str()); PanicAlert("Unknown device: %s\n\nMaybe you can continue to play or maybe the game will freeze.", DeviceName.c_str()); @@ -300,7 +300,7 @@ pDevice = AccessDeviceByID(GetDeviceIDByName(std::string("_Unknown_Device_"))); CmdSuccess = pDevice->Open(_Address, Mode); } - else + else*/ { // create new file handle u32 CurrentDeviceID = g_LastDeviceID; Index: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp =================================================================== --- Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp (revision 5192) +++ Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp (working copy) @@ -499,7 +499,7 @@ ec_priv_to_pub(priv, cert + 0x108); } -bool CWiiSaveCrypted::getPaths(bool _export) +bool CWiiSaveCrypted::getPaths(bool export_) { if (_saveGameTitle) { @@ -509,7 +509,7 @@ (u8)(_saveGameTitle >> 24) & 0xFF, (u8)(_saveGameTitle >> 16) & 0xFF, (u8)(_saveGameTitle >> 8) & 0xFF, (u8)_saveGameTitle & 0xFF); } - if (_export) + if (export_) { if(!File::IsDirectory(pathSavedir)) { Index: Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h =================================================================== --- Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h (revision 5192) +++ Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h (working copy) @@ -42,7 +42,7 @@ void do_sig(); void make_ec_cert(u8 *cert, u8 *sig, char *signer, char *name, u8 *priv, u32 key_id); - bool getPaths(bool _export = false); + bool getPaths(bool export_ = false); void ScanForFiles(std::string savDir, std::vector&FilesList, u32 *_numFiles, u32 *_sizeFiles); private: Index: Source/Core/VideoCommon/Src/VertexLoader_Position.cpp =================================================================== --- Source/Core/VideoCommon/Src/VertexLoader_Position.cpp (revision 5192) +++ Source/Core/VideoCommon/Src/VertexLoader_Position.cpp (working copy) @@ -20,6 +20,7 @@ #include "VertexLoader.h" #include "VertexLoader_Position.h" #include "NativeVertexWriter.h" +#include "VideoConfig.h" extern float posScale; extern TVtxAttr *pVtxAttr; @@ -74,28 +75,32 @@ // Direct // ============================================================================== -template +template void Pos_ReadDirect() { ((float*)VertexManager::s_pCurBufferPointer)[0] = (float)(T)DataRead() * posScale; ((float*)VertexManager::s_pCurBufferPointer)[1] = (float)(T)DataRead() * posScale; if (three) ((float*)VertexManager::s_pCurBufferPointer)[2] = (float)(T)DataRead() * posScale; - else - ((float*)VertexManager::s_pCurBufferPointer)[2] = 0.0f; + else{ + if (SX == true && (g_ActiveConfig.bVertex)) + ((float*)VertexManager::s_pCurBufferPointer)[2] = 1.0f; + else + ((float*)VertexManager::s_pCurBufferPointer)[2] = 0.0f; + } LOG_VTX(); VertexManager::s_pCurBufferPointer += 12; } -void LOADERDECL Pos_ReadDirect_UByte3() { Pos_ReadDirect(); } -void LOADERDECL Pos_ReadDirect_Byte3() { Pos_ReadDirect(); } -void LOADERDECL Pos_ReadDirect_UShort3() { Pos_ReadDirect(); } -void LOADERDECL Pos_ReadDirect_Short3() { Pos_ReadDirect(); } +void LOADERDECL Pos_ReadDirect_UByte3() { Pos_ReadDirect(); } +void LOADERDECL Pos_ReadDirect_Byte3() { Pos_ReadDirect(); } +void LOADERDECL Pos_ReadDirect_UShort3() { Pos_ReadDirect(); } +void LOADERDECL Pos_ReadDirect_Short3() { Pos_ReadDirect(); } -void LOADERDECL Pos_ReadDirect_UByte2() { Pos_ReadDirect(); } -void LOADERDECL Pos_ReadDirect_Byte2() { Pos_ReadDirect(); } -void LOADERDECL Pos_ReadDirect_UShort2() { Pos_ReadDirect(); } -void LOADERDECL Pos_ReadDirect_Short2() { Pos_ReadDirect(); } +void LOADERDECL Pos_ReadDirect_UByte2() { Pos_ReadDirect(); } +void LOADERDECL Pos_ReadDirect_Byte2() { Pos_ReadDirect(); } +void LOADERDECL Pos_ReadDirect_UShort2() { Pos_ReadDirect(); } +void LOADERDECL Pos_ReadDirect_Short2() { Pos_ReadDirect(); } void LOADERDECL Pos_ReadDirect_Float3() { Index: Source/Core/VideoCommon/Src/VideoConfig.h =================================================================== --- Source/Core/VideoCommon/Src/VideoConfig.h (revision 5192) +++ Source/Core/VideoCommon/Src/VideoConfig.h (working copy) @@ -71,6 +71,7 @@ bool bHideCursor; bool RenderToMainframe; bool bVSync; + bool bVertex; // Resolution control char cFSResolution[16]; Index: Source/Plugins/Plugin_VideoDX9/Src/EmuWindow.cpp =================================================================== --- Source/Plugins/Plugin_VideoDX9/Src/EmuWindow.cpp (revision 5192) +++ Source/Plugins/Plugin_VideoDX9/Src/EmuWindow.cpp (working copy) @@ -228,10 +228,15 @@ OSDChoice = 4; g_Config.bDisableFog = !g_Config.bDisableFog; break; - case '7': - OSDChoice = 5; - g_Config.bDisableLighting = !g_Config.bDisableLighting; - break; + //case '7': + // OSDChoice = 5; + // g_Config.bDisableLighting = !g_Config.bDisableLighting; + // break; + case '7' :{ + g_Config.bVertex = !g_Config.bVertex; + break; + } + } } Index: Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp =================================================================== --- Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp (revision 5192) +++ Source/Plugins/Plugin_VideoOGL/Src/OS/Win32.cpp (working copy) @@ -120,10 +120,12 @@ OSDChoice = 4; g_Config.bDisableFog = !g_Config.bDisableFog; break; - case '7': - OSDChoice = 5; - g_Config.bDisableLighting = !g_Config.bDisableLighting; - break; + //case '7': + // OSDChoice = 5; + // g_Config.bDisableLighting = !g_Config.bDisableLighting; + // break; + case '7':g_Config.bVertex = !g_Config.bVertex; + break; } } // --------------------------------------------------------------------- Index: Source/Plugins/Plugin_VideoSoftware/Src/main.cpp =================================================================== --- Source/Plugins/Plugin_VideoSoftware/Src/main.cpp (revision 5192) +++ Source/Plugins/Plugin_VideoSoftware/Src/main.cpp (working copy) @@ -210,3 +210,7 @@ void Video_WaitForFrameFinish(void) { } +bool IsD3D() +{ + return false; +}