Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-07 03:12:36 +01:00
Code Issues Projects Releases Activity

Don't replace nearby vehicles / characters on creation

Browse Source
This commit is contained in:
Jannik Vogel 2016-05-29 16:00:32 +02:00
parent 8bf6780e84
commit 340b2f7159
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rwengine/src/script/modules/ObjectModule.cpp
View File

@ -97,16 +97,6 @@ void game_create_character(const ScriptArguments& args)
position = args.getWorld()->getGroundAtPosition(position);
}
// If there is already a chracter less than this distance away, it will be destroyed.
const float replaceThreshold = 2.f;
for(auto& p : args.getWorld()->pedestrianPool.objects)
{
if( glm::distance(position, p.second->getPosition()) < replaceThreshold )
{
args.getWorld()->destroyObjectQueued(p.second);
}
}
auto character = args.getWorld()->createPedestrian(id, position + spawnMagic);
/* Controller will give ownership to character */
new DefaultAIController(character);
@ -127,24 +117,14 @@ void game_create_vehicle(const ScriptArguments& args)
position = args.getWorld()->getGroundAtPosition(position);
}
position += spawnMagic;
// If there is already a vehicle less than this distance away, it will be destroyed.
const float replaceThreshold = 1.f;
for(auto& p : args.getWorld()->vehiclePool.objects)
{
if( glm::distance(position, p.second->getPosition()) < replaceThreshold )
{
args.getWorld()->destroyObjectQueued(p.second);
}
}
auto vehicle = args.getWorld()->createVehicle(id, position);
if ( args.getThread()->isMission )
{
args.getState()->missionObjects.push_back(vehicle->getGameObjectID());
}
*args[4].globalInteger = vehicle->getGameObjectID();
}