From 42643352b9e937d83fd966880cc93c8d3aa2cb4d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 20 Apr 2015 16:01:18 -0400 Subject: [PATCH] s/Initilize/Initialize --- Source/Project64/N64 System/Mips/Mempak.cpp | 4 ++-- Source/Project64/N64 System/N64 Class.cpp | 6 +++--- Source/Project64/N64 System/N64 Class.h | 2 +- .../Project64/N64 System/Recompiler/Section Info.cpp | 2 +- Source/Project64/Plugins/Audio Plugin.cpp | 6 +++--- Source/Project64/Plugins/Controller Plugin.cpp | 6 +++--- Source/Project64/Plugins/GFX plugin.cpp | 6 +++--- Source/Project64/Plugins/Plugin Base.cpp | 6 +++--- Source/Project64/Plugins/Plugin Base.h | 4 ++-- Source/Project64/Plugins/Plugin Class.cpp | 8 ++++---- Source/Project64/Plugins/RSP Plugin.cpp | 4 ++-- .../Settings/SettingType/SettingsType-Application.cpp | 2 +- .../Settings/SettingType/SettingsType-Application.h | 4 ++-- .../Settings/SettingType/SettingsType-Cheats.cpp | 2 +- .../Settings/SettingType/SettingsType-Cheats.h | 4 ++-- .../Settings/SettingType/SettingsType-GameSetting.cpp | 2 +- .../Settings/SettingType/SettingsType-GameSetting.h | 2 +- .../Settings/SettingType/SettingsType-RomDatabase.cpp | 2 +- .../Settings/SettingType/SettingsType-RomDatabase.h | 2 +- Source/Project64/Settings/Settings Class.cpp | 10 +++++----- Source/Project64/Settings/Settings Class.h | 2 +- Source/Project64/main.cpp | 4 ++-- 22 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Source/Project64/N64 System/Mips/Mempak.cpp b/Source/Project64/N64 System/Mips/Mempak.cpp index e7f10ccf2..29438bec1 100644 --- a/Source/Project64/N64 System/Mips/Mempak.cpp +++ b/Source/Project64/N64 System/Mips/Mempak.cpp @@ -46,7 +46,7 @@ void LoadMempak (int Control) FileName.CreateDirectory(); } - BYTE Initilize[] = { + BYTE Initialize[] = { 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, 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, }; - memcpy(&Mempaks[Control][0], Initilize, 0x110); + memcpy(&Mempaks[Control][0], Initialize, 0x110); for (int count = 0x110; count < 0x8000; count += 2) { diff --git a/Source/Project64/N64 System/N64 Class.cpp b/Source/Project64/N64 System/N64 Class.cpp index 002c98fa7..cb57f5469 100644 --- a/Source/Project64/N64 System/N64 Class.cpp +++ b/Source/Project64/N64 System/N64 Class.cpp @@ -29,7 +29,7 @@ CN64System::CN64System ( CPlugins * Plugins, bool SavesReadOnly ) : m_InReset(false), m_EndEmulation(false), m_bCleanFrameBox(true), - m_bInitilized(false), + m_bInitialized(false), m_NextTimer(0), m_SystemTimer(m_NextTimer), m_DMAUsed(false), @@ -650,14 +650,14 @@ bool CN64System::SetActiveSystem( bool bActive ) R4300iOp::m_NextInstruction = m_NextInstruction; R4300iOp::m_JumpToLocation = m_JumpToLocation; - if (!m_bInitilized) + if (!m_bInitialized) { if (!m_MMU_VM.Initialize()) { return false; } bReset = true; - m_bInitilized = true; + m_bInitialized = true; bInitPlugin = true; } } diff --git a/Source/Project64/N64 System/N64 Class.h b/Source/Project64/N64 System/N64 Class.h index 5269c24b1..aacd5d114 100644 --- a/Source/Project64/N64 System/N64 Class.h +++ b/Source/Project64/N64 System/N64 Class.h @@ -140,7 +140,7 @@ private: int m_NextTimer; CSystemTimer m_SystemTimer; bool m_bCleanFrameBox; - bool m_bInitilized; + bool m_bInitialized; bool m_RspBroke; bool m_DMAUsed; DWORD m_Buttons[4]; diff --git a/Source/Project64/N64 System/Recompiler/Section Info.cpp b/Source/Project64/N64 System/Recompiler/Section Info.cpp index f43c05102..71ccd07cd 100644 --- a/Source/Project64/N64 System/Recompiler/Section Info.cpp +++ b/Source/Project64/N64 System/Recompiler/Section Info.cpp @@ -140,7 +140,7 @@ DWORD CCodeSection::GetNewTestValue(void) return LastTest; } -void CRegInfo::Initilize ( void ) +void CRegInfo::Initialize ( void ) { int count; diff --git a/Source/Project64/Plugins/Audio Plugin.cpp b/Source/Project64/Plugins/Audio Plugin.cpp index 1e73d1006..3b5796e2f 100644 --- a/Source/Project64/Plugins/Audio Plugin.cpp +++ b/Source/Project64/Plugins/Audio Plugin.cpp @@ -126,7 +126,7 @@ bool CAudioPlugin::Initiate(CN64System * System, CMainGui * RenderWindow) 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 DWORD ThreadID; @@ -145,7 +145,7 @@ bool CAudioPlugin::Initiate(CN64System * System, CMainGui * RenderWindow) DacrateChanged(System->SystemType()); } } - return m_Initilized; + return m_Initialized; } void CAudioPlugin::UnloadPluginDetails(void) @@ -165,7 +165,7 @@ void CAudioPlugin::UnloadPluginDetails(void) void CAudioPlugin::DacrateChanged(SYSTEM_TYPE Type) { - if (!Initilized()) { return; } + if (!Initialized()) { return; } WriteTraceF(TraceAudio, __FUNCTION__ ": SystemType: %s", Type == SYSTEM_NTSC ? "SYSTEM_NTSC" : "SYSTEM_PAL"); //DWORD Frequency = g_Reg->AI_DACRATE_REG * 30; diff --git a/Source/Project64/Plugins/Controller Plugin.cpp b/Source/Project64/Plugins/Controller Plugin.cpp index 2907b602c..8369ce6ca 100644 --- a/Source/Project64/Plugins/Controller Plugin.cpp +++ b/Source/Project64/Plugins/Controller Plugin.cpp @@ -75,7 +75,7 @@ bool CControl_Plugin::Initiate(CN64System * System, CMainGui * RenderWindow) InitiateControllers_1_0 = (void (__cdecl *)(HWND, CONTROL *))GetProcAddress( (HMODULE)m_hDll, "InitiateControllers" ); if (InitiateControllers_1_0 == NULL) { return false; } InitiateControllers_1_0((HWND)RenderWindow->m_hMainWindow,m_PluginControllers); - m_Initilized = true; + m_Initialized = true; } else if (m_PluginInfo.Version >= 0x0101) { @@ -107,7 +107,7 @@ bool CControl_Plugin::Initiate(CN64System * System, CMainGui * RenderWindow) ControlInfo.MemoryBswaped = TRUE; InitiateControllers_1_1(&ControlInfo); - m_Initilized = true; + m_Initialized = true; } //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); CloseHandle(hthread); - return m_Initilized; + return m_Initialized; } void CControl_Plugin::UnloadPluginDetails(void) diff --git a/Source/Project64/Plugins/GFX plugin.cpp b/Source/Project64/Plugins/GFX plugin.cpp index e8534f4f6..771af44ee 100644 --- a/Source/Project64/Plugins/GFX plugin.cpp +++ b/Source/Project64/Plugins/GFX plugin.cpp @@ -95,7 +95,7 @@ bool CGfxPlugin::LoadFunctions ( void ) bool CGfxPlugin::Initiate(CN64System * System, CMainGui * RenderWindow) { - if (m_Initilized) + if (m_Initialized) Close(); typedef struct { @@ -213,14 +213,14 @@ bool CGfxPlugin::Initiate(CN64System * System, CMainGui * RenderWindow) 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 DWORD ThreadID; HANDLE hthread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)DummyFunction, NULL, 0, &ThreadID); CloseHandle(hthread); - return m_Initilized; + return m_Initialized; } void CGfxPlugin::UnloadPluginDetails(void) diff --git a/Source/Project64/Plugins/Plugin Base.cpp b/Source/Project64/Plugins/Plugin Base.cpp index f0a2c7848..0e1f0f8d5 100644 --- a/Source/Project64/Plugins/Plugin Base.cpp +++ b/Source/Project64/Plugins/Plugin Base.cpp @@ -12,7 +12,7 @@ CPlugin::CPlugin() : m_hDll(NULL), - m_Initilized(false), + m_Initialized(false), m_RomOpen(false), RomOpen(NULL), RomClosed(NULL), @@ -169,10 +169,10 @@ void CPlugin::Close() { WriteTraceF(PluginTraceType(),__FUNCTION__ "(%s): Start",PluginType()); RomClose(); - if (m_Initilized) + if (m_Initialized) { CloseDLL(); - m_Initilized = false; + m_Initialized = false; } WriteTraceF(PluginTraceType(),__FUNCTION__ "(%s): Done",PluginType()); } diff --git a/Source/Project64/Plugins/Plugin Base.h b/Source/Project64/Plugins/Plugin Base.h index 42a95f24a..0d5e92d4d 100644 --- a/Source/Project64/Plugins/Plugin Base.h +++ b/Source/Project64/Plugins/Plugin Base.h @@ -17,7 +17,7 @@ public: CPlugin(); virtual ~CPlugin(); 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 GetSettingStartRange() const = 0; @@ -50,7 +50,7 @@ protected: void(__cdecl *SetSettingInfo3) (PLUGIN_SETTINGS3 *); void * m_hDll; - bool m_Initilized, m_RomOpen; + bool m_Initialized, m_RomOpen; PLUGIN_INFO m_PluginInfo; // Loads a function pointer from the currently loaded DLL diff --git a/Source/Project64/Plugins/Plugin Class.cpp b/Source/Project64/Plugins/Plugin Class.cpp index 1a6ba89d6..fec424706 100644 --- a/Source/Project64/Plugins/Plugin Class.cpp +++ b/Source/Project64/Plugins/Plugin Class.cpp @@ -316,7 +316,7 @@ void CPlugins::ConfigPlugin ( DWORD hParent, PLUGIN_TYPE Type ) { switch (Type) { case PLUGIN_TYPE_RSP: if (m_RSP == NULL || m_RSP->DllConfig == NULL) { break; } - if (!m_RSP->Initilized()) { + if (!m_RSP->Initialized()) { if (!m_RSP->Initiate(NULL,NULL)) { break; } @@ -325,7 +325,7 @@ void CPlugins::ConfigPlugin ( DWORD hParent, PLUGIN_TYPE Type ) { break; case PLUGIN_TYPE_GFX: if (m_Gfx == NULL || m_Gfx->DllConfig == NULL) { break; } - if (!m_Gfx->Initilized()) { + if (!m_Gfx->Initialized()) { if (!m_Gfx->Initiate(NULL,m_DummyWindow)) { break; } @@ -334,7 +334,7 @@ void CPlugins::ConfigPlugin ( DWORD hParent, PLUGIN_TYPE Type ) { break; case PLUGIN_TYPE_AUDIO: if (m_Audio == NULL || m_Audio->DllConfig == NULL) { break; } - if (!m_Audio->Initilized()) { + if (!m_Audio->Initialized()) { if (!m_Audio->Initiate(NULL,m_DummyWindow)) { break; } @@ -343,7 +343,7 @@ void CPlugins::ConfigPlugin ( DWORD hParent, PLUGIN_TYPE Type ) { break; case PLUGIN_TYPE_CONTROLLER: if (m_Control == NULL || m_Control->DllConfig == NULL) { break; } - if (!m_Control->Initilized()) { + if (!m_Control->Initialized()) { if (!m_Control->Initiate(NULL,m_DummyWindow)) { break; } diff --git a/Source/Project64/Plugins/RSP Plugin.cpp b/Source/Project64/Plugins/RSP Plugin.cpp index 5164037f1..e660a8cd0 100644 --- a/Source/Project64/Plugins/RSP Plugin.cpp +++ b/Source/Project64/Plugins/RSP Plugin.cpp @@ -184,13 +184,13 @@ bool CRSP_Plugin::Initiate(CPlugins * Plugins, CN64System * System) } InitiateRSP(Info, &m_CycleCount); - m_Initilized = true; + m_Initialized = true; //jabo had a bug so I call CreateThread so his dllmain gets called again DWORD ThreadID; HANDLE hthread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)DummyFunction, NULL, 0, &ThreadID); CloseHandle(hthread); - return m_Initilized; + return m_Initialized; } void CRSP_Plugin::UnloadPluginDetails(void) diff --git a/Source/Project64/Settings/SettingType/SettingsType-Application.cpp b/Source/Project64/Settings/SettingType/SettingsType-Application.cpp index f41bfc841..08fad99ce 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-Application.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-Application.cpp @@ -59,7 +59,7 @@ CSettingTypeApplication::~CSettingTypeApplication() } -void CSettingTypeApplication::Initilize( const char * /*AppName*/ ) +void CSettingTypeApplication::Initialize( const char * /*AppName*/ ) { stdstr SettingsFile, OrigSettingsFile; diff --git a/Source/Project64/Settings/SettingType/SettingsType-Application.h b/Source/Project64/Settings/SettingType/SettingsType-Application.h index 49bd006e3..c53bf59a7 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-Application.h +++ b/Source/Project64/Settings/SettingType/SettingsType-Application.h @@ -58,8 +58,8 @@ public: // Delete the setting virtual void Delete ( int Index ); - // Initilize this class to use ini or registry - static void Initilize ( const char * AppName ); + // Initialize this class to use ini or registry + static void Initialize( const char * AppName ); static void CleanUp ( void ); static void Flush ( void ); diff --git a/Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp b/Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp index 3f05d41cc..d40c2c771 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp @@ -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->SetAutoFlush(false); diff --git a/Source/Project64/Settings/SettingType/SettingsType-Cheats.h b/Source/Project64/Settings/SettingType/SettingsType-Cheats.h index dfbbbcc97..1bbdcfe7e 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-Cheats.h +++ b/Source/Project64/Settings/SettingType/SettingsType-Cheats.h @@ -46,8 +46,8 @@ public: // Delete the setting virtual void Delete ( int Index ); - // Initilize this class to use ini or registry - static void Initilize ( void ); + // Initialize this class to use ini or registry + static void Initialize ( void ); static void CleanUp ( void ); static void FlushChanges ( void ); diff --git a/Source/Project64/Settings/SettingType/SettingsType-GameSetting.cpp b/Source/Project64/Settings/SettingType/SettingsType-GameSetting.cpp index d8233a916..a04feff24 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-GameSetting.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-GameSetting.cpp @@ -35,7 +35,7 @@ CSettingTypeGame::~CSettingTypeGame() { } -void CSettingTypeGame::Initilize ( void ) +void CSettingTypeGame::Initialize ( void ) { UpdateSettings(NULL); g_Settings->RegisterChangeCB(Game_IniKey,NULL,UpdateSettings); diff --git a/Source/Project64/Settings/SettingType/SettingsType-GameSetting.h b/Source/Project64/Settings/SettingType/SettingsType-GameSetting.h index f1dbe5c99..b8875c4da 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-GameSetting.h +++ b/Source/Project64/Settings/SettingType/SettingsType-GameSetting.h @@ -31,7 +31,7 @@ public: virtual bool IndexBasedSetting ( void ) const { return false; } virtual SettingType GetSettingType ( void ) const { return SettingType_GameSetting; } - static void Initilize ( void ); + static void Initialize( void ); static void CleanUp ( void ); //return the values diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp b/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp index 184bab4b7..e1107263c 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp @@ -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_GlideIniFile = new CIniFile(g_Settings->LoadString(SupportFile_Glide64RDB).c_str()); diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.h b/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.h index d020c67fe..1658b9d88 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.h +++ b/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.h @@ -43,7 +43,7 @@ public: // Delete the setting virtual void Delete ( int Index ); - static void Initilize ( void ); + static void Initialize( void ); static void CleanUp ( void ); protected: diff --git a/Source/Project64/Settings/Settings Class.cpp b/Source/Project64/Settings/Settings Class.cpp index a6fe58e20..2f0710c93 100644 --- a/Source/Project64/Settings/Settings Class.cpp +++ b/Source/Project64/Settings/Settings Class.cpp @@ -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(); - CSettingTypeApplication::Initilize(AppName); - CSettingTypeRomDatabase::Initilize(); - CSettingTypeGame::Initilize(); - CSettingTypeCheats::Initilize(); + CSettingTypeApplication::Initialize(AppName); + CSettingTypeRomDatabase::Initialize(); + CSettingTypeGame::Initialize(); + CSettingTypeCheats::Initialize(); g_Settings->SaveString(Setting_ApplicationName,AppName); return true; diff --git a/Source/Project64/Settings/Settings Class.h b/Source/Project64/Settings/Settings Class.h index 6f45e5797..28032cecb 100644 --- a/Source/Project64/Settings/Settings Class.h +++ b/Source/Project64/Settings/Settings Class.h @@ -46,7 +46,7 @@ public: CSettings(void); ~CSettings(void); - bool Initilize ( const char * AppName ); + bool Initialize ( const char * AppName ); //return the values bool LoadBool ( SettingID Type ); diff --git a/Source/Project64/main.cpp b/Source/Project64/main.cpp index c8f876e52..0e82bd905 100644 --- a/Source/Project64/main.cpp +++ b/Source/Project64/main.cpp @@ -189,14 +189,14 @@ int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR / g_Lang = new CLanguage(); g_Settings = new CSettings; - g_Settings->Initilize(AppName()); + g_Settings->Initialize(AppName()); if (g_Settings->LoadBool(Setting_CheckEmuRunning) && TerminatedExistingEmu()) { delete g_Settings; g_Settings = new CSettings; - g_Settings->Initilize(AppName()); + g_Settings->Initialize(AppName()); } InitializeLog();