Merge branch 'master' into ps2menu

This commit is contained in:
Fire_Head
2020-06-29 09:37:53 +03:00
committed by GitHub
145 changed files with 15893 additions and 12764 deletions

View File

@ -586,7 +586,7 @@ void _psPrintCpuInfo()
*****************************************************************************
*/
RwBool
psInitialise(void)
psInitialize(void)
{
PsGlobal.lastMousePos.x = PsGlobal.lastMousePos.y = 0.0f;
@ -1570,7 +1570,7 @@ RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode)
useDefault = TRUE;
if ( RsEventHandler(rsRWINITIALISE, PSGLOBAL(window)) == rsEVENTERROR )
if ( RsEventHandler(rsRWINITIALIZE, PSGLOBAL(window)) == rsEVENTERROR )
return FALSE;
RwInitialised = TRUE;
@ -1940,7 +1940,7 @@ WinMain(HINSTANCE instance,
* Initialize the platform independent data.
* This will in turn initialize the platform specific data...
*/
if( RsEventHandler(rsINITIALISE, nil) == rsEVENTERROR )
if( RsEventHandler(rsINITIALIZE, nil) == rsEVENTERROR )
{
return FALSE;
}
@ -2006,7 +2006,7 @@ WinMain(HINSTANCE instance,
/*
* Initialize the 3D (RenderWare) components of the app...
*/
if( rsEVENTERROR == RsEventHandler(rsRWINITIALISE, PSGLOBAL(window)) )
if( rsEVENTERROR == RsEventHandler(rsRWINITIALIZE, PSGLOBAL(window)) )
{
DestroyWindow(PSGLOBAL(window));