Skip to content

Commit c20cde2

Browse files
bobtistabobtista
committed
fix: use {0} instead of {} for array initialization (VC6 compatibility)
1 parent 56fc6de commit c20cde2

File tree

18 files changed

+52
-52
lines changed

18 files changed

+52
-52
lines changed

‎Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ static NameKeyType staticTextPlayerID[MAX_BUTTONS] = { NAMEKEY_INVALID,NAMEKEY_I
8080
static GameWindow *ObserverPlayerInfoWindow = nullptr;
8181
static GameWindow *ObserverPlayerListWindow = nullptr;
8282

83-
static GameWindow *buttonPlayer[MAX_BUTTONS] = {};
84-
static GameWindow *staticTextPlayer[MAX_BUTTONS] = {};
83+
static GameWindow *buttonPlayer[MAX_BUTTONS] = {0};
84+
static GameWindow *staticTextPlayer[MAX_BUTTONS] = {0};
8585

8686

8787
static NameKeyType buttonCancelID = NAMEKEY_INVALID;

‎Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanGameOptionsMenu.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,19 +120,19 @@ static GameWindow *textEntryChat = nullptr;
120120
static GameWindow *textEntryMapDisplay = nullptr;
121121
static GameWindow *windowMap = nullptr;
122122

123-
static GameWindow *comboBoxPlayer[MAX_SLOTS] = {};
124-
static GameWindow *buttonAccept[MAX_SLOTS] = {};
123+
static GameWindow *comboBoxPlayer[MAX_SLOTS] = {0};
124+
static GameWindow *buttonAccept[MAX_SLOTS] = {0};
125125

126-
static GameWindow *comboBoxColor[MAX_SLOTS] = {};
126+
static GameWindow *comboBoxColor[MAX_SLOTS] = {0};
127127

128-
static GameWindow *comboBoxPlayerTemplate[MAX_SLOTS] = {};
128+
static GameWindow *comboBoxPlayerTemplate[MAX_SLOTS] = {0};
129129

130-
static GameWindow *comboBoxTeam[MAX_SLOTS] = {};
130+
static GameWindow *comboBoxTeam[MAX_SLOTS] = {0};
131131

132132
//static GameWindow *buttonStartPosition[MAX_SLOTS] = {NULL,NULL,NULL,NULL,
133133
// NULL,NULL,NULL,NULL };
134134
//
135-
static GameWindow *buttonMapStartPosition[MAX_SLOTS] = {};
135+
static GameWindow *buttonMapStartPosition[MAX_SLOTS] = {0};
136136

137137
//external declarations of the Gadgets the callbacks can use
138138
GameWindow *listboxChatWindowLanGame = nullptr;

‎Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/LanMapSelectMenu.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ static GameWindow *winMapPreview = nullptr;
5656
static NameKeyType radioButtonSystemMapsID = NAMEKEY_INVALID;
5757
static NameKeyType radioButtonUserMapsID = NAMEKEY_INVALID;
5858

59-
static GameWindow *buttonMapStartPosition[MAX_SLOTS] = {};
59+
static GameWindow *buttonMapStartPosition[MAX_SLOTS] = {0};
6060
static NameKeyType buttonMapStartPositionID[MAX_SLOTS] = { NAMEKEY_INVALID,NAMEKEY_INVALID,
6161
NAMEKEY_INVALID,NAMEKEY_INVALID,
6262
NAMEKEY_INVALID,NAMEKEY_INVALID,

‎Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishGameOptionsMenu.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,18 +122,18 @@ static GameWindow *textEntryMapDisplay = nullptr;
122122
static GameWindow *buttonReset = nullptr;
123123
static GameWindow *windowMap = nullptr;
124124
static GameWindow *textEntryPlayerName = nullptr;
125-
static GameWindow *comboBoxPlayer[MAX_SLOTS] = {};
125+
static GameWindow *comboBoxPlayer[MAX_SLOTS] = {0};
126126

127-
static GameWindow *comboBoxColor[MAX_SLOTS] = {};
127+
static GameWindow *comboBoxColor[MAX_SLOTS] = {0};
128128

129-
static GameWindow *comboBoxPlayerTemplate[MAX_SLOTS] = {};
129+
static GameWindow *comboBoxPlayerTemplate[MAX_SLOTS] = {0};
130130

131-
static GameWindow *comboBoxTeam[MAX_SLOTS] = {};
131+
static GameWindow *comboBoxTeam[MAX_SLOTS] = {0};
132132

133133
//static GameWindow *buttonStartPosition[MAX_SLOTS] = {NULL,NULL,NULL,NULL,
134134
// NULL,NULL,NULL,NULL };
135135
//
136-
static GameWindow *buttonMapStartPosition[MAX_SLOTS] = {};
136+
static GameWindow *buttonMapStartPosition[MAX_SLOTS] = {0};
137137
//external declarations of the Gadgets the callbacks can use
138138

139139
WindowLayout *skirmishMapSelectLayout = nullptr;

‎Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/SkirmishMapSelectMenu.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static GameWindow *mapList = nullptr;
5555
static NameKeyType radioButtonSystemMapsID = NAMEKEY_INVALID;
5656
static NameKeyType radioButtonUserMapsID = NAMEKEY_INVALID;
5757

58-
static GameWindow *buttonMapStartPosition[MAX_SLOTS] = {};
58+
static GameWindow *buttonMapStartPosition[MAX_SLOTS] = {0};
5959
static NameKeyType buttonMapStartPositionID[MAX_SLOTS] = { NAMEKEY_INVALID,NAMEKEY_INVALID,
6060
NAMEKEY_INVALID,NAMEKEY_INVALID,
6161
NAMEKEY_INVALID,NAMEKEY_INVALID,

‎Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -201,22 +201,22 @@ static GameWindow *textEntryChat = nullptr;
201201
static GameWindow *textEntryMapDisplay = nullptr;
202202
static GameWindow *windowMap = nullptr;
203203

204-
static GameWindow *comboBoxPlayer[MAX_SLOTS] = {};
205-
static GameWindow *staticTextPlayer[MAX_SLOTS] = {};
206-
static GameWindow *buttonAccept[MAX_SLOTS] = {};
204+
static GameWindow *comboBoxPlayer[MAX_SLOTS] = {0};
205+
static GameWindow *staticTextPlayer[MAX_SLOTS] = {0};
206+
static GameWindow *buttonAccept[MAX_SLOTS] = {0};
207207

208-
static GameWindow *comboBoxColor[MAX_SLOTS] = {};
208+
static GameWindow *comboBoxColor[MAX_SLOTS] = {0};
209209

210-
static GameWindow *comboBoxPlayerTemplate[MAX_SLOTS] = {};
210+
static GameWindow *comboBoxPlayerTemplate[MAX_SLOTS] = {0};
211211

212-
static GameWindow *comboBoxTeam[MAX_SLOTS] = {};
212+
static GameWindow *comboBoxTeam[MAX_SLOTS] = {0};
213213

214214
//static GameWindow *buttonStartPosition[MAX_SLOTS] = {NULL,NULL,NULL,NULL,
215215
// NULL,NULL,NULL,NULL };
216216
//
217-
static GameWindow *buttonMapStartPosition[MAX_SLOTS] = {};
217+
static GameWindow *buttonMapStartPosition[MAX_SLOTS] = {0};
218218

219-
static GameWindow *genericPingWindow[MAX_SLOTS] = {};
219+
static GameWindow *genericPingWindow[MAX_SLOTS] = {0};
220220

221221
static const Image *pingImages[3] = { nullptr, nullptr, nullptr };
222222

‎Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static NameKeyType radioButtonUserMapsID = NAMEKEY_INVALID;
6060
extern WindowLayout *WOLMapSelectLayout; ///< Map selection overlay
6161
static GameWindow *mapList = nullptr;
6262

63-
static GameWindow *buttonMapStartPosition[MAX_SLOTS] = {};
63+
static GameWindow *buttonMapStartPosition[MAX_SLOTS] = {0};
6464
static NameKeyType buttonMapStartPositionID[MAX_SLOTS] = { NAMEKEY_INVALID,NAMEKEY_INVALID,
6565
NAMEKEY_INVALID,NAMEKEY_INVALID,
6666
NAMEKEY_INVALID,NAMEKEY_INVALID,

‎Generals/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ enum { AT_END = 0x00FFFFFF };
163163
// ******************************** class ScriptList *********************************************
164164
//-------------------------------------------------------------------------------------------------
165165
// Statics ///////////////////////////////////////////////////////////////////////////////////////
166-
ScriptList *ScriptList::s_readLists[MAX_PLAYER_COUNT] = {};
166+
ScriptList *ScriptList::s_readLists[MAX_PLAYER_COUNT] = {0};
167167
Int ScriptList::s_numInReadList = 0;
168168

169169
Int ScriptList::m_curId = 0;

‎Generals/Code/Tools/WorldBuilder/src/WHeightMapEdit.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2456,7 +2456,7 @@ Bool WorldHeightMapEdit::doCliffAdjustment(Int xIndex, Int yIndex)
24562456
if (uvRange.hi.y<cliffInfo.v2) uvRange.hi.y=cliffInfo.v2;
24572457
if (uvRange.hi.y<cliffInfo.v3) uvRange.hi.y=cliffInfo.v3;
24582458

2459-
CProcessNode *pNodes[4] = {};
2459+
CProcessNode *pNodes[4] = {0};
24602460
Int k = 0;
24612461
for (i=pCurNode->m_x-1; i<pCurNode->m_x+2; i++) {
24622462
if (i<0) continue;

‎GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarObserver.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ static NameKeyType staticTextPlayerID[MAX_BUTTONS] = { NAMEKEY_INVALID,NAMEKEY_I
8080
static GameWindow *ObserverPlayerInfoWindow = nullptr;
8181
static GameWindow *ObserverPlayerListWindow = nullptr;
8282

83-
static GameWindow *buttonPlayer[MAX_BUTTONS] = {};
84-
static GameWindow *staticTextPlayer[MAX_BUTTONS] = {};
83+
static GameWindow *buttonPlayer[MAX_BUTTONS] = {0};
84+
static GameWindow *staticTextPlayer[MAX_BUTTONS] = {0};
8585

8686

8787
static NameKeyType buttonCancelID = NAMEKEY_INVALID;

0 commit comments

Comments
 (0)