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

Merge pull request #410 from cxd4/English_futhermucker_do_u_speek 

un-typo'd some typos
This commit is contained in:
zilmar 2015-04-21 08:15:10 +10:00
parent 240d13366d 42643352b9
commit 04ce2a51ae
28 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Project64/N64 System/Cheat Class.cpp
View File

@ -1587,7 +1587,7 @@ int CCheats::TV_GetCheckState(HWND hwndTreeView, HWND hItem)
return ((int)(tvItem.state >> 12) -1); return ((int)(tvItem.state >> 12) -1);
} }
void CCheats::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, const wchar_t * ShotCut) void CCheats::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, const wchar_t * ShortCut)
{ {
MENUITEMINFOW MenuInfo; MENUITEMINFOW MenuInfo;
wchar_t String[256]; wchar_t String[256];
@ -1605,7 +1605,7 @@ void CCheats::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, con
GetMenuItemInfoW(hMenu,MenuPos,true,&MenuInfo); GetMenuItemInfoW(hMenu,MenuPos,true,&MenuInfo);
wcscpy(String,Title); wcscpy(String,Title);
if (wcschr(String,'\t') != NULL) { *(wcschr(String,'\t')) = '\0'; } if (wcschr(String,'\t') != NULL) { *(wcschr(String,'\t')) = '\0'; }
if (ShotCut) { _swprintf(String,L"%s\t%s",String,ShotCut); } if (ShortCut) { _swprintf(String,L"%s\t%s",String,ShortCut); }
SetMenuItemInfoW(hMenu,MenuPos,true,&MenuInfo); SetMenuItemInfoW(hMenu,MenuPos,true,&MenuInfo);
} }

2
Source/Project64/N64 System/Cheat Class.h
View File

@ -83,7 +83,7 @@ private:
static bool TV_SetCheckState(HWND hwndTreeView, HWND hItem, TV_CHECK_STATE state); static bool TV_SetCheckState(HWND hwndTreeView, HWND hItem, TV_CHECK_STATE state);
static int TV_GetCheckState(HWND hwndTreeView, HWND hItem); static int TV_GetCheckState(HWND hwndTreeView, HWND hItem);
static DWORD AsciiToHex ( const char * HexValue ); static DWORD AsciiToHex ( const char * HexValue );
static void MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, const wchar_t * ShotCut ); static void MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, const wchar_t * ShortCut );
//UI Functions //UI Functions

4
Source/Project64/N64 System/Mips/Mempak.cpp
View File

@ -46,7 +46,7 @@ void LoadMempak (int Control)
FileName.CreateDirectory(); FileName.CreateDirectory();
} }
BYTE Initilize[] = { BYTE Initialize[] = {
0x81,0x01,0x02,0x03, 0x04,0x05,0x06,0x07, 0x08,0x09,0x0a,0x0b, 0x0C,0x0D,0x0E,0x0F, 0x81,0x01,0x02,0x03, 0x04,0x05,0x06,0x07, 0x08,0x09,0x0a,0x0b, 0x0C,0x0D,0x0E,0x0F,
0x10,0x11,0x12,0x13, 0x14,0x15,0x16,0x17, 0x18,0x19,0x1A,0x1B, 0x1C,0x1D,0x1E,0x1F, 0x10,0x11,0x12,0x13, 0x14,0x15,0x16,0x17, 0x18,0x19,0x1A,0x1B, 0x1C,0x1D,0x1E,0x1F,
0xFF,0xFF,0xFF,0xFF, 0x05,0x1A,0x5F,0x13, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0xFF,0xFF,0xFF,0xFF, 0x05,0x1A,0x5F,0x13, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,
@ -66,7 +66,7 @@ void LoadMempak (int Control)
0x00,0x71,0x00,0x03, 0x00,0x03,0x00,0x03, 0x00,0x03,0x00,0x03, 0x00,0x03,0x00,0x03, 0x00,0x71,0x00,0x03, 0x00,0x03,0x00,0x03, 0x00,0x03,0x00,0x03, 0x00,0x03,0x00,0x03,
}; };
memcpy(&Mempaks[Control][0], Initilize, 0x110); memcpy(&Mempaks[Control][0], Initialize, 0x110);
for (int count = 0x110; count < 0x8000; count += 2) for (int count = 0x110; count < 0x8000; count += 2)
{ {

6
Source/Project64/N64 System/N64 Class.cpp
View File

@ -29,7 +29,7 @@ CN64System::CN64System ( CPlugins * Plugins, bool SavesReadOnly ) :
m_InReset(false), m_InReset(false),
m_EndEmulation(false), m_EndEmulation(false),
m_bCleanFrameBox(true), m_bCleanFrameBox(true),
m_bInitilized(false), m_bInitialized(false),
m_NextTimer(0), m_NextTimer(0),
m_SystemTimer(m_NextTimer), m_SystemTimer(m_NextTimer),
m_DMAUsed(false), m_DMAUsed(false),
@ -650,14 +650,14 @@ bool CN64System::SetActiveSystem( bool bActive )
R4300iOp::m_NextInstruction = m_NextInstruction; R4300iOp::m_NextInstruction = m_NextInstruction;
R4300iOp::m_JumpToLocation = m_JumpToLocation; R4300iOp::m_JumpToLocation = m_JumpToLocation;
if (!m_bInitilized) if (!m_bInitialized)
{ {
if (!m_MMU_VM.Initialize()) if (!m_MMU_VM.Initialize())
{ {
return false; return false;
} }
bReset = true; bReset = true;
m_bInitilized = true; m_bInitialized = true;
bInitPlugin = true; bInitPlugin = true;
} }
} }

2
Source/Project64/N64 System/N64 Class.h
View File

@ -140,7 +140,7 @@ private:
int m_NextTimer; int m_NextTimer;
CSystemTimer m_SystemTimer; CSystemTimer m_SystemTimer;
bool m_bCleanFrameBox; bool m_bCleanFrameBox;
bool m_bInitilized; bool m_bInitialized;
bool m_RspBroke; bool m_RspBroke;
bool m_DMAUsed; bool m_DMAUsed;
DWORD m_Buttons[4]; DWORD m_Buttons[4];

2
Source/Project64/N64 System/Recompiler/Section Info.cpp
View File

@ -140,7 +140,7 @@ DWORD CCodeSection::GetNewTestValue(void)
return LastTest; return LastTest;
} }
void CRegInfo::Initilize ( void ) void CRegInfo::Initialize ( void )
{ {
int count; int count;

6
Source/Project64/Plugins/Audio Plugin.cpp
View File

@ -126,7 +126,7 @@ bool CAudioPlugin::Initiate(CN64System * System, CMainGui * RenderWindow)
Info.AI__BITRATE_REG = &g_Reg->AI_BITRATE_REG; Info.AI__BITRATE_REG = &g_Reg->AI_BITRATE_REG;
} }
m_Initilized = InitiateAudio(Info) != 0; m_Initialized = InitiateAudio(Info) != 0;
//jabo had a bug so I call CreateThread so his dllmain gets called again //jabo had a bug so I call CreateThread so his dllmain gets called again
DWORD ThreadID; DWORD ThreadID;
@ -145,7 +145,7 @@ bool CAudioPlugin::Initiate(CN64System * System, CMainGui * RenderWindow)
DacrateChanged(System->SystemType()); DacrateChanged(System->SystemType());
} }
} }
return m_Initilized; return m_Initialized;
} }
void CAudioPlugin::UnloadPluginDetails(void) void CAudioPlugin::UnloadPluginDetails(void)
@ -165,7 +165,7 @@ void CAudioPlugin::UnloadPluginDetails(void)
void CAudioPlugin::DacrateChanged(SYSTEM_TYPE Type) void CAudioPlugin::DacrateChanged(SYSTEM_TYPE Type)
{ {
if (!Initilized()) { return; } if (!Initialized()) { return; }
WriteTraceF(TraceAudio, __FUNCTION__ ": SystemType: %s", Type == SYSTEM_NTSC ? "SYSTEM_NTSC" : "SYSTEM_PAL"); WriteTraceF(TraceAudio, __FUNCTION__ ": SystemType: %s", Type == SYSTEM_NTSC ? "SYSTEM_NTSC" : "SYSTEM_PAL");
//DWORD Frequency = g_Reg->AI_DACRATE_REG * 30; //DWORD Frequency = g_Reg->AI_DACRATE_REG * 30;

6
Source/Project64/Plugins/Controller Plugin.cpp
View File

@ -75,7 +75,7 @@ bool CControl_Plugin::Initiate(CN64System * System, CMainGui * RenderWindow)
InitiateControllers_1_0 = (void (__cdecl *)(HWND, CONTROL *))GetProcAddress( (HMODULE)m_hDll, "InitiateControllers" ); InitiateControllers_1_0 = (void (__cdecl *)(HWND, CONTROL *))GetProcAddress( (HMODULE)m_hDll, "InitiateControllers" );
if (InitiateControllers_1_0 == NULL) { return false; } if (InitiateControllers_1_0 == NULL) { return false; }
InitiateControllers_1_0((HWND)RenderWindow->m_hMainWindow,m_PluginControllers); InitiateControllers_1_0((HWND)RenderWindow->m_hMainWindow,m_PluginControllers);
m_Initilized = true; m_Initialized = true;
} }
else if (m_PluginInfo.Version >= 0x0101) else if (m_PluginInfo.Version >= 0x0101)
{ {
@ -107,7 +107,7 @@ bool CControl_Plugin::Initiate(CN64System * System, CMainGui * RenderWindow)
ControlInfo.MemoryBswaped = TRUE; ControlInfo.MemoryBswaped = TRUE;
InitiateControllers_1_1(&ControlInfo); InitiateControllers_1_1(&ControlInfo);
m_Initilized = true; m_Initialized = true;
} }
//jabo had a bug so I call CreateThread so his dllmain gets called again //jabo had a bug so I call CreateThread so his dllmain gets called again
@ -115,7 +115,7 @@ bool CControl_Plugin::Initiate(CN64System * System, CMainGui * RenderWindow)
HANDLE hthread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)DummyFunction, NULL, 0, &ThreadID); HANDLE hthread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)DummyFunction, NULL, 0, &ThreadID);
CloseHandle(hthread); CloseHandle(hthread);
return m_Initilized; return m_Initialized;
} }
void CControl_Plugin::UnloadPluginDetails(void) void CControl_Plugin::UnloadPluginDetails(void)

6
Source/Project64/Plugins/GFX plugin.cpp
View File

@ -95,7 +95,7 @@ bool CGfxPlugin::LoadFunctions ( void )
bool CGfxPlugin::Initiate(CN64System * System, CMainGui * RenderWindow) bool CGfxPlugin::Initiate(CN64System * System, CMainGui * RenderWindow)
{ {
if (m_Initilized) if (m_Initialized)
Close(); Close();
typedef struct { typedef struct {
@ -213,14 +213,14 @@ bool CGfxPlugin::Initiate(CN64System * System, CMainGui * RenderWindow)
Info.VI__Y_SCALE_REG = &g_Reg->VI_Y_SCALE_REG; Info.VI__Y_SCALE_REG = &g_Reg->VI_Y_SCALE_REG;
} }
m_Initilized = InitiateGFX(Info) != 0; m_Initialized = InitiateGFX(Info) != 0;
//jabo had a bug so I call CreateThread so his dllmain gets called again //jabo had a bug so I call CreateThread so his dllmain gets called again
DWORD ThreadID; DWORD ThreadID;
HANDLE hthread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)DummyFunction, NULL, 0, &ThreadID); HANDLE hthread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)DummyFunction, NULL, 0, &ThreadID);
CloseHandle(hthread); CloseHandle(hthread);
return m_Initilized; return m_Initialized;
} }
void CGfxPlugin::UnloadPluginDetails(void) void CGfxPlugin::UnloadPluginDetails(void)

6
Source/Project64/Plugins/Plugin Base.cpp
View File

@ -12,7 +12,7 @@
CPlugin::CPlugin() : CPlugin::CPlugin() :
m_hDll(NULL), m_hDll(NULL),
m_Initilized(false), m_Initialized(false),
m_RomOpen(false), m_RomOpen(false),
RomOpen(NULL), RomOpen(NULL),
RomClosed(NULL), RomClosed(NULL),
@ -169,10 +169,10 @@ void CPlugin::Close()
{ {
WriteTraceF(PluginTraceType(),__FUNCTION__ "(%s): Start",PluginType()); WriteTraceF(PluginTraceType(),__FUNCTION__ "(%s): Start",PluginType());
RomClose(); RomClose();
if (m_Initilized) if (m_Initialized)
{ {
CloseDLL(); CloseDLL();
m_Initilized = false; m_Initialized = false;
} }
WriteTraceF(PluginTraceType(),__FUNCTION__ "(%s): Done",PluginType()); WriteTraceF(PluginTraceType(),__FUNCTION__ "(%s): Done",PluginType());
} }

4
Source/Project64/Plugins/Plugin Base.h
View File

@ -17,7 +17,7 @@ public:
CPlugin(); CPlugin();
virtual ~CPlugin(); virtual ~CPlugin();
inline const char * PluginName() const { return m_PluginInfo.Name; } inline const char * PluginName() const { return m_PluginInfo.Name; }
inline bool Initilized() { return m_Initilized; } inline bool Initialized() { return m_Initialized; }
virtual int GetDefaultSettingStartRange() const = 0; virtual int GetDefaultSettingStartRange() const = 0;
virtual int GetSettingStartRange() const = 0; virtual int GetSettingStartRange() const = 0;
@ -50,7 +50,7 @@ protected:
void(__cdecl *SetSettingInfo3) (PLUGIN_SETTINGS3 *); void(__cdecl *SetSettingInfo3) (PLUGIN_SETTINGS3 *);
void * m_hDll; void * m_hDll;
bool m_Initilized, m_RomOpen; bool m_Initialized, m_RomOpen;
PLUGIN_INFO m_PluginInfo; PLUGIN_INFO m_PluginInfo;
// Loads a function pointer from the currently loaded DLL // Loads a function pointer from the currently loaded DLL

8
Source/Project64/Plugins/Plugin Class.cpp
View File

@ -316,7 +316,7 @@ void CPlugins::ConfigPlugin ( DWORD hParent, PLUGIN_TYPE Type ) {
switch (Type) { switch (Type) {
case PLUGIN_TYPE_RSP: case PLUGIN_TYPE_RSP:
if (m_RSP == NULL || m_RSP->DllConfig == NULL) { break; } if (m_RSP == NULL || m_RSP->DllConfig == NULL) { break; }
if (!m_RSP->Initilized()) { if (!m_RSP->Initialized()) {
if (!m_RSP->Initiate(NULL,NULL)) { if (!m_RSP->Initiate(NULL,NULL)) {
break; break;
} }
@ -325,7 +325,7 @@ void CPlugins::ConfigPlugin ( DWORD hParent, PLUGIN_TYPE Type ) {
break; break;
case PLUGIN_TYPE_GFX: case PLUGIN_TYPE_GFX:
if (m_Gfx == NULL || m_Gfx->DllConfig == NULL) { break; } if (m_Gfx == NULL || m_Gfx->DllConfig == NULL) { break; }
if (!m_Gfx->Initilized()) { if (!m_Gfx->Initialized()) {
if (!m_Gfx->Initiate(NULL,m_DummyWindow)) { if (!m_Gfx->Initiate(NULL,m_DummyWindow)) {
break; break;
} }
@ -334,7 +334,7 @@ void CPlugins::ConfigPlugin ( DWORD hParent, PLUGIN_TYPE Type ) {
break; break;
case PLUGIN_TYPE_AUDIO: case PLUGIN_TYPE_AUDIO:
if (m_Audio == NULL || m_Audio->DllConfig == NULL) { break; } if (m_Audio == NULL || m_Audio->DllConfig == NULL) { break; }
if (!m_Audio->Initilized()) { if (!m_Audio->Initialized()) {
if (!m_Audio->Initiate(NULL,m_DummyWindow)) { if (!m_Audio->Initiate(NULL,m_DummyWindow)) {
break; break;
} }
@ -343,7 +343,7 @@ void CPlugins::ConfigPlugin ( DWORD hParent, PLUGIN_TYPE Type ) {
break; break;
case PLUGIN_TYPE_CONTROLLER: case PLUGIN_TYPE_CONTROLLER:
if (m_Control == NULL || m_Control->DllConfig == NULL) { break; } if (m_Control == NULL || m_Control->DllConfig == NULL) { break; }
if (!m_Control->Initilized()) { if (!m_Control->Initialized()) {
if (!m_Control->Initiate(NULL,m_DummyWindow)) { if (!m_Control->Initiate(NULL,m_DummyWindow)) {
break; break;
} }

4
Source/Project64/Plugins/RSP Plugin.cpp
View File

@ -184,13 +184,13 @@ bool CRSP_Plugin::Initiate(CPlugins * Plugins, CN64System * System)
} }
InitiateRSP(Info, &m_CycleCount); InitiateRSP(Info, &m_CycleCount);
m_Initilized = true; m_Initialized = true;
//jabo had a bug so I call CreateThread so his dllmain gets called again //jabo had a bug so I call CreateThread so his dllmain gets called again
DWORD ThreadID; DWORD ThreadID;
HANDLE hthread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)DummyFunction, NULL, 0, &ThreadID); HANDLE hthread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)DummyFunction, NULL, 0, &ThreadID);
CloseHandle(hthread); CloseHandle(hthread);
return m_Initilized; return m_Initialized;
} }
void CRSP_Plugin::UnloadPluginDetails(void) void CRSP_Plugin::UnloadPluginDetails(void)

2
Source/Project64/Settings/SettingType/SettingsType-Application.cpp
View File

@ -59,7 +59,7 @@ CSettingTypeApplication::~CSettingTypeApplication()
} }
void CSettingTypeApplication::Initilize( const char * /*AppName*/ ) void CSettingTypeApplication::Initialize( const char * /*AppName*/ )
{ {
stdstr SettingsFile, OrigSettingsFile; stdstr SettingsFile, OrigSettingsFile;

4
Source/Project64/Settings/SettingType/SettingsType-Application.h
View File

@ -58,8 +58,8 @@ public:
// Delete the setting // Delete the setting
virtual void Delete ( int Index ); virtual void Delete ( int Index );
// Initilize this class to use ini or registry // Initialize this class to use ini or registry
static void Initilize ( const char * AppName ); static void Initialize( const char * AppName );
static void CleanUp ( void ); static void CleanUp ( void );
static void Flush ( void ); static void Flush ( void );

2
Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp
View File

@ -23,7 +23,7 @@ CSettingTypeCheats::~CSettingTypeCheats ( void )
{ {
} }
void CSettingTypeCheats::Initilize ( void ) void CSettingTypeCheats::Initialize ( void )
{ {
m_CheatIniFile = new CIniFile(g_Settings->LoadString(SupportFile_Cheats).c_str()); m_CheatIniFile = new CIniFile(g_Settings->LoadString(SupportFile_Cheats).c_str());
m_CheatIniFile->SetAutoFlush(false); m_CheatIniFile->SetAutoFlush(false);

4
Source/Project64/Settings/SettingType/SettingsType-Cheats.h
View File

@ -46,8 +46,8 @@ public:
// Delete the setting // Delete the setting
virtual void Delete ( int Index ); virtual void Delete ( int Index );
// Initilize this class to use ini or registry // Initialize this class to use ini or registry
static void Initilize ( void ); static void Initialize ( void );
static void CleanUp ( void ); static void CleanUp ( void );
static void FlushChanges ( void ); static void FlushChanges ( void );

2
Source/Project64/Settings/SettingType/SettingsType-GameSetting.cpp
View File

@ -35,7 +35,7 @@ CSettingTypeGame::~CSettingTypeGame()
{ {
} }
void CSettingTypeGame::Initilize ( void ) void CSettingTypeGame::Initialize ( void )
{ {
UpdateSettings(NULL); UpdateSettings(NULL);
g_Settings->RegisterChangeCB(Game_IniKey,NULL,UpdateSettings); g_Settings->RegisterChangeCB(Game_IniKey,NULL,UpdateSettings);

2
Source/Project64/Settings/SettingType/SettingsType-GameSetting.h
View File

@ -31,7 +31,7 @@ public:
virtual bool IndexBasedSetting ( void ) const { return false; } virtual bool IndexBasedSetting ( void ) const { return false; }
virtual SettingType GetSettingType ( void ) const { return SettingType_GameSetting; } virtual SettingType GetSettingType ( void ) const { return SettingType_GameSetting; }
static void Initilize ( void ); static void Initialize( void );
static void CleanUp ( void ); static void CleanUp ( void );
//return the values //return the values

2
Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp
View File

@ -59,7 +59,7 @@ CSettingTypeRomDatabase::~CSettingTypeRomDatabase()
{ {
} }
void CSettingTypeRomDatabase::Initilize( void ) void CSettingTypeRomDatabase::Initialize( void )
{ {
m_SettingsIniFile = new CIniFile(g_Settings->LoadString(SupportFile_RomDatabase).c_str()); m_SettingsIniFile = new CIniFile(g_Settings->LoadString(SupportFile_RomDatabase).c_str());
m_GlideIniFile = new CIniFile(g_Settings->LoadString(SupportFile_Glide64RDB).c_str()); m_GlideIniFile = new CIniFile(g_Settings->LoadString(SupportFile_Glide64RDB).c_str());

2
Source/Project64/Settings/SettingType/SettingsType-RomDatabase.h
View File

@ -43,7 +43,7 @@ public:
// Delete the setting // Delete the setting
virtual void Delete ( int Index ); virtual void Delete ( int Index );
static void Initilize ( void ); static void Initialize( void );
static void CleanUp ( void ); static void CleanUp ( void );
protected: protected:

10
Source/Project64/Settings/Settings Class.cpp
View File

@ -510,13 +510,13 @@ void CSettings::RegisterSetting ( CSettings * _this, SettingID ID, SettingID Def
} }
} }
bool CSettings::Initilize( const char * AppName ) bool CSettings::Initialize( const char * AppName )
{ {
AddHowToHandleSetting(); AddHowToHandleSetting();
CSettingTypeApplication::Initilize(AppName); CSettingTypeApplication::Initialize(AppName);
CSettingTypeRomDatabase::Initilize(); CSettingTypeRomDatabase::Initialize();
CSettingTypeGame::Initilize(); CSettingTypeGame::Initialize();
CSettingTypeCheats::Initilize(); CSettingTypeCheats::Initialize();
g_Settings->SaveString(Setting_ApplicationName,AppName); g_Settings->SaveString(Setting_ApplicationName,AppName);
return true; return true;

2
Source/Project64/Settings/Settings Class.h
View File

@ -46,7 +46,7 @@ public:
CSettings(void); CSettings(void);
~CSettings(void); ~CSettings(void);
bool Initilize ( const char * AppName ); bool Initialize ( const char * AppName );
//return the values //return the values
bool LoadBool ( SettingID Type ); bool LoadBool ( SettingID Type );

4
Source/Project64/User Interface/Menu Class.cpp
View File

@ -58,11 +58,11 @@ bool CBaseMenu::AddMenu(HMENU hMenu, MenuItemList Items ) {
SetMenuItemInfo((HMENU)ItemID, (DWORD)MenuItem->SubMenu(), FALSE,&lpmii); SetMenuItemInfo((HMENU)ItemID, (DWORD)MenuItem->SubMenu(), FALSE,&lpmii);
} }
if (MenuItem->ShotCut().empty() == false) if (MenuItem->ShortCut().empty() == false)
{ {
String = Text; String = Text;
String += L"\t"; String += L"\t";
String += MenuItem->ShotCut(); String += MenuItem->ShortCut();
Text = String; Text = String;
} }
AppendMenuW(hMenu,uFlags,ItemID,Text.c_str()); AppendMenuW(hMenu,uFlags,ItemID,Text.c_str());

12
Source/Project64/User Interface/Menu Class.h
View File

@ -27,17 +27,17 @@ public:
{ {
Reset(NO_ID); Reset(NO_ID);
} }
MENU_ITEM ( int ID, LanguageStringID Title = EMPTY_STRING, const std::wstring & ShotCut = EMPTY_STDSTR, MENU_ITEM ( int ID, LanguageStringID Title = EMPTY_STRING, const std::wstring & ShortCut = EMPTY_STDSTR,
void * SubMenu = NULL, const std::wstring & ManualString = EMPTY_STDSTR) void * SubMenu = NULL, const std::wstring & ManualString = EMPTY_STDSTR)
{ {
Reset(ID,Title,ShotCut,SubMenu,ManualString); Reset(ID,Title,ShortCut,SubMenu,ManualString);
} }
void Reset ( int ID, LanguageStringID Title = EMPTY_STRING, const std::wstring & ShotCut2 = EMPTY_STDSTR, void Reset ( int ID, LanguageStringID Title = EMPTY_STRING, const std::wstring & ShortCut2 = EMPTY_STDSTR,
void * SubMenu = NULL, const std::wstring & ManualString = EMPTY_STDSTR) void * SubMenu = NULL, const std::wstring & ManualString = EMPTY_STDSTR)
{ {
this->m_ID = ID; this->m_ID = ID;
this->m_Title = Title; this->m_Title = Title;
this->m_ShotCut = ShotCut2; this->m_ShortCut = ShortCut2;
this->m_SubMenu = SubMenu; this->m_SubMenu = SubMenu;
this->m_ManualString = ManualString; this->m_ManualString = ManualString;
this->m_ItemTicked = false; this->m_ItemTicked = false;
@ -46,7 +46,7 @@ public:
int ID() const { return m_ID; } int ID() const { return m_ID; }
LanguageStringID Title() const { return m_Title; } LanguageStringID Title() const { return m_Title; }
const std::wstring & ShotCut() const { return m_ShotCut; } const std::wstring & ShortCut() const { return m_ShortCut; }
void * SubMenu() const { return m_SubMenu; } void * SubMenu() const { return m_SubMenu; }
const std::wstring & ManualString() const { return m_ManualString; } const std::wstring & ManualString() const { return m_ManualString; }
bool ItemTicked() const { return m_ItemTicked; } bool ItemTicked() const { return m_ItemTicked; }
@ -59,7 +59,7 @@ public:
private: private:
int m_ID; int m_ID;
LanguageStringID m_Title; LanguageStringID m_Title;
std::wstring m_ShotCut; std::wstring m_ShortCut;
void * m_SubMenu; void * m_SubMenu;
std::wstring m_ManualString; std::wstring m_ManualString;
bool m_ItemTicked; bool m_ItemTicked;

4
Source/Project64/User Interface/Rom Browser Class.cpp
View File

@ -1022,7 +1022,7 @@ void CRomBrowser::LoadRomList (void) {
RomList_SortList(); RomList_SortList();
} }
void CRomBrowser::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, char * ShotCut) void CRomBrowser::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, char * ShortCut)
{ {
MENUITEMINFOW MenuInfo; MENUITEMINFOW MenuInfo;
wchar_t String[256]; wchar_t String[256];
@ -1040,7 +1040,7 @@ void CRomBrowser::MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title,
GetMenuItemInfoW(hMenu,MenuPos,TRUE,&MenuInfo); GetMenuItemInfoW(hMenu,MenuPos,TRUE,&MenuInfo);
wcscpy(String,Title); wcscpy(String,Title);
if (wcschr(String,'\t') != NULL) { *(wcschr(String,'\t')) = '\0'; } if (wcschr(String,'\t') != NULL) { *(wcschr(String,'\t')) = '\0'; }
if (ShotCut) { swprintf(String,sizeof(String) / sizeof(String[0]),L"%s\t%s",String,ShotCut); } if (ShortCut) { swprintf(String,sizeof(String) / sizeof(String[0]),L"%s\t%s",String,ShortCut); }
SetMenuItemInfoW(hMenu,MenuPos,TRUE,&MenuInfo); SetMenuItemInfoW(hMenu,MenuPos,TRUE,&MenuInfo);
} }

2
Source/Project64/User Interface/Rom Browser.h
View File

@ -163,7 +163,7 @@ class CRomBrowser
static int GetCicChipID ( BYTE * RomData ); static int GetCicChipID ( BYTE * RomData );
bool LoadDataFromRomFile ( char * FileName, BYTE * Data,int DataLen, int * RomSize, FILE_FORMAT & FileFormat ); bool LoadDataFromRomFile ( char * FileName, BYTE * Data,int DataLen, int * RomSize, FILE_FORMAT & FileFormat );
void LoadRomList ( void ); void LoadRomList ( void );
void MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, char * ShotCut); void MenuSetText ( HMENU hMenu, int MenuPos, const wchar_t * Title, char * ShortCut);
void SaveRomList ( strlist & FileList ); void SaveRomList ( strlist & FileList );
void RomList_ColoumnSortList ( DWORD pnmh ); void RomList_ColoumnSortList ( DWORD pnmh );
void RomList_GetDispInfo ( DWORD pnmh ); void RomList_GetDispInfo ( DWORD pnmh );

4
Source/Project64/main.cpp
View File

@ -189,14 +189,14 @@ int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR /
g_Lang = new CLanguage(); g_Lang = new CLanguage();
g_Settings = new CSettings; g_Settings = new CSettings;
g_Settings->Initilize(AppName()); g_Settings->Initialize(AppName());
if (g_Settings->LoadBool(Setting_CheckEmuRunning) && if (g_Settings->LoadBool(Setting_CheckEmuRunning) &&
TerminatedExistingEmu()) TerminatedExistingEmu())
{ {
delete g_Settings; delete g_Settings;
g_Settings = new CSettings; g_Settings = new CSettings;
g_Settings->Initilize(AppName()); g_Settings->Initialize(AppName());
} }
InitializeLog(); InitializeLog();