Skip to content
2 changes: 1 addition & 1 deletion Core/GameEngine/Include/GameNetwork/ConnectionManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class ConnectionManager
// For disconnect blame assignment
UnsignedInt getPingFrame();
Int getPingsSent();
Int getPingsRecieved();
Int getPingsReceived();

private:
void doRelay();
Expand Down
4 changes: 2 additions & 2 deletions Core/GameEngine/Include/GameNetwork/DisconnectManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class DisconnectManager
// For disconnect blame assignment
UnsignedInt getPingFrame();
Int getPingsSent();
Int getPingsRecieved();
Int getPingsReceived();

protected:
void sendKeepAlive(ConnectionManager *conMgr);
Expand Down Expand Up @@ -120,6 +120,6 @@ class DisconnectManager

time_t m_timeOfDisconnectScreenOn;
Int m_pingsSent;
Int m_pingsRecieved;
Int m_pingsReceived;
UnsignedInt m_pingFrame;
};
2 changes: 1 addition & 1 deletion Core/GameEngine/Include/GameNetwork/NetworkInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class NetworkInterface : public SubsystemInterface
// For disconnect blame assignment
virtual UnsignedInt getPingFrame() = 0;
virtual Int getPingsSent() = 0;
virtual Int getPingsRecieved() = 0;
virtual Int getPingsReceived() = 0;
};


Expand Down
4 changes: 2 additions & 2 deletions Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,9 @@ Int ConnectionManager::getPingsSent()
return (m_disconnectManager)?m_disconnectManager->getPingsSent():0;
}

Int ConnectionManager::getPingsRecieved()
Int ConnectionManager::getPingsReceived()
{
return (m_disconnectManager)?m_disconnectManager->getPingsRecieved():0;
return (m_disconnectManager)?m_disconnectManager->getPingsReceived():0;
}

Bool ConnectionManager::isPlayerConnected( Int playerID )
Expand Down
10 changes: 5 additions & 5 deletions Core/GameEngine/Source/GameNetwork/DisconnectManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void DisconnectManager::init() {

m_pingFrame = 0;
m_pingsSent = 0;
m_pingsRecieved = 0;
m_pingsReceived = 0;
}

void DisconnectManager::update(ConnectionManager *conMgr) {
Expand Down Expand Up @@ -124,7 +124,7 @@ void DisconnectManager::update(ConnectionManager *conMgr) {
{
m_pingFrame = TheGameLogic->getFrame();
m_pingsSent = 0;
m_pingsRecieved = 0;
m_pingsReceived = 0;

// Send the pings
if (ThePinger)
Expand Down Expand Up @@ -173,7 +173,7 @@ void DisconnectManager::update(ConnectionManager *conMgr) {
resp.avgPing, resp.hostname.c_str(), resp.repetitions));
if (resp.avgPing < 2000)
{
m_pingsRecieved += resp.repetitions;
m_pingsReceived += resp.repetitions;
}
}
}
Expand All @@ -191,9 +191,9 @@ Int DisconnectManager::getPingsSent()
return m_pingsSent;
}

Int DisconnectManager::getPingsRecieved()
Int DisconnectManager::getPingsReceived()
{
return m_pingsRecieved;
return m_pingsReceived;
}


Expand Down
6 changes: 3 additions & 3 deletions Core/GameEngine/Source/GameNetwork/Network.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class Network : public NetworkInterface
// For disconnect blame assignment
UnsignedInt getPingFrame();
Int getPingsSent();
Int getPingsRecieved();
Int getPingsReceived();

protected:
void GetCommandsFromCommandList(); ///< Remove commands from TheCommandList and put them on the Network command list.
Expand Down Expand Up @@ -231,9 +231,9 @@ Int Network::getPingsSent()
return (m_conMgr)?m_conMgr->getPingsSent():0;
}

Int Network::getPingsRecieved()
Int Network::getPingsReceived()
{
return (m_conMgr)?m_conMgr->getPingsRecieved():0;
return (m_conMgr)?m_conMgr->getPingsReceived():0;
}

Bool Network::isPlayerConnected( Int playerID ) {
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,7 @@ void RingRenderObjClass::Scale(float scalex, float scaley, float scalez)


/***********************************************************************************************
* RingRenderObjClass::Update_On_Visibilty -- Either starts or stops the animation based on vis*
* RingRenderObjClass::Update_On_Visibility -- Either starts or stops the animation based on vis*
* *
* INPUT: *
* *
Expand All @@ -1112,7 +1112,7 @@ void RingRenderObjClass::Scale(float scalex, float scaley, float scalez)
* HISTORY: *
* 4/04/00 pds : Created. *
*=============================================================================================*/
void RingRenderObjClass::Update_On_Visibilty(void)
void RingRenderObjClass::Update_On_Visibility(void)
{
// Simply start or stop the animation based on
// the visibility state of the primitive.
Expand Down
10 changes: 5 additions & 5 deletions Core/Libraries/Source/WWVegas/WW3D2/ringobj.h
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ class RingRenderObjClass : public RenderObjClass
virtual void Scale(float scale);
virtual void Scale(float scalex, float scaley, float scalez);

virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibilty (); }
virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibilty (); }
virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibilty (); }
virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibilty (); }
virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); }
virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); }
virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); }
virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); }

const AABoxClass & Get_Box(void);

Expand Down Expand Up @@ -220,7 +220,7 @@ class RingRenderObjClass : public RenderObjClass
protected:

virtual void update_cached_box(void);
void Update_On_Visibilty(void);
void Update_On_Visibility(void);

// Initialization stuff
void Init_Material (void);
Expand Down
20 changes: 10 additions & 10 deletions Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ SoundRenderObjClass::Set_Hidden (int onoff)
//
if (IsInitialized == false || Is_Not_Hidden_At_All () != before) {
IsInitialized = true;
Update_On_Visibilty ();
Update_On_Visibility ();
}

return ;
Expand All @@ -218,7 +218,7 @@ SoundRenderObjClass::Set_Visible (int onoff)
//
if (IsInitialized == false || Is_Not_Hidden_At_All () != before) {
IsInitialized = true;
Update_On_Visibilty ();
Update_On_Visibility ();
}

return ;
Expand All @@ -241,7 +241,7 @@ SoundRenderObjClass::Set_Animation_Hidden (int onoff)
//
if (IsInitialized == false || Is_Not_Hidden_At_All () != before) {
IsInitialized = true;
Update_On_Visibilty ();
Update_On_Visibility ();
}

return ;
Expand All @@ -264,7 +264,7 @@ SoundRenderObjClass::Set_Force_Visible (int onoff)
//
if (IsInitialized == false || Is_Not_Hidden_At_All () != before) {
IsInitialized = true;
Update_On_Visibilty ();
Update_On_Visibility ();
}

return ;
Expand All @@ -273,11 +273,11 @@ SoundRenderObjClass::Set_Force_Visible (int onoff)

//////////////////////////////////////////////////////////////////////////////////
//
// Update_On_Visibilty
// Update_On_Visibility
//
//////////////////////////////////////////////////////////////////////////////////
void
SoundRenderObjClass::Update_On_Visibilty (void)
SoundRenderObjClass::Update_On_Visibility (void)
{
if (Sound == nullptr) {
return ;
Expand Down Expand Up @@ -363,7 +363,7 @@ SoundRenderObjClass::Notify_Added (SceneClass *scene)
RenderObjClass::Notify_Added (scene);
scene->Register (this, SceneClass::ON_FRAME_UPDATE);

Update_On_Visibilty ();
Update_On_Visibility ();
return ;
}

Expand All @@ -379,7 +379,7 @@ SoundRenderObjClass::Notify_Removed (SceneClass *scene)
scene->Unregister (this, SceneClass::ON_FRAME_UPDATE);
RenderObjClass::Notify_Removed (scene);

Update_On_Visibilty ();
Update_On_Visibility ();
return ;
}

Expand All @@ -396,7 +396,7 @@ SoundRenderObjClass::Set_Transform (const Matrix3D &tm)

if (IsInitialized == false) {
IsInitialized = true;
Update_On_Visibilty ();
Update_On_Visibility ();
}

return ;
Expand All @@ -415,7 +415,7 @@ SoundRenderObjClass::Set_Position (const Vector3 &pos)

if (IsInitialized == false) {
IsInitialized = true;
Update_On_Visibilty ();
Update_On_Visibility ();
}

return ;
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class SoundRenderObjClass : public RenderObjClass
///////////////////////////////////////////////////////////
// Protected methods
///////////////////////////////////////////////////////////
virtual void Update_On_Visibilty (void);
virtual void Update_On_Visibility (void);

private:

Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@ AlphaVectorStruct SphereRenderObjClass::Get_Default_Vector(void) const


/***********************************************************************************************
* SphereRenderObjClass::Update_On_Visibilty -- Either starts or stops the animation based on visibility*
* SphereRenderObjClass::Update_On_Visibility -- Either starts or stops the animation based on visibility*
* *
* INPUT: *
* *
Expand All @@ -1069,7 +1069,7 @@ AlphaVectorStruct SphereRenderObjClass::Get_Default_Vector(void) const
* HISTORY: *
* 4/04/00 pds : Created. *
*=============================================================================================*/
void SphereRenderObjClass::Update_On_Visibilty(void)
void SphereRenderObjClass::Update_On_Visibility(void)
{
// Simply start or stop the animation based on
// the visibility state of the primitive.
Expand Down
10 changes: 5 additions & 5 deletions Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,10 @@ class SphereRenderObjClass : public RenderObjClass

virtual void Scale(float scale);
virtual void Scale(float scalex, float scaley, float scalez);
virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibilty (); }
virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibilty (); }
virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibilty (); }
virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibilty (); }
virtual void Set_Hidden(int onoff) { RenderObjClass::Set_Hidden (onoff); Update_On_Visibility (); }
virtual void Set_Visible(int onoff) { RenderObjClass::Set_Visible (onoff); Update_On_Visibility (); }
virtual void Set_Animation_Hidden(int onoff) { RenderObjClass::Set_Animation_Hidden (onoff); Update_On_Visibility (); }
virtual void Set_Force_Visible(int onoff) { RenderObjClass::Set_Force_Visible (onoff); Update_On_Visibility (); }


const AABoxClass & Get_Box(void);
Expand Down Expand Up @@ -341,7 +341,7 @@ class SphereRenderObjClass : public RenderObjClass

virtual void update_cached_box(void);
virtual void Update_Cached_Bounding_Volumes(void) const;
void Update_On_Visibilty(void);
void Update_On_Visibility(void);

// Initialization stuff
void Init_Material (void);
Expand Down
Loading
Loading