History

resolve conflicts after merge with upstream master

Stephen Birarda committed 13 years ago

Commit dac660e1 parent 5ddd9a92 files · +239 −242Browse files

Showing the changes to interface/src/main.cpp (1 of 2 files). Show all

Unified · Split

interface/src/main.cpp+2−2
@@ -914,7 +914,7 @@ void display(void) · 913 unmodified lines
914 agent != agentList->end();914 agent != agentList->end();
915 agent++) {915 agent++) {
916 if ((*agent).getLinkedData() != NULL && (*agent).getType() == AGENT_TYPE_AVATAR) {916 if ((*agent).getLinkedData() != NULL && (*agent).getType() == AGENT_TYPE_AVATAR) {
917 Head *avatar = (Head *)(*agent).getLinkedData();917 Avatar *avatar = (Avatar *)(*agent).getLinkedData();
918 avatar->render(0);918 avatar->render(0);
919 }919 }
920 }920 }
@@ -1500,7 +1500,7 @@ void idle(void) { · 579 unmodified lines
1500 AgentList * agentList = AgentList::getInstance();1500 AgentList * agentList = AgentList::getInstance();
1501 for(AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {1501 for(AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) {
1502 if ((*agent).getLinkedData() != NULL) {1502 if ((*agent).getLinkedData() != NULL) {
1503 Head *avatar = (Head *)(*agent).getLinkedData();1503 Avatar *avatar = (Avatar *)(*agent).getLinkedData();
1504 avatar->simulate(deltaTime);1504 avatar->simulate(deltaTime);
1505 }1505 }
1506 }1506 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t