a3x
/
re3
mirror of https://git.rip/DMCA_FUCKER/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

skeleton typos

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

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

@ -274,7 +274,7 @@ psNativeTextureSupport(void)
***************************************************************************** *****************************************************************************
*/ */
RwBool RwBool
psInitialise(void) psInitialize(void)
{ {
PsGlobal.lastMousePos.x = PsGlobal.lastMousePos.y = 0.0f; PsGlobal.lastMousePos.x = PsGlobal.lastMousePos.y = 0.0f;
@ -789,7 +789,7 @@ RwBool _psSetVideoMode(RwInt32 subSystem, RwInt32 videoMode)
useDefault = TRUE; useDefault = TRUE;
if ( RsEventHandler(rsRWINITIALISE, &openParams) == rsEVENTERROR ) if ( RsEventHandler(rsRWINITIALIZE, &openParams) == rsEVENTERROR )
return FALSE; return FALSE;
RwInitialised = TRUE; RwInitialised = TRUE;
@ -1312,7 +1312,7 @@ main(int argc, char *argv[])
* Initialize the platform independent data. * Initialize the platform independent data.
* This will in turn initialize the platform specific data... * This will in turn initialize the platform specific data...
*/ */
if( RsEventHandler(rsINITIALISE, nil) == rsEVENTERROR ) if( RsEventHandler(rsINITIALIZE, nil) == rsEVENTERROR )
{ {
return FALSE; return FALSE;
} }
@ -1355,7 +1355,7 @@ main(int argc, char *argv[])
/* /*
* Initialize the 3D (RenderWare) components of the app... * Initialize the 3D (RenderWare) components of the app...
*/ */
if( rsEVENTERROR == RsEventHandler(rsRWINITIALISE, &openParams) ) if( rsEVENTERROR == RsEventHandler(rsRWINITIALIZE, &openParams) )
{ {
RsEventHandler(rsTERMINATE, nil); RsEventHandler(rsTERMINATE, nil);

2
src/skel/platform.h
View File

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

14
src/skel/skeleton.cpp
View File

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

18
src/skel/skeleton.h
View File

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

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

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

3
src/vehicles/Vehicle.h
View File

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