Pārlūkot izejas kodu

Do not use VisitableObjects - BlockedObjects should suffice

Dydzio 1 gadu atpakaļ
vecāks
revīzija
e56b8e86e5
2 mainītis faili ar 2 papildinājumiem un 7 dzēšanām
  1. 1 6
      lib/gameState/CGameState.cpp
  2. 1 1
      lib/mapping/CMapDefines.h

+ 1 - 6
lib/gameState/CGameState.cpp

@@ -962,12 +962,7 @@ void CGameState::initTimedEventsRemovableObjects()
 			{
 				for(const CGObjectInstance * object : getBlockingObjs(coordinate))
 				{
-					timedEvent.deletedObjectsInstances.insert(object);
-				}
-
-				for(const CGObjectInstance * object : getVisitableObjs(coordinate))
-				{
-					timedEvent.deletedObjectsInstances.insert(object);
+					timedEvent.deletedObjectsInstances.push_back(object);
 				}
 			}
 		}

+ 1 - 1
lib/mapping/CMapDefines.h

@@ -44,7 +44,7 @@ public:
 	ui32 nextOccurrence; /// specifies after how many days the event will occur the next time; 0 if event occurs only one time
 
 	std::vector<int3> deletedObjectsCoordinates;
-	std::set<const CGObjectInstance*> deletedObjectsInstances;
+	std::vector<const CGObjectInstance*> deletedObjectsInstances;
 
 	std::vector<int3> unused;
 	std::set<const CGObjectInstance*> unused2;