a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-22 23:50:00 +00:00
Code Issues Projects Releases Wiki Activity

skeleton typos

Browse source
This commit is contained in:
aap 2020-05-23 11:34:40 +02:00
parent e18eb0ce01
commit e2d3ef449c
7 changed files with 29 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/main.cpp
View file

@ -328,7 +328,7 @@ PluginAttach(void)
static RwBool
Initialise3D(void *param)
{
if (RsRwInitialise(param))
if (RsRwInitialize(param))
{
#ifdef DEBUGMENU
DebugMenuInit();
@ -1146,10 +1146,10 @@ AppEventHandler(RsEvent event, void *param)
{
switch( event )
{
case rsINITIALISE:
case rsINITIALIZE:
{
CGame::InitialiseOnceBeforeRW();
return RsInitialise() ? rsEVENTPROCESSED : rsEVENTERROR;
return RsInitialize() ? rsEVENTPROCESSED : rsEVENTERROR;
}
case rsCAMERASIZE:
@ -1161,7 +1161,7 @@ AppEventHandler(RsEvent event, void *param)
return rsEVENTPROCESSED;
}
case rsRWINITIALISE:
case rsRWINITIALIZE:
{
return Initialise3D(param) ? rsEVENTPROCESSED : rsEVENTERROR;
}

8
src/skel/glfw/glfw.cpp
View file

@ -274,7 +274,7 @@ psNativeTextureSupport(void)
*****************************************************************************
*/
RwBool
psInitialise(void)
psInitialize(void)
{
PsGlobal.lastMousePos.x = PsGlobal.lastMousePos.y = 0.0f;
@ -789,7 +789,7 @@ RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode)
useDefault = TRUE;
if ( RsEventHandler(rsRWINITIALISE, &openParams) == rsEVENTERROR )
if ( RsEventHandler(rsRWINITIALIZE, &openParams) == rsEVENTERROR )
return FALSE;
RwInitialised = TRUE;
@ -1312,7 +1312,7 @@ main(int argc, char *argv[])
* 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;
}
@ -1355,7 +1355,7 @@ main(int argc, char *argv[])
/*
* Initialize the 3D (RenderWare) components of the app...
*/
if( rsEVENTERROR == RsEventHandler(rsRWINITIALISE, &openParams) )
if( rsEVENTERROR == RsEventHandler(rsRWINITIALIZE, &openParams) )
{
RsEventHandler(rsTERMINATE, nil);

2
src/skel/platform.h
View file

@ -15,7 +15,7 @@ extern RwUInt32 psTimer(void);
extern double psTimer(void);
#endif
extern RwBool psInitialise(void);
extern RwBool psInitialize(void);
extern void psTerminate(void);
extern void psCameraShowRaster(RwCamera *camera);

14
src/skel/skeleton.cpp
View file

@ -246,8 +246,8 @@ RsEventHandler(RsEvent event, void *param)
result = (rsEVENTPROCESSED);
break;
case rsRWINITIALISE:
result = (RsRwInitialise(param) ?
case rsRWINITIALIZE:
result = (RsRwInitialize(param) ?
rsEVENTPROCESSED : rsEVENTERROR);
break;
@ -256,9 +256,9 @@ RsEventHandler(RsEvent event, void *param)
result = (rsEVENTPROCESSED);
break;
case rsINITIALISE:
case rsINITIALIZE:
result =
(RsInitialise()? rsEVENTPROCESSED : rsEVENTERROR);
(RsInitialize()? rsEVENTPROCESSED : rsEVENTERROR);
break;
default:
@ -294,7 +294,7 @@ RsRwTerminate(void)
*****************************************************************************
*/
RwBool
RsRwInitialise(void *displayID)
RsRwInitialize(void *displayID)
{
RwEngineOpenParams openParams;
@ -383,7 +383,7 @@ RsTerminate(void)
*****************************************************************************
*/
RwBool
RsInitialise(void)
RsInitialize(void)
{
/*
* Initialize Platform independent data...
@ -415,7 +415,7 @@ RsInitialise(void)
RsGlobal.pad.inputEventHandler = nil;
RsGlobal.pad.used = FALSE;
result = psInitialise();
result = psInitialize();
return result;
}

18
src/skel/skeleton.h
View file

@ -61,10 +61,10 @@ enum RsEvent
_rs_18,
_rs_19,
_rs_20,
rsRWINITIALISE,
rsRWINITIALIZE,
rsRWTERMINATE,
rsSELECTDEVICE,
rsINITIALISE,
rsINITIALIZE,
rsTERMINATE,
rsIDLE,
rsFRONTENDIDLE,
@ -241,19 +241,19 @@ extern RsEventStatus RsEventHandler(RsEvent event, void *param);
extern RsEventStatus RsKeyboardEventHandler(RsEvent event, void *param);
extern RsEventStatus RsPadEventHandler(RsEvent event, void *param);
extern RwBool
RsInitialise(void);
extern RwBool
RsInitialize(void);
extern RwBool
extern RwBool
RsRegisterImageLoader(void);
extern RwBool
RsRwInitialise(void *param);
extern RwBool
RsRwInitialize(void *param);
extern RwBool
extern RwBool
RsSelectDevice(void);
extern RwBool
extern RwBool
RsInputDeviceAttach(RsInputDeviceType inputDevice,
RsInputEventHandler inputEventHandler);

8
src/skel/win/win.cpp
View file

@ -584,7 +584,7 @@ void _psPrintCpuInfo()
*****************************************************************************
*/
RwBool
psInitialise(void)
psInitialize(void)
{
PsGlobal.lastMousePos.x = PsGlobal.lastMousePos.y = 0.0f;
@ -1525,7 +1525,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;
@ -1896,7 +1896,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;
}
@ -1962,7 +1962,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));

3
src/vehicles/Vehicle.h
View file

@ -109,9 +109,6 @@ enum eFlightModel
FLIGHT_MODEL_SEAPLANE
};
// Or Weapon.h?
void FireOneInstantHitRound(CVector *shotSource, CVector *shotTarget, int32 damage);
class CVehicle : public CPhysical
{
public: