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

fix a few more warnings

Browse Source
This commit is contained in:
CodeCodon
2015-08-09 01:42:32 -05:00
parent 911578cde7
commit f744e7bf42
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedObject/src/shared/object/AlterScheduler.cpp
+15 -14
View File
@@ -1184,24 +1184,25 @@ void AlterScheduler::moveObjectsFromAlterNextFrameListToAlterNowList(int schedul
{
PROFILER_AUTO_BLOCK_DEFINE("copy next frame");
NOT_NULL(s_alterNextFrameListFirst);
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.
DO_ON_VALIDATE_OBJECTS(validateObject(object));
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.
DO_ON_VALIDATE_OBJECTS(validateObject(object));
//-- Save next object in list.
Object *const nextObject = object->getNextFromAlterNextFrameList();
//-- Save next object in list.
Object *const nextObject = object->getNextFromAlterNextFrameList();
addToAlterNowList(*object);
++s_objectsAltered;
addToAlterNowList(*object);
++s_objectsAltered;
DO_ON_HARDCORE_VALIDATION( DEBUG_FATAL(findObjectInScheduleTimeMap(object), ("found object in time schedule map, unexpected.")) );
DO_ON_HARDCORE_VALIDATION( DEBUG_FATAL(findObjectInAlterNextFrameList(object), ("found object in alter next frame list, unexpected.")) );
DO_ON_HARDCORE_VALIDATION( DEBUG_FATAL(!findObjectInAlterNowList(object), ("didn't find object in alter now list, unexpected.")) );
DO_ON_HARDCORE_VALIDATION( DEBUG_FATAL(findObjectInScheduleTimeMap(object), ("found object in time schedule map, unexpected.")) );
DO_ON_HARDCORE_VALIDATION( DEBUG_FATAL(findObjectInAlterNextFrameList(object), ("found object in alter next frame list, unexpected.")) );
DO_ON_HARDCORE_VALIDATION( DEBUG_FATAL(!findObjectInAlterNowList(object), ("didn't find object in alter now list, unexpected.")) );
//-- Increment loop.
object = nextObject;
//-- Increment loop.
object = nextObject;
}
}
}
}