Fix typo on #define for x86. Fixes for debug build SCL errors. Able t…

…o play through tutorial level on new game. Got a crash on loading the next level though.

NOLF2/ClientShellDLL/ClientShellShared/ScatterFX.cpp

@@ -297,9 +297,12 @@ bool CScatterFX::UpdateSubVolumes( void )
 	if( !m_bEnabled )
 	{
 		std::set<CScatterFXSubVolume*>::iterator it = activeSubVolumes.begin();
-		for( ; it != activeSubVolumes.end(); it++ )
+		while( it != activeSubVolumes.end() )
 		{
+			std::set<CScatterFXSubVolume*>::iterator next = it;
+			next++;
 			(*it)->Deactivate();
+			it = next;
 		}
 
 		return true;
@@ -313,9 +316,12 @@ bool CScatterFX::UpdateSubVolumes( void )
 	{
 		// camera is farther away than the max draw distance for this volume, so kill all the subvolumes
 		std::set<CScatterFXSubVolume*>::iterator it = activeSubVolumes.begin();
-		for( ; it != activeSubVolumes.end(); it++ )
+		while( it != activeSubVolumes.end() )
 		{
+			std::set<CScatterFXSubVolume*>::iterator next = it;
+			next++;
 			(*it)->Deactivate();
+			it = next;
 		}
 
 		// don't test any of the subvolumes directly

NOLF2/ObjectDLL/ObjectShared/AIGoalMgr.cpp

@@ -997,6 +997,7 @@ void CAIGoalMgr::UpdateGoals()
 			if( pGoal->GetDeleteGoalNextUpdate() )
 			{
 				RemoveGoal( pGoal->GetGoalType() );
+				it = m_lstGoals.begin();
 			}
 			else {
 				++it;

NOLF2/ObjectDLL/ObjectShared/AIStimulusMgr.cpp

@@ -1351,7 +1351,7 @@ void CAIStimulusMgr::UpdateSensingList()
 		// Call HandleSenses to increment/decrement sense values after a
 		// a stimulus has been found, or the list has been exhausted.
 
-		if( ( itRecordPair == m_stmStimuliMap.end() ) ||
+		if( ( pRecord == NULL) ||
 			( pSensing->GetDoneProcessingStimuli() ) )
 		{
 			// Handle senses in the AI's sense recorder.  This will check the cycle stamp to

runtime/render_a/src/sys/d3d/d3d_renderworld_occluder.cpp

@@ -426,21 +426,21 @@ PolySide COccludee::SplitPlane(const LTPlane &cPlane, bool bSplitOccluded)
 			{
 				case FrontSide : 
 					++iCurOutline;
-					break;
+					goto endLoop;
 				case BackSide : 
 					if ((iCurOutline + 1) != m_aVisible.end())
 						*iCurOutline = m_aVisible.back();
 					m_aVisible.pop_back();
 					ASSERT(sOccluded.size() > 2);
 					m_aOccluded.push_back(sOccluded);
-					break;
+					goto endLoop;
 				case Intersect :
 					ASSERT(sVisible.size() > 2);
 					*iCurOutline = sVisible;
 					++iCurOutline;
 					ASSERT(sOccluded.size() > 2);
 					m_aOccluded.push_back(sOccluded);
-					break;
+					goto endLoop;
 			}
 		}
 	}
@@ -461,21 +461,22 @@ PolySide COccludee::SplitPlane(const LTPlane &cPlane, bool bSplitOccluded)
 					m_aOccluded.pop_back();
 					ASSERT(sVisible.size() > 2);
 					m_aVisible.push_back(sVisible);
-					break;
+					goto endLoop;
 				case BackSide :
 					++iCurOutline;
-					break;
+					goto endLoop;
 				case Intersect :
 					ASSERT(sOccluded.size() > 2);
 					*iCurOutline = sOccluded;
 					++iCurOutline;
 					ASSERT(sVisible.size() > 2);
 					m_aVisible.push_back(sVisible);
-					break;
+					goto endLoop;
 			}
 		}
 	}
 
+	endLoop:
 	if (m_aVisible.empty())
 		return BackSide;
 	if (m_aOccluded.empty())

runtime/sound/src/iltsound.h

@@ -43,7 +43,7 @@
 // Uncomment one of these to use filtering, only one can be active
 //#define USE_DX8_SOFTWARE_FILTERS
 // We don't have the EAX library for x64 and USE_DX8_SOFTWARE_FILTERS seems to be broken too
-#ifdef _M_IX8
+#ifdef _M_IX86
 #ifndef USE_EAX20_HARDWARE_FILTERS
 #define USE_EAX20_HARDWARE_FILTERS
 #endif