Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 5 files). Show all
Unified · Split
| @@ -78,10 +78,10 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties · 77 unmodified lines | |||
| 78 | // This Node is creating a new object. If it's in motion, set this Node as the simulator. | 78 | // This Node is creating a new object. If it's in motion, set this Node as the simulator. |
| 79 | auto nodeList = DependencyManager::get<NodeList>(); | 79 | auto nodeList = DependencyManager::get<NodeList>(); |
| 80 | const QUuid myNodeID = nodeList->getSessionUUID(); | 80 | const QUuid myNodeID = nodeList->getSessionUUID(); |
| 81 | propertiesWithSimID.setSimulationOwner(myNodeID, SCRIPT_EDIT_SIMULATOR_PRIORITY); | 81 | propertiesWithSimID.setSimulationOwner(myNodeID, SCRIPT_EDIT_SIMULATION_PRIORITY); |
| 82 | 82 | ||
| 83 | // and make note of it now, so we can act on it right away. | 83 | // and make note of it now, so we can act on it right away. |
| 84 | entity->setSimulationOwner(myNodeID, SCRIPT_EDIT_SIMULATOR_PRIORITY); | 84 | entity->setSimulationOwner(myNodeID, SCRIPT_EDIT_SIMULATION_PRIORITY); |
| 85 | 85 | ||
| 86 | entity->setLastBroadcast(usecTimestampNow()); | 86 | entity->setLastBroadcast(usecTimestampNow()); |
| 87 | } else { | 87 | } else { |
| @@ -163,10 +163,10 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, EntityItemProperties proper · 75 unmodified lines | |||
| 163 | 163 | ||
| 164 | // we re-assert our simulation ownership | 164 | // we re-assert our simulation ownership |
| 165 | properties.setSimulationOwner(myNodeID, | 165 | properties.setSimulationOwner(myNodeID, |
| 166 | glm::max(entity->getSimulatorPriority(), SCRIPT_EDIT_SIMULATOR_PRIORITY)); | 166 | glm::max(entity->getSimulatorPriority(), SCRIPT_EDIT_SIMULATION_PRIORITY)); |
| 167 | } else { | 167 | } else { |
| 168 | // we make a bid for simulation ownership | 168 | // we make a bid for simulation ownership |
| 169 | properties.setSimulationOwner(myNodeID, SCRIPT_EDIT_SIMULATOR_PRIORITY); | 169 | properties.setSimulationOwner(myNodeID, SCRIPT_EDIT_SIMULATION_PRIORITY); |
| 170 | entity->flagForOwnership(); | 170 | entity->flagForOwnership(); |
| 171 | } | 171 | } |
| 172 | } | 172 | } |