Merge pull request #11 from rlcevg/fix_savegame

On load: don't clear staticVars, don't add windgen duplicates
beyond-all-reason · Mar 20, 2021 · 98185ca · 98185ca
2 parents e9f42ac + 03053b9
commit 98185ca
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/rts/Sim/Units/Scripts/CobInstance.cpp b/rts/Sim/Units/Scripts/CobInstance.cpp
@@ -61,17 +61,10 @@ inline bool CCobInstance::HasFunction(int id) const
 
 void CCobInstance::Init()
 {
-	assert(cobFile != nullptr);
+	InitCommon();
 
 	staticVars.clear();
 	staticVars.resize(cobFile->numStaticVars, 0);
-
-	MapScriptToModelPieces(&unit->localModel);
-
-	hasSetSFXOccupy  = HasFunction(COBFN_SetSFXOccupy);
-	hasRockUnit      = HasFunction(COBFN_RockUnit);
-	hasStartBuilding = HasFunction(COBFN_StartBuilding);
-
 }
 
 void CCobInstance::PostLoad()
@@ -88,7 +81,7 @@ void CCobInstance::PostLoad()
 		t->cobFile = cobFile;
 	}
 
-	Init();
+	InitCommon();
 }
 
 
@@ -111,6 +104,18 @@ CCobInstance::~CCobInstance()
 }
 
 
+void CCobInstance::InitCommon()
+{
+	assert(cobFile != nullptr);
+
+	MapScriptToModelPieces(&unit->localModel);
+
+	hasSetSFXOccupy  = HasFunction(COBFN_SetSFXOccupy);
+	hasRockUnit      = HasFunction(COBFN_RockUnit);
+	hasStartBuilding = HasFunction(COBFN_StartBuilding);
+}
+
+
 void CCobInstance::MapScriptToModelPieces(LocalModel* lmodel)
 {
 	std::vector<std::string>& pieceNames = cobFile->pieceNames; // already in lowercase!

diff --git a/rts/Sim/Units/Scripts/CobInstance.h b/rts/Sim/Units/Scripts/CobInstance.h
@@ -37,6 +37,7 @@ class CCobInstance : public CUnitScript
 	enum ThreadCallbackType { CBNone, CBKilled, CBAimWeapon, CBAimShield };
 
 protected:
+	void InitCommon();
 	void MapScriptToModelPieces(LocalModel* lmodel);
 
 	int RealCall(int functionId, std::array<int, 1 + MAX_COB_ARGS>& args, ThreadCallbackType cb, int cbParam, int* retCode);

diff --git a/rts/Sim/Units/Unit.cpp b/rts/Sim/Units/Unit.cpp
@@ -398,9 +398,6 @@ void CUnit::PostInit(const CUnit* builder)
 
 void CUnit::PostLoad()
 {
-	if (unitDef->windGenerator > 0.0f)
-		envResHandler.AddGenerator(this);
-
 	eventHandler.RenderUnitCreated(this, isCloaked);
 }