Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 20:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #147 from birarda/agentlist-array

Browse source 
fixes for broken build
This commit is contained in:
birarda 2013-04-25 17:10:35 -07:00
commit a55b201d13
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/main.cpp
View file

@ -813,7 +813,7 @@ void display(void)
// float firstPersonPitch = 20.0f; // float firstPersonPitch = 20.0f;
// float firstPersonUpShift = 0.1f; // float firstPersonUpShift = 0.1f;
// float firstPersonDistance = 0.0f; // float firstPersonDistance = 0.0f;
// float firstPersonTightness = 100.0f; // float firstPersonT ightness = 100.0f;
float thirdPersonPitch = 0.0f; float thirdPersonPitch = 0.0f;
float thirdPersonUpShift = -0.1f; float thirdPersonUpShift = -0.1f;

7
libraries/shared/src/AgentList.h
View file

@ -39,11 +39,6 @@ public:
static AgentList* getInstance(); static AgentList* getInstance();
typedef AgentListIterator iterator; typedef AgentListIterator iterator;
typedef ptrdiff_t difference_type;
typedef size_t size_type;
typedef Agent value_type;
typedef Agent * pointer;
typedef Agent & reference;
AgentListIterator begin() const; AgentListIterator begin() const;
AgentListIterator end() const; AgentListIterator end() const;
@ -84,7 +79,7 @@ public:
void startPingUnknownAgentsThread(); void startPingUnknownAgentsThread();
void stopPingUnknownAgentsThread(); void stopPingUnknownAgentsThread();
friend AgentListIterator; friend ::AgentListIterator;
private: private:
static AgentList* _sharedInstance; static AgentList* _sharedInstance;