ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glide64] Remove wxString usage from Glide64/rdp.cpp

This commit is contained in:
zilmar 2016-01-21 06:09:35 +11:00
parent 7a0c017571
commit 80cd85b9a9
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Glide64/rdp.cpp
View File

@ -47,6 +47,7 @@
#include "TexBuffer.h" #include "TexBuffer.h"
#include "FBtoScreen.h" #include "FBtoScreen.h"
#include "CRC.h" #include "CRC.h"
#include <Common/StdString.h>
const int NumOfFormats = 3; const int NumOfFormats = 3;
SCREEN_SHOT_FORMAT ScreenShotFormats[NumOfFormats] = { { wxT("BMP"), wxT("bmp"), wxBITMAP_TYPE_BMP }, { wxT("PNG"), wxT("png"), wxBITMAP_TYPE_PNG }, { wxT("JPEG"), wxT("jpeg"), wxBITMAP_TYPE_JPEG } }; SCREEN_SHOT_FORMAT ScreenShotFormats[NumOfFormats] = { { wxT("BMP"), wxT("bmp"), wxBITMAP_TYPE_BMP }, { wxT("PNG"), wxT("png"), wxBITMAP_TYPE_PNG }, { wxT("JPEG"), wxT("jpeg"), wxBITMAP_TYPE_JPEG } };
@ -312,14 +313,12 @@ void microcheck()
d = ((char*)gfx.RDRAM)[i^3]; d = ((char*)gfx.RDRAM)[i^3];
ucf.write (&d, 1); ucf.write (&d, 1);
} }
ucf.close (); ucf.close();
#endif #endif
FRDP("ucode = %08lx\n", uc_crc); FRDP("ucode = %08lx\n", uc_crc);
wxString str; RegisterSetting(Set_ucodeLookup, Data_DWORD_RDB_Setting, stdstr_f(wxT("%08lx"), uc_crc).c_str(), "ucode", (unsigned int)-2, NULL);
str.Printf(wxT("%08lx"), uc_crc);
RegisterSetting(Set_ucodeLookup, Data_DWORD_RDB_Setting, str, "ucode", (unsigned int)-2, NULL);
int uc = GetSetting(Set_ucodeLookup); int uc = GetSetting(Set_ucodeLookup);
if (uc == -2 && ucode_error_report) if (uc == -2 && ucode_error_report)
@ -327,8 +326,7 @@ void microcheck()
settings.ucode = GetSetting(Set_ucode); settings.ucode = GetSetting(Set_ucode);
ReleaseGfx(); ReleaseGfx();
str.Printf(_T("Error: uCode crc not found in INI, using currently selected uCode\n\n%08lx"), uc_crc); wxMessageBox(stdstr_f("Error: uCode crc not found in INI, using currently selected uCode\n\n%08lx", uc_crc).c_str(), "Error", wxOK | wxICON_EXCLAMATION, GFXWindow);
wxMessageBox(str, _T("Error"), wxOK | wxICON_EXCLAMATION, GFXWindow);
ucode_error_report = FALSE; // don't report any more ucode errors from this game ucode_error_report = FALSE; // don't report any more ucode errors from this game
} }
@ -337,8 +335,7 @@ void microcheck()
settings.ucode = GetSetting(Set_ucode); settings.ucode = GetSetting(Set_ucode);
ReleaseGfx(); ReleaseGfx();
str.Printf(_T("Error: Unsupported uCode!\n\ncrc: %08lx"), uc_crc); wxMessageBox(stdstr_f("Error: Unsupported uCode!\n\ncrc: %08lx", uc_crc).c_str(), "Error", wxOK | wxICON_EXCLAMATION, GFXWindow);
wxMessageBox(str, _T("Error"), wxOK | wxICON_EXCLAMATION, GFXWindow);
ucode_error_report = FALSE; // don't report any more ucode errors from this game ucode_error_report = FALSE; // don't report any more ucode errors from this game
} }
@ -353,7 +350,9 @@ void microcheck()
rdp.persp_supported = FALSE; rdp.persp_supported = FALSE;
} }
else if (settings.texture_correction) else if (settings.texture_correction)
{
rdp.persp_supported = TRUE; rdp.persp_supported = TRUE;
}
} }
} }
@ -601,7 +600,7 @@ EXPORT void CALL ProcessDList(void)
{ {
hhkLowLevelKybd = SetWindowsHookEx(WH_KEYBOARD_LL, hhkLowLevelKybd = SetWindowsHookEx(WH_KEYBOARD_LL,
LowLevelKeyboardProc, hInstance, 0); LowLevelKeyboardProc, hInstance, 0);
} }
#endif #endif
LOG("ProcessDList ()\n"); LOG("ProcessDList ()\n");
@ -799,7 +798,7 @@ EXPORT void CALL ProcessDList(void)
else else
to_fullscreen = TRUE; to_fullscreen = TRUE;
return; return;
} }
#endif #endif
if (fb_emulation_enabled) if (fb_emulation_enabled)
@ -822,7 +821,7 @@ EXPORT void CALL ProcessDList(void)
CI_SET = FALSE; CI_SET = FALSE;
} }
LRDP("ProcessDList end\n"); LRDP("ProcessDList end\n");
} }
// undef - undefined instruction, always ignore // undef - undefined instruction, always ignore
static void undef() static void undef()