fix(spelling): Change Gattling to Gatling - #3063
Closed
CryoTheRenegade wants to merge 2 commits into
Closed
Conversation
Skyaero42
requested changes
Aug 5, 2026
| { | ||
| { "SpecialPowerTemplate", INI::parseSpecialPowerTemplate, nullptr, offsetof( SpectreGunshipUpdateModuleData, m_specialPowerTemplate ) }, | ||
| { "GattlingTemplateName", INI::parseAsciiString, nullptr, offsetof( SpectreGunshipUpdateModuleData, m_gattlingTemplateName ) }, | ||
| { "GatlingTemplateName", INI::parseAsciiString, nullptr, offsetof( SpectreGunshipUpdateModuleData, m_gatlingTemplateName ) }, |
There was a problem hiding this comment.
This is a template name that occurs in ini files.
| { "GunshipOrbitRadius", INI::parseReal, nullptr, offsetof( SpectreGunshipUpdateModuleData, m_gunshipOrbitRadius ) }, | ||
| { "HowitzerWeaponTemplate", INI::parseWeaponTemplate, nullptr, offsetof( SpectreGunshipUpdateModuleData, m_howitzerWeaponTemplate ) }, | ||
| { "GattlingStrafeFXParticleSystem", INI::parseParticleSystemTemplate, nullptr, offsetof( SpectreGunshipUpdateModuleData, m_gattlingStrafeFXParticleSystem ) }, | ||
| { "GatlingStrafeFXParticleSystem", INI::parseParticleSystemTemplate, nullptr, offsetof( SpectreGunshipUpdateModuleData, m_gatlingStrafeFXParticleSystem ) }, |
There was a problem hiding this comment.
This is a template name that occurs in ini files.
| "ChinaTankOverlordBattleBunker", | ||
| "ChinaTankOverlordPropagandaTower", | ||
| "ChinaTankOverlordGattlingCannon", | ||
| "ChinaTankOverlordGatlingCannon", |
There was a problem hiding this comment.
This is a template name that occurs in ini files.
| // if (btt->getName() endsWith("ChinaTankOverlordBattleBunker") continue; // 100 seems to hang gth. | ||
| // if (btt->getName() endsWith("ChinaTankOverlordPropagandaTower") continue; // 100 seems to hang gth. | ||
| // if (btt->getName() endsWith("ChinaTankOverlordGattlingCannon") continue; // 100 seems to hang gth. | ||
| // if (btt->getName() endsWith("ChinaTankOverlordGatlingCannon") continue; // 100 seems to hang gth. |
There was a problem hiding this comment.
This is a template name that occurs in ini files.
| DAMAGE_ARMOR_PIERCING = 2, | ||
| DAMAGE_SMALL_ARMS = 3, | ||
| DAMAGE_GATTLING = 4, | ||
| DAMAGE_GATLING = 4, |
| "ARMOR_PIERCING", | ||
| "SMALL_ARMS", | ||
| "GATTLING", | ||
| "GATLING", |
|
Perhaps this should wait until we're at a point where we can change data and code at the same time? I don't have a strong opinion either way. |
Author
Yea that might be best, i'll close this for now |
|
Hello, its already fixed in gamepatch repo TheSuperHackers/GeneralsGamePatch#2726 |
CryoTheRenegade
force-pushed
the
fix-gatling-spelling
branch
from
August 5, 2026 19:48
993d9cf to
9eaa510
Compare
Renames internal gattling identifiers to gatling in SpectreGunship module members and variables, and fixes the spelling in comments. Data-coupled symbols that must match retail game data keep the original Gattling spelling: the DAMAGE_GATTLING damage type and its INI string, the ChinaTankOverlordGattlingCannon template name, and the GattlingTemplateName / GattlingStrafeFXParticleSystem INI field-parse keys, so the damage bitmask ABI and replay CRC stay retail-compatible.
|
There are zero mentions of Gatling in the code. But 97 Gattlings. We cannot change the INI related names. We can accept Gattling and move on. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #3062
Did a simple Find and Replace for Gattling and changed to Gatling, making sure to preserve Upper or lower case state.