Revert "Fix #4888"

This reverts commit 2f1d3eb.
spring · Jul 7, 2015 · 6c36d0b · 6c36d0b
1 parent 1c0cf0a
commit 6c36d0b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/rts/Sim/Projectiles/ProjectileHandler.cpp b/rts/Sim/Projectiles/ProjectileHandler.cpp
@@ -261,26 +261,12 @@ static void UPDATE_CONTAINER(T& cont) {
 	assert(cont.empty() || &(*cont.begin()) == origStart);
 }
 
-void CProjectileHandler::InitNewProjectiles()
-{
-	for (auto &p: newProjectiles) {
-		eventHandler.ProjectileCreated(p, p->GetAllyteamID());
-	}
-	newProjectiles.clear();
-#if UNSYNCED_PROJ_NOEVENT
-	for (auto &p: newUnsyncedProjectiles) {
-		eventHandler.UnsyncedProjectileCreated(p);
-	}
-	newUnsyncedProjectiles.clear();
-#endif
-}
 
 void CProjectileHandler::Update()
 {
 	{
 		SCOPED_TIMER("ProjectileHandler::Update");
-
-		InitNewProjectiles();
+
 		// particles
 		CheckCollisions(); // before :Update() to check if the particles move into stuff
 		UpdateProjectileContainer(syncedProjectiles, true);
@@ -329,7 +315,7 @@ void CProjectileHandler::AddProjectile(CProjectile* p)
 	} else {
 		unsyncedProjectiles.push_back(p);
 #if UNSYNCED_PROJ_NOEVENT
-		newUnsyncedProjectiles.push_back(p);
+		eventHandler.UnsyncedProjectileCreated(p);
 		return;
 #endif
 		freeIDs = &freeUnsyncedIDs;
@@ -366,7 +352,7 @@ void CProjectileHandler::AddProjectile(CProjectile* p)
 #endif
 	}
 
-	newProjectiles.push_back(p);
+	eventHandler.ProjectileCreated(p, p->GetAllyteamID());
 }
 
 

diff --git a/rts/Sim/Projectiles/ProjectileHandler.h b/rts/Sim/Projectiles/ProjectileHandler.h
@@ -56,7 +56,7 @@ class CProjectileHandler
 
 	float GetParticleSaturation(const bool withRandomization = true) const;
 	int   GetCurrentParticles() const;
-	
+
 	void AddProjectile(CProjectile* p);
 	void AddGroundFlash(CGroundFlash* flash);
 	void AddFlyingPiece(const float3 pos, const float3 speed, int team, const S3DOPiece* piece, const S3DOPrimitive* chunk);
@@ -83,14 +83,8 @@ class CProjectileHandler
 	FlyingPieceContainer flyingPieces3DO;     // unsynced
 	FlyingPieceContainer flyingPiecesS3O;     // unsynced
 	GroundFlashContainer groundFlashes;       // unsynced
-
-	ProjectileContainer newProjectiles;         // projectiles that need projectileCreated to be called
-#if UNSYNCED_PROJ_NOEVENT
-	ProjectileContainer newUnsyncedProjectiles; // projectiles that need UnsyncedProjectileCreated to be called
-#endif
 
 private:
-	void InitNewProjectiles();
 	void UpdateProjectileContainer(ProjectileContainer&, bool);
 
 	std::deque<int> freeSyncedIDs;            // available synced (weapon, piece) projectile ID's