mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 19:29:09 +00:00
More picky compiler / standards fixes
This commit is contained in:
@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
|
||||
#include "plDetectorModifier.h"
|
||||
#include "hsGeometry3.h"
|
||||
#include <list.h>
|
||||
#include <list>
|
||||
#include <set>
|
||||
class plMessage;
|
||||
class plCameraMsg;
|
||||
|
@ -24,6 +24,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
|
||||
*==LICENSE==*/
|
||||
#include <algorithm>
|
||||
#include <iterator>
|
||||
#include "hsTimer.h"
|
||||
#include "plPhysicsSoundMgr.h"
|
||||
#include "plPhysicalSndGroup.h"
|
||||
@ -68,7 +69,7 @@ void plPhysicsSoundMgr::Update()
|
||||
fCurCollisions.clear();
|
||||
}
|
||||
|
||||
void plPhysicsSoundMgr::IStartCollision(CollidePair& cp)
|
||||
void plPhysicsSoundMgr::IStartCollision(const CollidePair& cp)
|
||||
{
|
||||
hsVector3 v1, v2;
|
||||
const hsScalar strengthThreshold = 20.0f;
|
||||
@ -104,7 +105,7 @@ void plPhysicsSoundMgr::IStartCollision(CollidePair& cp)
|
||||
}
|
||||
}
|
||||
|
||||
void plPhysicsSoundMgr::IStopCollision(CollidePair& cp)
|
||||
void plPhysicsSoundMgr::IStopCollision(const CollidePair& cp)
|
||||
{
|
||||
plPhysical* physicalA = cp.FirstPhysical();
|
||||
plPhysical* physicalB = cp.SecondPhysical();
|
||||
@ -130,7 +131,7 @@ void plPhysicsSoundMgr::IStopCollision(CollidePair& cp)
|
||||
}
|
||||
}
|
||||
|
||||
void plPhysicsSoundMgr::IUpdateCollision(CollidePair& cp)
|
||||
void plPhysicsSoundMgr::IUpdateCollision(const CollidePair& cp)
|
||||
{
|
||||
const hsScalar slideThreshhold = 0.f;
|
||||
hsVector3 v1, v2;
|
||||
|
@ -65,9 +65,9 @@ private:
|
||||
plPhysical* SecondPhysical() const;
|
||||
};
|
||||
|
||||
void IStartCollision(CollidePair& cp);
|
||||
void IStopCollision(CollidePair& cp);
|
||||
void IUpdateCollision(CollidePair& cp);
|
||||
void IStartCollision(const CollidePair& cp);
|
||||
void IStopCollision(const CollidePair& cp);
|
||||
void IUpdateCollision(const CollidePair& cp);
|
||||
void IProcessSlide(plPhysicalSndGroup* sndA, plPhysicalSndGroup* sndB, hsScalar strength);
|
||||
|
||||
typedef std::set<CollidePair> CollideSet;
|
||||
|
Reference in New Issue
Block a user