All the changes

LoneGazebo · Apr 26, 2023 · 6403838 · 6403838
1 parent cd9beeb
commit 6403838
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 25 deletions.
diff --git a/(3a) EUI Compatibility Files/LUA/CityStateStatusHelper.lua b/(3a) EUI Compatibility Files/LUA/CityStateStatusHelper.lua
@@ -502,7 +502,7 @@ function GetCityStateStatusToolTip( majorPlayerID, minorPlayerID, isFullInfo )
 				end
 			end
 			if #wars > 0 then
-				table_insert( tips, L("TXT_KEY_AT_WAR_WITH", table_concat(wars, ", ") ) )
+				table_insert( tips, L("TXT_KEY_AT_WAR_WITH_CP", table_concat(wars, ", ") ) )
 			end
 
 		end

diff --git a/CvGameCoreDLL_Expansion2/CvAStar.cpp b/CvGameCoreDLL_Expansion2/CvAStar.cpp
@@ -2822,7 +2822,7 @@ map<CvPlot*,SPath> CvPathFinder::GetMultiplePaths(const CvPlot* pStartPlot, vect
 	{
 		bool operator()(const CvPlot* lhs, const CvPlot* rhs) const { return lhs->GetPlotIndex() < rhs->GetPlotIndex(); }
 	};
-	std::sort( vDestPlots.begin(), vDestPlots.end(), PrSortByPlotIndex() );
+	std::stable_sort( vDestPlots.begin(), vDestPlots.end(), PrSortByPlotIndex() );
 
 	//there is no destination! the return value will always be false
 	CvAStar::FindPathWithCurrentConfiguration(pStartPlot->getX(),pStartPlot->getY(), -1, -1, data);
@@ -3639,7 +3639,7 @@ void ReachablePlots::createIndex()
 	lookup.reserve(storage.size());
 	for (size_t i = 0; i < storage.size(); i++)
 		lookup.push_back( make_pair(storage[i].iPlotIndex,i) );
-	sort(lookup.begin(), lookup.end(), PairCompareFirst());
+	stable_sort(lookup.begin(), lookup.end(), PairCompareFirst());
 }
 
 struct EqualRangeComparison
@@ -3678,7 +3678,7 @@ void ReachablePlots::insertWithIndex(const SMovePlot& plot)
 {
 	lookup.push_back( make_pair(plot.iPlotIndex,storage.size()) );
 	storage.push_back(plot);
-	sort(lookup.begin(), lookup.end(), PairCompareFirst());
+	stable_sort(lookup.begin(), lookup.end(), PairCompareFirst());
 }
 
 FDataStream & operator >> (FDataStream & kStream, CvPathNode & node)

diff --git a/CvGameCoreDLL_Expansion2/CvArmyAI.cpp b/CvGameCoreDLL_Expansion2/CvArmyAI.cpp
@@ -271,7 +271,7 @@ CvPlot* CvArmyAI::GetCenterOfMass(bool bClampToUnit, float* pfVarX, float* pfVar
 			return NULL;
 
 		//this sorts ascending!
-		std::sort(vPlots.begin(),vPlots.end());
+		std::stable_sort(vPlots.begin(),vPlots.end());
 		return vPlots.front().pPlot;
 	}
 	else

diff --git a/CvGameCoreDLL_Expansion2/CvBuilderTaskingAI.cpp b/CvGameCoreDLL_Expansion2/CvBuilderTaskingAI.cpp
@@ -861,7 +861,7 @@ BuilderDirective CvBuilderTaskingAI::EvaluateBuilder(CvUnit* pUnit, const map<Cv
 		}
 	}
 
-	sort(m_aDirectives.begin(), m_aDirectives.end());
+	stable_sort(m_aDirectives.begin(), m_aDirectives.end());
 	LogDirectives(pUnit);
 
 	//nothing found?

diff --git a/CvGameCoreDLL_Expansion2/CvPlayer.h b/CvGameCoreDLL_Expansion2/CvPlayer.h
@@ -4098,7 +4098,6 @@ SYNC_ARCHIVE_VAR(int, m_iMinorResourceBonusCount)
 SYNC_ARCHIVE_VAR(int, m_iAbleToAnnexCityStatesCount)
 SYNC_ARCHIVE_VAR(int, m_iOnlyTradeSameIdeology)
 SYNC_ARCHIVE_VAR(int, m_iSupplyFreeUnits)
-SYNC_ARCHIVE_VAR(std::vector<CvString>, m_aistrInstantYield)
 SYNC_ARCHIVE_VAR(std::vector<bool>, m_abActiveContract)
 SYNC_ARCHIVE_VAR(int, m_iJFDReformCooldownRate)
 SYNC_ARCHIVE_VAR(int, m_iJFDGovernmentCooldownRate)
@@ -4221,7 +4220,6 @@ SYNC_ARCHIVE_VAR(int, m_iMedianTechPercentage)
 SYNC_ARCHIVE_VAR(int, m_iNumFreePolicies)
 SYNC_ARCHIVE_VAR(int, m_iNumFreePoliciesEver)
 SYNC_ARCHIVE_VAR(int, m_iNumFreeTenets)
-SYNC_ARCHIVE_VAR(int, m_iLastSliceMoved)
 SYNC_ARCHIVE_VAR(uint, m_uiStartTime)
 SYNC_ARCHIVE_VAR(bool, m_bHasUUPeriod)
 SYNC_ARCHIVE_VAR(bool, m_bNoNewWars)

diff --git a/CvGameCoreDLL_Expansion2/CvPlayerAI.cpp b/CvGameCoreDLL_Expansion2/CvPlayerAI.cpp
@@ -750,7 +750,7 @@ void CvPlayerAI::AI_considerAnnex()
 	if (!options.empty())
 	{
 		//descending by default
-		sort(options.begin(), options.end());
+		std::stable_sort(options.begin(), options.end());
 
 		CvCity* pTargetCity = options.front().option;
 		if (pTargetCity)
@@ -1926,7 +1926,7 @@ CvPlot* CvPlayerAI::FindBestMerchantTargetPlotForCash(CvUnit* pMerchant)
 		}
 	}
 
-	sort(vCandidates.begin(), vCandidates.end());
+	std::stable_sort(vCandidates.begin(), vCandidates.end());
 
 	int iFlags = CvUnit::MOVEFLAG_NO_ENEMY_TERRITORY | CvUnit::MOVEFLAG_APPROX_TARGET_RING1 | CvUnit::MOVEFLAG_APPROX_TARGET_NATIVE_DOMAIN;
 	for (size_t i = 0; i < vCandidates.size(); i++)

diff --git a/CvGameCoreDLL_Expansion2/CvSerialize.h b/CvGameCoreDLL_Expansion2/CvSerialize.h
@@ -203,9 +203,11 @@ class CvSyncVar : public CvSyncVarBase<typename VarTraits::ValueType>
 	typedef typename VarTraits::ValueType ValueType;
 	typedef typename VarTraits::ContainerType ContainerType;
 	typedef typename VarTraits::SyncVarsType SyncVarsType;
+	std::string nameStr;
 
 	CvSyncVar()
-		: CvSyncVarBase<ValueType>(EmptyString, getContainer().getSyncArchive(), currentValue())
+		: CvSyncVarBase<ValueType>(nameStr, getContainer().getSyncArchive(), currentValue()),
+		nameStr(VarTraits::name())
 	{}
 	~CvSyncVar() {}
 
@@ -273,6 +275,12 @@ class CvSyncVar : public CvSyncVarBase<typename VarTraits::ValueType>
 		ValueType other;
 		otherValue >> other;
 		const bool result = other == currentValue();
+
+		if (!result) {
+			// std::string desyncValues = std::string("Desync values, current ") + FSerialization::toString(currentValue()) + "; other " + FSerialization::toString(other) + std::string("\n");
+			// gGlobals.getDLLIFace()->netMessageDebugLog(desyncValues);
+		}
+
 		return result; // Place a conditional breakpoint here to help debug sync errors.
 	}
 	virtual void reset()
@@ -281,7 +289,7 @@ class CvSyncVar : public CvSyncVarBase<typename VarTraits::ValueType>
 	}
 	virtual const std::string& name() const
 	{
-		return EmptyString;
+		return nameStr;
 	}
 	virtual void setStackTraceRemark()
 	{
@@ -407,6 +415,7 @@ private: \
 		typedef CvSyncArchive<ContainerType>::SyncVars SyncVarsType; \
 		static inline const ValueType& Get(const ContainerType& container) { return container.memberName; } \
 		static inline ValueType& Get(ContainerType& container) { return container.memberName; } \
+		static inline const char* name() { return #memberName; } \
 		static inline const SyncVarsType& GetStorage(const CvSyncVar<memberName##_Traits>& var) { \
 			return *reinterpret_cast<const SyncVarsType*>(reinterpret_cast<const char*>(&var) - offsetof(SyncVarsType, memberName)); \
 		} \

diff --git a/CvGameCoreDLL_Expansion2/CvTacticalAI.cpp b/CvGameCoreDLL_Expansion2/CvTacticalAI.cpp
@@ -5703,7 +5703,7 @@ CvPlot* CvTacticalAI::FindNearbyTarget(CvUnit* pUnit, int iMaxTurns, bool bOffen
 	}
 
 	//second round. default sort order is descending
-	std::sort(candidates.begin(), candidates.end());
+	std::stable_sort(candidates.begin(), candidates.end());
 	std::reverse(candidates.begin(), candidates.end());
 
 	for (size_t i=0; i<candidates.size(); i++)
@@ -6132,7 +6132,7 @@ bool TacticalAIHelpers::PerformOpportunityAttack(CvUnit* pUnit, bool bAllowMovem
 	if (meleeTargets.empty())
 		return false;
 
-	std::sort(meleeTargets.begin(), meleeTargets.end());
+	std::stable_sort(meleeTargets.begin(), meleeTargets.end());
 
 	//we will never do attacks with negative scores!
 	if (meleeTargets.back().score < iScoreThreshold)
@@ -8572,7 +8572,7 @@ void CvTacticalPosition::getPreferredAssignmentsForUnit(const SUnitStats& unit,
 	gPossibleMoves.insert(gPossibleMoves.begin(), STacticalAssignment(unit.iPlotIndex, unit.iPlotIndex, unit.iUnitID, 0, unit.eStrategy, 0, A_BLOCKED));
 
 	//need to return in sorted order. note that we don't filter out bad (negative moves) they just are unlikely to get picked
-	std::sort(gPossibleMoves.begin(),gPossibleMoves.end());
+	std::stable_sort(gPossibleMoves.begin(),gPossibleMoves.end());
 
 	//don't return more than requested
 	if (gPossibleMoves.size() > (size_t)nMaxCount)

diff --git a/CvGameCoreDLL_Expansion2/CvUnit.cpp b/CvGameCoreDLL_Expansion2/CvUnit.cpp
@@ -5664,7 +5664,7 @@ bool CvUnit::jumpToNearestValidPlot()
 	}
 
 	//we want lowest scores first
-	std::sort(candidates.begin(), candidates.end());
+	std::stable_sort(candidates.begin(), candidates.end());
 
 	for (size_t i = 0; i < candidates.size(); i++)
 	{
@@ -15911,7 +15911,7 @@ void CvUnit::DoSquadMovement(CvPlot* pDestPlot)
 		int dist = plotDistance(*pLoopUnit->plot(), *pDestPlot);
 		unitsToMoveByDistance.push_back(ScoredUnit(dist, pLoopUnit));
 	}
-	std::sort(unitsToMoveByDistance.begin(), unitsToMoveByDistance.end(), greater<ScoredUnit>());
+	std::stable_sort(unitsToMoveByDistance.begin(), unitsToMoveByDistance.end(), greater<ScoredUnit>());
 
 	// Generate a list of eligible plots for these units, only adding another
 	// ring when there are still insufficient plots for the current selection
@@ -29698,7 +29698,7 @@ int CvUnit::ComputePath(const CvPlot* pToPlot, int iFlags, int iMaxTurns, bool b
 			}
 		}
 
-		std::sort(eligiblePlots.begin(), eligiblePlots.end(), less<ScoredPlot>());
+		std::stable_sort(eligiblePlots.begin(), eligiblePlots.end(), less<ScoredPlot>());
 		if (!eligiblePlots.empty())
 		{
 			pDestPlot = eligiblePlots.front().plot;

diff --git a/CvGameCoreDLL_Expansion2/CvVotingClasses.cpp b/CvGameCoreDLL_Expansion2/CvVotingClasses.cpp
@@ -6007,7 +6007,7 @@ CvString CvLeague::GetResolutionVoteOpinionDetails(ResolutionTypes eResolution,
 			}
 		}
 	}
-	std::sort(vScores.begin(), vScores.end());
+	std::stable_sort(vScores.begin(), vScores.end());
 	std::reverse(vScores.begin(), vScores.end());
 	bool bPositiveDone = false;
 	bool bNegativeDone = false;
@@ -6109,7 +6109,7 @@ CvString CvLeague::GetResolutionProposeOpinionDetails(ResolutionTypes eResolutio
 			vScores.push_back(std::make_pair(iScore, it->ePlayer));
 		}
 	}
-	std::sort(vScores.begin(), vScores.end());
+	std::stable_sort(vScores.begin(), vScores.end());
 	std::reverse(vScores.begin(), vScores.end());
 	bool bPositiveDone = false;
 	bool bNegativeDone = false;
@@ -6217,7 +6217,7 @@ CvString CvLeague::GetResolutionProposeOpinionDetails(int iTargetResolutionID, P
 			}
 		}
 	}
-	std::sort(vScores.begin(), vScores.end());
+	std::stable_sort(vScores.begin(), vScores.end());
 	std::reverse(vScores.begin(), vScores.end());
 	bool bPositiveDone = false;
 	bool bNegativeDone = false;

diff --git a/CvGameCoreDLL_Expansion2/VoxPopuli.vcxproj b/CvGameCoreDLL_Expansion2/VoxPopuli.vcxproj
@@ -61,7 +61,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)CvGameCoreDLL_Expansion2\;$(SolutionDir)CvWorldBuilderMap\include\;$(SolutionDir)CvGameCoreDLLUtil\include\;$(SolutionDir)CvLocalization\include\;$(SolutionDir)CvGameDatabase\include\;$(SolutionDir)FirePlace\include\;$(SolutionDir)FirePlace\include\FireWorks\;$(SolutionDir)ThirdPartyLibs\Lua51\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>CvGameCoreDLLPCH.h</PrecompiledHeaderFile>
-      <AdditionalOptions>/Zm211 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zm250 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>

diff --git a/FirePlace/include/FireWorks/FAutoVariableBase.h b/FirePlace/include/FireWorks/FAutoVariableBase.h
@@ -67,6 +67,11 @@ namespace FSerialization
 		static const std::string result("UNKNOWN");
 		return result;
 	}
+
+	template<typename ValueType>
+	std::string toString(const CvString & source) {
+		return source.c_str();
+	}
 }
 
 class FAutoVariableBase

diff --git a/Vox Populi Installer Files/UI_bc1/Core/CityStateStatusHelper.lua b/Vox Populi Installer Files/UI_bc1/Core/CityStateStatusHelper.lua
@@ -442,7 +442,7 @@ function GetCityStateStatusToolTip( majorPlayerID, minorPlayerID, isFullInfo )
 				end
 			end
 			if #wars > 0 then
-				table_insert( tips, L("TXT_KEY_AT_WAR_WITH", table_concat(wars, ", ") ) )
+				table_insert( tips, L("TXT_KEY_AT_WAR_WITH_CP", table_concat(wars, ", ") ) )
 			end
 
 		end

diff --git a/Vox Populi Installer Files/UI_bc1/Core/EUI_tooltip_library.lua b/Vox Populi Installer Files/UI_bc1/Core/EUI_tooltip_library.lua
@@ -2642,7 +2642,7 @@ local function GetMoodInfo( playerID )
 	tips:insertIf( #backstabs > 0 and "[ICON_PIRATE]" .. L( "TXT_KEY_DIPLO_BACKSTABBED", backstabs:concat(", ") ) )
 	tips:insertIf( #denouncements > 0 and "[ICON_DENOUNCE]" .. L( "TXT_KEY_DIPLO_DENOUNCED", denouncements:concat(", ") ) )
 	tips:insertIf( #denouncedBy > 0 and "[ICON_DENOUNCE]" .. TextColor( negativeOrPositiveTextColor[false], L( "TXT_KEY_NTFN_DENOUNCED_US_S", denouncedBy:concat(", ") ) ) )
-	tips:insertIf( #wars > 0 and "[ICON_WAR]" .. L( "TXT_KEY_AT_WAR_WITH", wars:concat(", ") ) )
+	tips:insertIf( #wars > 0 and "[ICON_WAR]" .. L( "TXT_KEY_AT_WAR_WITH_CP", wars:concat(", ") ) )
 
 	return tips:concat( "[NEWLINE]" )
 end

diff --git a/Vox Populi Installer Files/UI_bc1/NotificationPanel/NotificationPanel.lua b/Vox Populi Installer Files/UI_bc1/NotificationPanel/NotificationPanel.lua
@@ -954,7 +954,7 @@ local g_civListInstanceToolTips = { -- the tooltip function names need to match
 
 	War = function( control )
 		local player = FindPlayer( g_majorControlTable, control )
-		local tips = table( L( "TXT_KEY_AT_WAR_WITH", player:GetCivilizationShortDescriptionKey() ) )
+		local tips = table( L( "TXT_KEY_AT_WAR_WITH_CP", player:GetCivilizationShortDescriptionKey() ) )
 		local teamID = player:GetTeam()
 		local lockedWarTurns = g_activeTeam:GetNumTurnsLockedIntoWar( teamID )
 		if lockedWarTurns > 0 then