summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/core/main.cpp8
-rw-r--r--src/skel/glfw/glfw.cpp8
-rw-r--r--src/skel/platform.h2
-rw-r--r--src/skel/skeleton.cpp14
-rw-r--r--src/skel/skeleton.h18
-rw-r--r--src/skel/win/win.cpp8
-rw-r--r--src/vehicles/Vehicle.h3
7 files changed, 29 insertions, 32 deletions
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 1ea8dc7f..acdf6f4e 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -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;
}
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index fc23e900..21115585 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -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);
diff --git a/src/skel/platform.h b/src/skel/platform.h
index 65e20673..cbb1be28 100644
--- a/src/skel/platform.h
+++ b/src/skel/platform.h
@@ -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);
diff --git a/src/skel/skeleton.cpp b/src/skel/skeleton.cpp
index 5191eda7..8191107e 100644
--- a/src/skel/skeleton.cpp
+++ b/src/skel/skeleton.cpp
@@ -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;
}
diff --git a/src/skel/skeleton.h b/src/skel/skeleton.h
index 8303bd9a..b5ea5abf 100644
--- a/src/skel/skeleton.h
+++ b/src/skel/skeleton.h
@@ -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);
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 9a885818..83860f04 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -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));
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index f7205c7d..06bdf714 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -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: