swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-29 23:15:56 -04:00
Code Issues Projects Releases Wiki Activity

it is undefined operation if these are null anyway... and the compiler doesn't like them because of null pointers, so...bye

Browse Source
This commit is contained in:
DarthArgus
2015-10-16 20:57:53 -05:00
parent 71b27eba67
commit ed676cc18c
2 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/core/ServerWorld.cpp
+10 -24
View File
@@ -199,18 +199,11 @@ void compare_results_int( std::set<TriggerVolume *> &results, std::set<TriggerVo
{
TriggerVolume* volume = *iter;
ServerObject const &volumeOwner = volume->getOwner();
if ( &volumeOwner == NULL )
{
LOG("SphereGrid", ("Ack null owner!"));
}
else
{
const Object* pob = getContainingPobForObjectInWorld(volume->getOwner());
Sphere const &localSphere = volumeOwner.getLocalSphere();
Sphere world(volumeOwner.getTransform_o2w().rotateTranslate_l2p(localSphere.getCenter()), volume->getRadius());
Vector c=world.getCenter();
LOG("SphereGrid",(" (%f %f %f) %f POB = %p DIST=%f",c.x,c.y,c.z,world.getRadius(),pob, c.magnitudeBetween(v) ));
}
const Object* pob = getContainingPobForObjectInWorld(volume->getOwner());
Sphere const &localSphere = volumeOwner.getLocalSphere();
Sphere world(volumeOwner.getTransform_o2w().rotateTranslate_l2p(localSphere.getCenter()), volume->getRadius());
Vector c=world.getCenter();
LOG("SphereGrid",(" (%f %f %f) %f POB = %p DIST=%f",c.x,c.y,c.z,world.getRadius(),pob, c.magnitudeBetween(v) ));
}
LOG("SphereGrid", ("------------------ Grid Results %d ------------------",results2.size()));
@@ -218,18 +211,11 @@ void compare_results_int( std::set<TriggerVolume *> &results, std::set<TriggerVo
{
TriggerVolume* volume = *iter;
ServerObject const &volumeOwner = volume->getOwner();
if ( &volumeOwner == NULL )
{
LOG("SphereGrid", ("shit null owner."));
}
else
{
const Object* pob = getContainingPobForObjectInWorld(volume->getOwner());
Sphere const &localSphere = volumeOwner.getLocalSphere();
Sphere world(volumeOwner.getTransform_o2w().rotateTranslate_l2p(localSphere.getCenter()), volume->getRadius()); // o2p or o2w
Vector c=world.getCenter();
LOG("SphereGrid",(" (%f %f %f) %f POB = %p DIST=%f",c.x,c.y,c.z,world.getRadius(),pob, c.magnitudeBetween(v) ));
}
const Object* pob = getContainingPobForObjectInWorld(volume->getOwner());
Sphere const &localSphere = volumeOwner.getLocalSphere();
Sphere world(volumeOwner.getTransform_o2w().rotateTranslate_l2p(localSphere.getCenter()), volume->getRadius()); // o2p or o2w
Vector c=world.getCenter();
LOG("SphereGrid",(" (%f %f %f) %f POB = %p DIST=%f",c.x,c.y,c.z,world.getRadius(),pob, c.magnitudeBetween(v) ));
}
DEBUG_FATAL(true,("FATAL: SphereGrid failed to match SphereTree result set."));
engine/shared/library/sharedObject/src/shared/object/AlterScheduler.cpp
+2 -2
View File
@@ -1184,7 +1184,7 @@ void AlterScheduler::moveObjectsFromAlterNextFrameListToAlterNowList(int schedul
{
PROFILER_AUTO_BLOCK_DEFINE("copy next frame");
if (s_alterNextFrameListFirst != NULL) {
//if (s_alterNextFrameListFirst != NULL) {
for (Object *object = s_alterNextFrameListFirst[schedulePhaseIndex]->getNextFromAlterNextFrameList(); object != NULL; )
{
//-- Add object to alter now list. This removes the object from the alter next frame list.
@@ -1203,7 +1203,7 @@ void AlterScheduler::moveObjectsFromAlterNextFrameListToAlterNowList(int schedul
//-- Increment loop.
object = nextObject;
}
}
//}
}
}