From f744e7bf4240a968cc03fed636fe6cd777334215 Mon Sep 17 00:00:00 2001 From: CodeCodon Date: Sun, 9 Aug 2015 01:42:32 -0500 Subject: [PATCH] fix a few more warnings --- .../library/sharedFile/src/shared/Iff.cpp | 2 +- .../src/shared/core/HoverPlaneHelper.cpp | 3 -- .../src/shared/object/AlterScheduler.cpp | 29 ++++++++++--------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/engine/shared/library/sharedFile/src/shared/Iff.cpp b/engine/shared/library/sharedFile/src/shared/Iff.cpp index 7dd0e31c..abe766d1 100644 --- a/engine/shared/library/sharedFile/src/shared/Iff.cpp +++ b/engine/shared/library/sharedFile/src/shared/Iff.cpp @@ -1356,7 +1356,7 @@ bool Iff::seek(Tag name, BlockType type) while (!atEndOfForm()) { - if (getCurrentName() == name && (type == BT_either || (type == BT_form && isCurrentForm() || (type == BT_chunk && isCurrentChunk())))) + if ((getCurrentName() == name) && ((type == BT_either) || ((type == BT_form && isCurrentForm()) || (type == BT_chunk && isCurrentChunk())))) return true; // advance past the current block diff --git a/engine/shared/library/sharedGame/src/shared/core/HoverPlaneHelper.cpp b/engine/shared/library/sharedGame/src/shared/core/HoverPlaneHelper.cpp index 4edd9e15..8c5a2497 100644 --- a/engine/shared/library/sharedGame/src/shared/core/HoverPlaneHelper.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/HoverPlaneHelper.cpp @@ -140,7 +140,6 @@ bool HoverPlaneHelper::findMinimumHoverPlane (const Object & obj, float & roll, if (!terrainObject) return false; - float oldPointHeights [10]; Vector normals [10]; Vector avgNormal; @@ -159,8 +158,6 @@ bool HoverPlaneHelper::findMinimumHoverPlane (const Object & obj, float & roll, float y = 0.0f; for (int i = 0; i < 10; ++i) { - oldPointHeights [i] = points [i].y; - if (terrainObject->getHeight (points [i], y, normals [i])) { float waterHeight = 0.0f; diff --git a/engine/shared/library/sharedObject/src/shared/object/AlterScheduler.cpp b/engine/shared/library/sharedObject/src/shared/object/AlterScheduler.cpp index f9d7e7dd..9ae447a4 100644 --- a/engine/shared/library/sharedObject/src/shared/object/AlterScheduler.cpp +++ b/engine/shared/library/sharedObject/src/shared/object/AlterScheduler.cpp @@ -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; + } } } }