Skip to content

unify(common-ini): Move shared INI loaders to Core #2395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OmarAglan wants to merge 4 commits into
base: main
Choose a base branch
from
Open

unify(common-ini): Move shared INI loaders to Core #2395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31a1021
fix(common-ini): keep starting money parser zh-only
OmarAglan Mar 4, 2026
32cbb90
unify(common-ini): move shared INI loaders to Core
OmarAglan Mar 4, 2026
7567d7f
bugfix(common-ini): enable starting money choice parsing in Generals
OmarAglan Mar 5, 2026
833457b
Merge branch 'main' into unify/common-ini
OmarAglan Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions Core/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,33 +584,33 @@ set(GAMEENGINE_SRC
Source/Common/GameUtility.cpp
# Source/Common/GlobalData.cpp
Source/Common/INI/INI.cpp
# Source/Common/INI/INIAiData.cpp
# Source/Common/INI/INIAnimation.cpp
Source/Common/INI/INIAiData.cpp
Source/Common/INI/INIAnimation.cpp
Source/Common/INI/INIAudioEventInfo.cpp
# Source/Common/INI/INICommandButton.cpp
# Source/Common/INI/INICommandSet.cpp
# Source/Common/INI/INIControlBarScheme.cpp
# Source/Common/INI/INICrate.cpp
# Source/Common/INI/INIDamageFX.cpp
# Source/Common/INI/INIDrawGroupInfo.cpp
# Source/Common/INI/INIGameData.cpp
# Source/Common/INI/INIMapCache.cpp
# Source/Common/INI/INIMapData.cpp
# Source/Common/INI/INIMappedImage.cpp
Source/Common/INI/INICommandButton.cpp
Source/Common/INI/INICommandSet.cpp
Source/Common/INI/INIControlBarScheme.cpp
Source/Common/INI/INICrate.cpp
Source/Common/INI/INIDamageFX.cpp
Source/Common/INI/INIDrawGroupInfo.cpp
Source/Common/INI/INIGameData.cpp
Source/Common/INI/INIMapCache.cpp
Source/Common/INI/INIMapData.cpp
Source/Common/INI/INIMappedImage.cpp
Source/Common/INI/INIMiscAudio.cpp
# Source/Common/INI/INIModel.cpp
# Source/Common/INI/INIMultiplayer.cpp
# Source/Common/INI/INIObject.cpp
# Source/Common/INI/INIParticleSys.cpp
# Source/Common/INI/INISpecialPower.cpp
# Source/Common/INI/INITerrain.cpp
# Source/Common/INI/INITerrainBridge.cpp
# Source/Common/INI/INITerrainRoad.cpp
# Source/Common/INI/INIUpgrade.cpp
Source/Common/INI/INIModel.cpp
Source/Common/INI/INIMultiplayer.cpp
Source/Common/INI/INIObject.cpp
Source/Common/INI/INIParticleSys.cpp
Source/Common/INI/INISpecialPower.cpp
Source/Common/INI/INITerrain.cpp
Source/Common/INI/INITerrainBridge.cpp
Source/Common/INI/INITerrainRoad.cpp
Source/Common/INI/INIUpgrade.cpp
Source/Common/INI/INIVideo.cpp
# Source/Common/INI/INIWater.cpp
# Source/Common/INI/INIWeapon.cpp
# Source/Common/INI/INIWebpageURL.cpp
Source/Common/INI/INIWater.cpp
Source/Common/INI/INIWeapon.cpp
Source/Common/INI/INIWebpageURL.cpp
# Source/Common/Language.cpp
# Source/Common/MessageStream.cpp
# Source/Common/MiniLog.cpp
Expand Down
0 ...ameEngine/Source/Common/INI/INIAiData.cpp → ...ameEngine/Source/Common/INI/INIAiData.cpp
View file
Open in desktop
File renamed without changes.
0 ...Engine/Source/Common/INI/INIAnimation.cpp → ...Engine/Source/Common/INI/INIAnimation.cpp
View file
Open in desktop
File renamed without changes.
0 ...ne/Source/Common/INI/INICommandButton.cpp → ...ne/Source/Common/INI/INICommandButton.cpp
View file
Open in desktop
File renamed without changes.
0 ...ngine/Source/Common/INI/INICommandSet.cpp → ...ngine/Source/Common/INI/INICommandSet.cpp
View file
Open in desktop
File renamed without changes.
0 ...Source/Common/INI/INIControlBarScheme.cpp → ...Source/Common/INI/INIControlBarScheme.cpp
View file
Open in desktop
File renamed without changes.
0 ...GameEngine/Source/Common/INI/INICrate.cpp → ...GameEngine/Source/Common/INI/INICrate.cpp
View file
Open in desktop
File renamed without changes.
0 ...eEngine/Source/Common/INI/INIDamageFX.cpp → ...eEngine/Source/Common/INI/INIDamageFX.cpp
View file
Open in desktop
File renamed without changes.
0 ...ne/Source/Common/INI/INIDrawGroupInfo.cpp → ...ne/Source/Common/INI/INIDrawGroupInfo.cpp
View file
Open in desktop
File renamed without changes.
0 ...eEngine/Source/Common/INI/INIGameData.cpp → ...eEngine/Source/Common/INI/INIGameData.cpp
View file
Open in desktop
File renamed without changes.
0 ...eEngine/Source/Common/INI/INIMapCache.cpp → ...eEngine/Source/Common/INI/INIMapCache.cpp
View file
Open in desktop
File renamed without changes.
0 ...meEngine/Source/Common/INI/INIMapData.cpp → ...meEngine/Source/Common/INI/INIMapData.cpp
View file
Open in desktop
File renamed without changes.
0 ...gine/Source/Common/INI/INIMappedImage.cpp → ...gine/Source/Common/INI/INIMappedImage.cpp
View file
Open in desktop
File renamed without changes.
0 ...GameEngine/Source/Common/INI/INIModel.cpp → ...GameEngine/Source/Common/INI/INIModel.cpp
View file
Open in desktop
File renamed without changes.
36 changes: 18 additions & 18 deletions ...gine/Source/Common/INI/INIMultiplayer.cpp → ...gine/Source/Common/INI/INIMultiplayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,30 +80,30 @@ void INI::parseMultiplayerColorDefinition( INI* ini )

namespace
{
struct MultiplayerStartingMoneySettings
{
Money money;
Bool isDefault;
};

const FieldParse startingMoneyFieldParseTable[] =
{
{ "Value", Money::parseMoneyAmount, nullptr, offsetof( MultiplayerStartingMoneySettings, money ) },
{ "Default", INI::parseBool, nullptr, offsetof( MultiplayerStartingMoneySettings, isDefault ) },
{ nullptr, nullptr, nullptr, 0 }
};
struct MultiplayerStartingMoneySettings
{
Money money;
Bool isDefault;
};

const FieldParse startingMoneyFieldParseTable[] =
{
{ "Value", Money::parseMoneyAmount, nullptr, offsetof( MultiplayerStartingMoneySettings, money ) },
{ "Default", INI::parseBool, nullptr, offsetof( MultiplayerStartingMoneySettings, isDefault ) },
{ nullptr, nullptr, nullptr, 0 }
};
}


void INI::parseMultiplayerStartingMoneyChoiceDefinition( INI* ini )
{
DEBUG_ASSERTCRASH( ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES, ("Overrides not supported for MultiplayerStartingMoneyChoice") );
DEBUG_ASSERTCRASH( ini->getLoadType() != INI_LOAD_CREATE_OVERRIDES, ("Overrides not supported for MultiplayerStartingMoneyChoice") );

// Temporary data store
MultiplayerStartingMoneySettings settings;
settings.isDefault = false;
// Temporary data store.
MultiplayerStartingMoneySettings settings;
settings.isDefault = false;

ini->initFromINI( &settings, startingMoneyFieldParseTable );
ini->initFromINI( &settings, startingMoneyFieldParseTable );

TheMultiplayerSettings->addStartingMoneyChoice( settings.money, settings.isDefault );
TheMultiplayerSettings->addStartingMoneyChoice( settings.money, settings.isDefault );
}
0 ...ameEngine/Source/Common/INI/INIObject.cpp → ...ameEngine/Source/Common/INI/INIObject.cpp
View file
Open in desktop
File renamed without changes.
0 ...gine/Source/Common/INI/INIParticleSys.cpp → ...gine/Source/Common/INI/INIParticleSys.cpp
View file
Open in desktop
File renamed without changes.
0 ...ine/Source/Common/INI/INISpecialPower.cpp → ...ine/Source/Common/INI/INISpecialPower.cpp
View file
Open in desktop
File renamed without changes.
0 ...meEngine/Source/Common/INI/INITerrain.cpp → ...meEngine/Source/Common/INI/INITerrain.cpp
View file
Open in desktop
File renamed without changes.
0 ...ne/Source/Common/INI/INITerrainBridge.cpp → ...ne/Source/Common/INI/INITerrainBridge.cpp
View file
Open in desktop
File renamed without changes.
0 ...gine/Source/Common/INI/INITerrainRoad.cpp → ...gine/Source/Common/INI/INITerrainRoad.cpp
View file
Open in desktop
File renamed without changes.
0 ...meEngine/Source/Common/INI/INIUpgrade.cpp → ...meEngine/Source/Common/INI/INIUpgrade.cpp
View file
Open in desktop
File renamed without changes.
0 ...GameEngine/Source/Common/INI/INIWater.cpp → ...GameEngine/Source/Common/INI/INIWater.cpp
View file
Open in desktop
File renamed without changes.
0 ...ameEngine/Source/Common/INI/INIWeapon.cpp → ...ameEngine/Source/Common/INI/INIWeapon.cpp
View file
Open in desktop
File renamed without changes.
0 ...ngine/Source/Common/INI/INIWebpageURL.cpp → ...ngine/Source/Common/INI/INIWebpageURL.cpp
View file
Open in desktop
File renamed without changes.
48 changes: 24 additions & 24 deletions Generals/Code/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,33 +532,33 @@ set(GAMEENGINE_SRC
Source/Common/GameMain.cpp
Source/Common/GlobalData.cpp
# Source/Common/INI/INI.cpp
Source/Common/INI/INIAiData.cpp
Source/Common/INI/INIAnimation.cpp
# Source/Common/INI/INIAiData.cpp
# Source/Common/INI/INIAnimation.cpp
# Source/Common/INI/INIAudioEventInfo.cpp
Source/Common/INI/INICommandButton.cpp
Source/Common/INI/INICommandSet.cpp
Source/Common/INI/INIControlBarScheme.cpp
Source/Common/INI/INICrate.cpp
Source/Common/INI/INIDamageFX.cpp
Source/Common/INI/INIDrawGroupInfo.cpp
Source/Common/INI/INIGameData.cpp
Source/Common/INI/INIMapCache.cpp
Source/Common/INI/INIMapData.cpp
Source/Common/INI/INIMappedImage.cpp
# Source/Common/INI/INICommandButton.cpp
# Source/Common/INI/INICommandSet.cpp
# Source/Common/INI/INIControlBarScheme.cpp
# Source/Common/INI/INICrate.cpp
# Source/Common/INI/INIDamageFX.cpp
# Source/Common/INI/INIDrawGroupInfo.cpp
# Source/Common/INI/INIGameData.cpp
# Source/Common/INI/INIMapCache.cpp
# Source/Common/INI/INIMapData.cpp
# Source/Common/INI/INIMappedImage.cpp
# Source/Common/INI/INIMiscAudio.cpp
Source/Common/INI/INIModel.cpp
Source/Common/INI/INIMultiplayer.cpp
Source/Common/INI/INIObject.cpp
Source/Common/INI/INIParticleSys.cpp
Source/Common/INI/INISpecialPower.cpp
Source/Common/INI/INITerrain.cpp
Source/Common/INI/INITerrainBridge.cpp
Source/Common/INI/INITerrainRoad.cpp
Source/Common/INI/INIUpgrade.cpp
# Source/Common/INI/INIModel.cpp
# Source/Common/INI/INIMultiplayer.cpp
# Source/Common/INI/INIObject.cpp
# Source/Common/INI/INIParticleSys.cpp
# Source/Common/INI/INISpecialPower.cpp
# Source/Common/INI/INITerrain.cpp
# Source/Common/INI/INITerrainBridge.cpp
# Source/Common/INI/INITerrainRoad.cpp
# Source/Common/INI/INIUpgrade.cpp
# Source/Common/INI/INIVideo.cpp
Source/Common/INI/INIWater.cpp
Source/Common/INI/INIWeapon.cpp
Source/Common/INI/INIWebpageURL.cpp
# Source/Common/INI/INIWater.cpp
# Source/Common/INI/INIWeapon.cpp
# Source/Common/INI/INIWebpageURL.cpp
Source/Common/Language.cpp
Source/Common/MessageStream.cpp
Source/Common/MiniLog.cpp
Expand Down
52 changes: 0 additions & 52 deletions Generals/Code/GameEngine/Source/Common/INI/INIAiData.cpp
View file
Open in desktop

This file was deleted.

88 changes: 0 additions & 88 deletions Generals/Code/GameEngine/Source/Common/INI/INIAnimation.cpp
View file
Open in desktop

This file was deleted.

Loading
Loading