From 55c7d6baf5f5ed91d3f937dd009fe26552b36c75 Mon Sep 17 00:00:00 2001 From: mirelle7 <115191165+mirelle7@users.noreply.github.com> Date: Thu, 10 Sep 2026 22:41:59 +0200 Subject: [PATCH] chore: Remove trailing commas that break clang-format's compact layout Scoped to comment-free array/struct literals (BorderColors, TeamGeneric, BezierSegment, GameMemoryInitPools, BFISH, Properties, Scripts) where clang-format explodes each element onto its own line without this. Enums are left alone; EnumTrailingComma: Remove in .clang-format handles those automatically instead of needing manual edits. --- .../Source/Common/Bezier/BezierSegment.cpp | 18 +++++----- .../System/GameMemoryInitPools_Generals.inl | 8 ++--- .../System/GameMemoryInitPools_GeneralsMD.inl | 8 ++--- Core/Tools/Launcher/BFISH.cpp | 6 ++-- .../GameEngine/Include/Common/BorderColors.h | 16 ++++----- .../Source/GameLogic/ScriptEngine/Scripts.cpp | 2 +- .../Code/Tools/GUIEdit/Source/Properties.cpp | 2 +- .../Tools/WorldBuilder/src/TeamGeneric.cpp | 34 +++++++++---------- .../GameEngine/Include/Common/BorderColors.h | 16 ++++----- .../Source/GameLogic/ScriptEngine/Scripts.cpp | 2 +- .../Code/Tools/GUIEdit/Source/Properties.cpp | 2 +- .../Tools/WorldBuilder/src/TeamGeneric.cpp | 34 +++++++++---------- 12 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Core/GameEngine/Source/Common/Bezier/BezierSegment.cpp b/Core/GameEngine/Source/Common/Bezier/BezierSegment.cpp index 3154ec0f351..715d8d6d59d 100644 --- a/Core/GameEngine/Source/Common/Bezier/BezierSegment.cpp +++ b/Core/GameEngine/Source/Common/Bezier/BezierSegment.cpp @@ -160,19 +160,19 @@ Real BezierSegment::getApproximateLength(Real withinTolerance) const Coord3D p0p1 = { m_controlPoints[1].x - m_controlPoints[0].x, m_controlPoints[1].y - m_controlPoints[0].y, - m_controlPoints[1].z - m_controlPoints[0].z, }; + m_controlPoints[1].z - m_controlPoints[0].z }; Coord3D p1p2 = { m_controlPoints[2].x - m_controlPoints[1].x, m_controlPoints[2].y - m_controlPoints[1].y, - m_controlPoints[2].z - m_controlPoints[1].z, }; + m_controlPoints[2].z - m_controlPoints[1].z }; Coord3D p2p3 = { m_controlPoints[3].x - m_controlPoints[2].x, m_controlPoints[3].y - m_controlPoints[2].y, - m_controlPoints[3].z - m_controlPoints[2].z, }; + m_controlPoints[3].z - m_controlPoints[2].z }; Coord3D p0p3 = { m_controlPoints[3].x - m_controlPoints[0].x, m_controlPoints[3].y - m_controlPoints[0].y, - m_controlPoints[3].z - m_controlPoints[0].z, }; + m_controlPoints[3].z - m_controlPoints[0].z }; Real length0 = p0p3.length(); Real length1 = p0p1.length() + p1p2.length() + p2p3.length(); @@ -193,15 +193,15 @@ void BezierSegment::splitSegmentAtT(Real tValue, BezierSegment &outSeg1, BezierS Coord3D p0p1 = { m_controlPoints[1].x - m_controlPoints[0].x, m_controlPoints[1].y - m_controlPoints[0].y, - m_controlPoints[1].z - m_controlPoints[0].z, }; + m_controlPoints[1].z - m_controlPoints[0].z }; Coord3D p1p2 = { m_controlPoints[2].x - m_controlPoints[1].x, m_controlPoints[2].y - m_controlPoints[1].y, - m_controlPoints[2].z - m_controlPoints[1].z, }; + m_controlPoints[2].z - m_controlPoints[1].z }; Coord3D p2p3 = { m_controlPoints[3].x - m_controlPoints[2].x, m_controlPoints[3].y - m_controlPoints[2].y, - m_controlPoints[3].z - m_controlPoints[2].z, }; + m_controlPoints[3].z - m_controlPoints[2].z }; p0p1.scale(tValue); p1p2.scale(tValue); @@ -213,11 +213,11 @@ void BezierSegment::splitSegmentAtT(Real tValue, BezierSegment &outSeg1, BezierS Coord3D triLeft = { p1p2.x - p0p1.x, p1p2.y - p0p1.y, - p1p2.z - p0p1.z, }; + p1p2.z - p0p1.z }; Coord3D triRight = { p2p3.x - p1p2.x, p2p3.y - p1p2.y, - p2p3.z - p1p2.z, }; + p2p3.z - p1p2.z }; triLeft.scale(tValue); triRight.scale(tValue); diff --git a/Core/GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl b/Core/GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl index 36080f71985..f219099cd59 100644 --- a/Core/GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl +++ b/Core/GameEngine/Source/Common/System/GameMemoryInitPools_Generals.inl @@ -53,7 +53,7 @@ static PoolSizeRec PoolSizes[] = { "ParticlePool", 4096, 256 }, { "ParticleSystemTemplatePool", 768, 32 }, { "ParticleSystemPool", 1024, 32 }, - { "TerrainRoadType", 64, 64, }, + { "TerrainRoadType", 64, 64 }, { "WindowLayoutPool", 32, 32 }, { "AnimatedParticleSysBoneClientUpdate", 16, 16 }, { "SwayClientUpdate", 4096, 32 }, @@ -155,8 +155,8 @@ static PoolSizeRec PoolSizes[] = { "ParkingPlaceBehavior", 32, 32 }, { "FlightDeckBehavior", 8, 8 }, #ifdef ALLOW_SURRENDER - { "POWTruckAIUpdate", 32, 32, }, - { "POWTruckBehavior", 32, 32, }, + { "POWTruckAIUpdate", 32, 32 }, + { "POWTruckBehavior", 32, 32 }, { "PrisonBehavior", 32, 32 }, { "PrisonVisual", 32, 32 }, { "PropagandaCenterBehavior", 16, 16 }, @@ -320,7 +320,7 @@ static PoolSizeRec PoolSizes[] = { "OCLSpecialPower", 32, 32 }, { "FireWeaponPower", 32, 32 }, #ifdef ALLOW_DEMORALIZE - { "DemoralizeSpecialPower", 16, 16, }, + { "DemoralizeSpecialPower", 16, 16 }, #endif { "CashHackSpecialPower", 32, 32 }, { "CommandSetUpgrade", 32, 32 }, diff --git a/Core/GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl b/Core/GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl index f33873f3fa1..8dfbeb55d9c 100644 --- a/Core/GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl +++ b/Core/GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl @@ -53,7 +53,7 @@ static PoolSizeRec PoolSizes[] = { "ParticlePool", 1400, 1024 }, { "ParticleSystemTemplatePool", 1100, 32 }, { "ParticleSystemPool", 1024, 32 }, - { "TerrainRoadType", 100, 32, }, + { "TerrainRoadType", 100, 32 }, { "WindowLayoutPool", 32, 32 }, { "AnimatedParticleSysBoneClientUpdate", 16, 16 }, { "SwayClientUpdate", 32, 32 }, @@ -151,8 +151,8 @@ static PoolSizeRec PoolSizes[] = { "ParkingPlaceBehavior", 32, 32 }, { "FlightDeckBehavior", 8, 8 }, #ifdef ALLOW_SURRENDER - { "POWTruckAIUpdate", 32, 32, }, - { "POWTruckBehavior", 32, 32, }, + { "POWTruckAIUpdate", 32, 32 }, + { "POWTruckBehavior", 32, 32 }, { "PrisonBehavior", 32, 32 }, { "PrisonVisual", 32, 32 }, { "PropagandaCenterBehavior", 16, 16 }, @@ -316,7 +316,7 @@ static PoolSizeRec PoolSizes[] = { "OCLSpecialPower", 96, 32 }, { "FireWeaponPower", 32, 32 }, #ifdef ALLOW_DEMORALIZE - { "DemoralizeSpecialPower", 16, 16, }, + { "DemoralizeSpecialPower", 16, 16 }, #endif { "CashHackSpecialPower", 32, 32 }, { "CommandSetUpgrade", 32, 32 }, diff --git a/Core/Tools/Launcher/BFISH.cpp b/Core/Tools/Launcher/BFISH.cpp index a88dfa04a56..f29dfda4a72 100644 --- a/Core/Tools/Launcher/BFISH.cpp +++ b/Core/Tools/Launcher/BFISH.cpp @@ -492,7 +492,7 @@ unsigned long const BlowfishEngine::S_Init[4][UCHAR_MAX+1] = { 0x2464369BU,0xF009B91EU,0x5563911DU,0x59DFA6AAU,0x78C14389U,0xD95A537FU,0x207D5BA2U,0x02E5B9C5U, 0x83260376U,0x6295CFA9U,0x11C81968U,0x4E734A41U,0xB3472DCAU,0x7B14A94AU,0x1B510052U,0x9A532915U, 0xD60F573FU,0xBC9BC6E4U,0x2B60A476U,0x81E67400U,0x08BA6FB5U,0x571BE91FU,0xF296EC6BU,0x2A0DD915U, - 0xB6636521U,0xE7B9F9B6U,0xFF34052EU,0xC5855664U,0x53B02D5DU,0xA99F8FA1U,0x08BA4799U,0x6E85076AU, + 0xB6636521U,0xE7B9F9B6U,0xFF34052EU,0xC5855664U,0x53B02D5DU,0xA99F8FA1U,0x08BA4799U,0x6E85076AU },{ 0x4B7A70E9U,0xB5B32944U,0xDB75092EU,0xC4192623U,0xAD6EA6B0U,0x49A7DF7DU,0x9CEE60B8U,0x8FEDB266U, 0xECAA8C71U,0x699A17FFU,0x5664526CU,0xC2B19EE1U,0x193602A5U,0x75094C29U,0xA0591340U,0xE4183A3EU, @@ -525,7 +525,7 @@ unsigned long const BlowfishEngine::S_Init[4][UCHAR_MAX+1] = { 0x3372F092U,0x8D937E41U,0xD65FECF1U,0x6C223BDBU,0x7CDE3759U,0xCBEE7460U,0x4085F2A7U,0xCE77326EU, 0xA6078084U,0x19F8509EU,0xE8EFD855U,0x61D99735U,0xA969A7AAU,0xC50C06C2U,0x5A04ABFCU,0x800BCADCU, 0x9E447A2EU,0xC3453484U,0xFDD56705U,0x0E1E9EC9U,0xDB73DBD3U,0x105588CDU,0x675FDA79U,0xE3674340U, - 0xC5C43465U,0x713E38D8U,0x3D28F89EU,0xF16DFF20U,0x153E21E7U,0x8FB03D4AU,0xE6E39F2BU,0xDB83ADF7U, + 0xC5C43465U,0x713E38D8U,0x3D28F89EU,0xF16DFF20U,0x153E21E7U,0x8FB03D4AU,0xE6E39F2BU,0xDB83ADF7U },{ 0xE93D5A68U,0x948140F7U,0xF64C261CU,0x94692934U,0x411520F7U,0x7602D4F7U,0xBCF46B2EU,0xD4A20068U, 0xD4082471U,0x3320F46AU,0x43B7D4B7U,0x500061AFU,0x1E39F62EU,0x97244546U,0x14214F74U,0xBF8B8840U, @@ -558,7 +558,7 @@ unsigned long const BlowfishEngine::S_Init[4][UCHAR_MAX+1] = { 0x11E69ED7U,0x2338EA63U,0x53C2DD94U,0xC2C21634U,0xBBCBEE56U,0x90BCB6DEU,0xEBFC7DA1U,0xCE591D76U, 0x6F05E409U,0x4B7C0188U,0x39720A3DU,0x7C927C24U,0x86E3725FU,0x724D9DB9U,0x1AC15BB4U,0xD39EB8FCU, 0xED545578U,0x08FCA5B5U,0xD83D7CD3U,0x4DAD0FC4U,0x1E50EF5EU,0xB161E6F8U,0xA28514D9U,0x6C51133CU, - 0x6FD5C7E7U,0x56E14EC4U,0x362ABFCEU,0xDDC6C837U,0xD79A3234U,0x92638212U,0x670EFA8EU,0x406000E0U, + 0x6FD5C7E7U,0x56E14EC4U,0x362ABFCEU,0xDDC6C837U,0xD79A3234U,0x92638212U,0x670EFA8EU,0x406000E0U },{ 0x3A39CE37U,0xD3FAF5CFU,0xABC27737U,0x5AC52D1BU,0x5CB0679EU,0x4FA33742U,0xD3822740U,0x99BC9BBEU, 0xD5118E9DU,0xBF0F7315U,0xD62D1C7EU,0xC700C47BU,0xB78C1B6BU,0x21A19045U,0xB26EB1BEU,0x6A366EB4U, diff --git a/Generals/Code/GameEngine/Include/Common/BorderColors.h b/Generals/Code/GameEngine/Include/Common/BorderColors.h index d9395537cce..6fac5b8fe84 100644 --- a/Generals/Code/GameEngine/Include/Common/BorderColors.h +++ b/Generals/Code/GameEngine/Include/Common/BorderColors.h @@ -29,14 +29,14 @@ struct BorderColor const BorderColor BORDER_COLORS[] = { - { "Orange", 0xFFFF8700, }, - { "Green", 0xFF00FF00, }, - { "Blue", 0xFF0000FF, }, - { "Cyan", 0xFF00FFFF, }, - { "Magenta", 0xFFFF00FF, }, - { "Yellow", 0xFFFFFF00, }, - { "Purple", 0xFF9E00FF, }, - { "Pink", 0xFFFF8670, }, + { "Orange", 0xFFFF8700 }, + { "Green", 0xFF00FF00 }, + { "Blue", 0xFF0000FF }, + { "Cyan", 0xFF00FFFF }, + { "Magenta", 0xFFFF00FF }, + { "Yellow", 0xFFFFFF00 }, + { "Purple", 0xFF9E00FF }, + { "Pink", 0xFFFF8670 }, }; const long BORDER_COLORS_SIZE = sizeof(BORDER_COLORS) / sizeof (BORDER_COLORS[0]); diff --git a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp index 74263ba13ef..cce48040158 100644 --- a/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp +++ b/Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp @@ -127,7 +127,7 @@ void SignalUIInteraction(Int interaction) // Changing the order or meaning of either of these will require you to update the maps // in a meaningful way. If there are new entries, add them to the end, rather than the middle. -const char *Surfaces[] = { "Ground", "Air", "Ground or Air", }; +const char *Surfaces[] = { "Ground", "Air", "Ground or Air" }; const char *ShakeIntensities[] = { "Subtle", "Normal", "Strong", "Severe", "Cine_Extreme", "Cine_Insane" }; enum { K_SCRIPT_LIST_DATA_VERSION_1 = 1, diff --git a/Generals/Code/Tools/GUIEdit/Source/Properties.cpp b/Generals/Code/Tools/GUIEdit/Source/Properties.cpp index 2e6fdf16c87..69ac8b1b4a5 100644 --- a/Generals/Code/Tools/GUIEdit/Source/Properties.cpp +++ b/Generals/Code/Tools/GUIEdit/Source/Properties.cpp @@ -91,7 +91,7 @@ ColorControl colorControlTable[] = { BUTTON_HILITE_COLOR, { 255, 255, 255, 255 } }, { BUTTON_HILITE_BORDER_COLOR, { 255, 255, 255, 255 } }, - { BUTTON_COLOR, 0, }, + { BUTTON_COLOR, 0 }, { BUTTON_BORDER_COLOR, 0 }, { 0, { 0, 0, 0, 0 } } diff --git a/Generals/Code/Tools/WorldBuilder/src/TeamGeneric.cpp b/Generals/Code/Tools/WorldBuilder/src/TeamGeneric.cpp index 76ae9a5c0f4..9753f0e41a1 100644 --- a/Generals/Code/Tools/WorldBuilder/src/TeamGeneric.cpp +++ b/Generals/Code/Tools/WorldBuilder/src/TeamGeneric.cpp @@ -29,23 +29,23 @@ static const UINT s_allControls[][2] = { - { IDC_SCRIPT_PREFIX1, IDC_TeamGeneric_Script1, }, - { IDC_SCRIPT_PREFIX2, IDC_TeamGeneric_Script2, }, - { IDC_SCRIPT_PREFIX3, IDC_TeamGeneric_Script3, }, - { IDC_SCRIPT_PREFIX4, IDC_TeamGeneric_Script4, }, - { IDC_SCRIPT_PREFIX5, IDC_TeamGeneric_Script5, }, - { IDC_SCRIPT_PREFIX6, IDC_TeamGeneric_Script6, }, - { IDC_SCRIPT_PREFIX7, IDC_TeamGeneric_Script7, }, - { IDC_SCRIPT_PREFIX8, IDC_TeamGeneric_Script8, }, - { IDC_SCRIPT_PREFIX9, IDC_TeamGeneric_Script9, }, - { IDC_SCRIPT_PREFIX10, IDC_TeamGeneric_Script10, }, - { IDC_SCRIPT_PREFIX11, IDC_TeamGeneric_Script11, }, - { IDC_SCRIPT_PREFIX12, IDC_TeamGeneric_Script12, }, - { IDC_SCRIPT_PREFIX13, IDC_TeamGeneric_Script13, }, - { IDC_SCRIPT_PREFIX14, IDC_TeamGeneric_Script14, }, - { IDC_SCRIPT_PREFIX15, IDC_TeamGeneric_Script15, }, - { IDC_SCRIPT_PREFIX16, IDC_TeamGeneric_Script16, }, - { 0,0, }, + { IDC_SCRIPT_PREFIX1, IDC_TeamGeneric_Script1 }, + { IDC_SCRIPT_PREFIX2, IDC_TeamGeneric_Script2 }, + { IDC_SCRIPT_PREFIX3, IDC_TeamGeneric_Script3 }, + { IDC_SCRIPT_PREFIX4, IDC_TeamGeneric_Script4 }, + { IDC_SCRIPT_PREFIX5, IDC_TeamGeneric_Script5 }, + { IDC_SCRIPT_PREFIX6, IDC_TeamGeneric_Script6 }, + { IDC_SCRIPT_PREFIX7, IDC_TeamGeneric_Script7 }, + { IDC_SCRIPT_PREFIX8, IDC_TeamGeneric_Script8 }, + { IDC_SCRIPT_PREFIX9, IDC_TeamGeneric_Script9 }, + { IDC_SCRIPT_PREFIX10, IDC_TeamGeneric_Script10 }, + { IDC_SCRIPT_PREFIX11, IDC_TeamGeneric_Script11 }, + { IDC_SCRIPT_PREFIX12, IDC_TeamGeneric_Script12 }, + { IDC_SCRIPT_PREFIX13, IDC_TeamGeneric_Script13 }, + { IDC_SCRIPT_PREFIX14, IDC_TeamGeneric_Script14 }, + { IDC_SCRIPT_PREFIX15, IDC_TeamGeneric_Script15 }, + { IDC_SCRIPT_PREFIX16, IDC_TeamGeneric_Script16 }, + { 0,0 }, }; TeamGeneric::TeamGeneric() : CPropertyPage(TeamGeneric::IDD) diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h b/GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h index 52eed56e6dc..cd0ad2f932c 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h @@ -29,14 +29,14 @@ struct BorderColor const BorderColor BORDER_COLORS[] = { - { "Orange", 0xFFFF8700, }, - { "Green", 0xFF00FF00, }, - { "Blue", 0xFF0000FF, }, - { "Cyan", 0xFF00FFFF, }, - { "Magenta", 0xFFFF00FF, }, - { "Yellow", 0xFFFFFF00, }, - { "Purple", 0xFF9E00FF, }, - { "Pink", 0xFFFF8670, }, + { "Orange", 0xFFFF8700 }, + { "Green", 0xFF00FF00 }, + { "Blue", 0xFF0000FF }, + { "Cyan", 0xFF00FFFF }, + { "Magenta", 0xFFFF00FF }, + { "Yellow", 0xFFFFFF00 }, + { "Purple", 0xFF9E00FF }, + { "Pink", 0xFFFF8670 }, }; const long BORDER_COLORS_SIZE = sizeof(BORDER_COLORS) / sizeof (BORDER_COLORS[0]); diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp index c9dd8a5efbe..924a7afa434 100644 --- a/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp +++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp @@ -128,7 +128,7 @@ void SignalUIInteraction(Int interaction) // Changing the order or meaning of either of these will require you to update the maps // in a meaningful way. If there are new entries, add them to the end, rather than the middle. -const char *Surfaces[] = { "Ground", "Air", "Ground or Air", }; +const char *Surfaces[] = { "Ground", "Air", "Ground or Air" }; const char *ShakeIntensities[] = { "Subtle", "Normal", "Strong", "Severe", "Cine_Extreme", "Cine_Insane" }; enum { K_SCRIPT_LIST_DATA_VERSION_1 = 1, diff --git a/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp b/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp index 8b1e3b002b1..c1473cfc0ab 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp +++ b/GeneralsMD/Code/Tools/GUIEdit/Source/Properties.cpp @@ -91,7 +91,7 @@ ColorControl colorControlTable[] = { BUTTON_HILITE_COLOR, { 255, 255, 255, 255 } }, { BUTTON_HILITE_BORDER_COLOR, { 255, 255, 255, 255 } }, - { BUTTON_COLOR, 0, }, + { BUTTON_COLOR, 0 }, { BUTTON_BORDER_COLOR, 0 }, { 0, { 0, 0, 0, 0 } } diff --git a/GeneralsMD/Code/Tools/WorldBuilder/src/TeamGeneric.cpp b/GeneralsMD/Code/Tools/WorldBuilder/src/TeamGeneric.cpp index 77f2a89f60d..4bc9a513b75 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/src/TeamGeneric.cpp +++ b/GeneralsMD/Code/Tools/WorldBuilder/src/TeamGeneric.cpp @@ -30,23 +30,23 @@ static const UINT s_allControls[][2] = { - { IDC_SCRIPT_PREFIX1, IDC_TeamGeneric_Script1, }, - { IDC_SCRIPT_PREFIX2, IDC_TeamGeneric_Script2, }, - { IDC_SCRIPT_PREFIX3, IDC_TeamGeneric_Script3, }, - { IDC_SCRIPT_PREFIX4, IDC_TeamGeneric_Script4, }, - { IDC_SCRIPT_PREFIX5, IDC_TeamGeneric_Script5, }, - { IDC_SCRIPT_PREFIX6, IDC_TeamGeneric_Script6, }, - { IDC_SCRIPT_PREFIX7, IDC_TeamGeneric_Script7, }, - { IDC_SCRIPT_PREFIX8, IDC_TeamGeneric_Script8, }, - { IDC_SCRIPT_PREFIX9, IDC_TeamGeneric_Script9, }, - { IDC_SCRIPT_PREFIX10, IDC_TeamGeneric_Script10, }, - { IDC_SCRIPT_PREFIX11, IDC_TeamGeneric_Script11, }, - { IDC_SCRIPT_PREFIX12, IDC_TeamGeneric_Script12, }, - { IDC_SCRIPT_PREFIX13, IDC_TeamGeneric_Script13, }, - { IDC_SCRIPT_PREFIX14, IDC_TeamGeneric_Script14, }, - { IDC_SCRIPT_PREFIX15, IDC_TeamGeneric_Script15, }, - { IDC_SCRIPT_PREFIX16, IDC_TeamGeneric_Script16, }, - { 0,0, }, + { IDC_SCRIPT_PREFIX1, IDC_TeamGeneric_Script1 }, + { IDC_SCRIPT_PREFIX2, IDC_TeamGeneric_Script2 }, + { IDC_SCRIPT_PREFIX3, IDC_TeamGeneric_Script3 }, + { IDC_SCRIPT_PREFIX4, IDC_TeamGeneric_Script4 }, + { IDC_SCRIPT_PREFIX5, IDC_TeamGeneric_Script5 }, + { IDC_SCRIPT_PREFIX6, IDC_TeamGeneric_Script6 }, + { IDC_SCRIPT_PREFIX7, IDC_TeamGeneric_Script7 }, + { IDC_SCRIPT_PREFIX8, IDC_TeamGeneric_Script8 }, + { IDC_SCRIPT_PREFIX9, IDC_TeamGeneric_Script9 }, + { IDC_SCRIPT_PREFIX10, IDC_TeamGeneric_Script10 }, + { IDC_SCRIPT_PREFIX11, IDC_TeamGeneric_Script11 }, + { IDC_SCRIPT_PREFIX12, IDC_TeamGeneric_Script12 }, + { IDC_SCRIPT_PREFIX13, IDC_TeamGeneric_Script13 }, + { IDC_SCRIPT_PREFIX14, IDC_TeamGeneric_Script14 }, + { IDC_SCRIPT_PREFIX15, IDC_TeamGeneric_Script15 }, + { IDC_SCRIPT_PREFIX16, IDC_TeamGeneric_Script16 }, + { 0,0 }, }; TeamGeneric::TeamGeneric() : CPropertyPage(TeamGeneric::IDD)