Skip to content

Commit 7f9ab83

Browse files
committed
refactor: convert NULL to nullptr in final array sentinels
1 parent 9806975 commit 7f9ab83

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static const char *const TheCommandOptionNames[] =
133133
"CAN_USE_WAYPOINTS",
134134
"MUST_BE_STOPPED",
135135

136-
NULL
136+
nullptr
137137
};
138138
#endif // end DEFINE_COMMAND_OPTION_NAMES
139139

GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ static const char *const TheCommandSourceMaskNames[] =
341341
"FROM_DOZER", //don't use this
342342
"DEFAULT_SWITCH_WEAPON", //unit will pick this weapon when normal logic fails.
343343

344-
NULL
344+
nullptr
345345
};
346346
static_assert(ARRAY_SIZE(TheCommandSourceMaskNames) == COMMAND_SOURCE_TYPE_COUNT + 1, "Incorrect array size");
347347
#endif

GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static const char *const TheLocomotorAppearanceNames[] =
8585
"OTHER",
8686
"MOTORCYCLE",
8787

88-
NULL
88+
nullptr
8989
};
9090
static_assert(ARRAY_SIZE(TheLocomotorAppearanceNames) == LOCOMOTOR_APPEARANCE_COUNT + 1, "Array size");
9191
#endif
@@ -117,7 +117,7 @@ static const char *const TheLocomotorBehaviorZNames[] =
117117
"FIXED_RELATIVE_TO_GROUND_AND_BUILDINGS",
118118
"RELATIVE_TO_HIGHEST_LAYER",
119119

120-
NULL
120+
nullptr
121121
};
122122
static_assert(ARRAY_SIZE(TheLocomotorBehaviorZNames) == LOCOMOTOR_BEHAVIOR_Z_COUNT + 1, "Array size");
123123
#endif

GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static const char *const TheLocomotorSurfaceTypeNames[] =
6666
"AIR",
6767
"RUBBLE",
6868

69-
NULL
69+
nullptr
7070
};
7171
#endif
7272

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static const char* const TheBodyDamageTypeNames[] =
6565
"REALLYDAMAGED",
6666
"RUBBLE",
6767

68-
NULL
68+
nullptr
6969
};
7070
static_assert(ARRAY_SIZE(TheBodyDamageTypeNames) == BODYDAMAGETYPE_COUNT + 1, "Incorrect array size");
7171
#endif

GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static const char *const PowerNames[] =
5151
"FASTER",
5252
"DOUBLE_SHOT",
5353
"SELF_HEALING",
54-
NULL
54+
nullptr
5555
};
5656
static_assert(ARRAY_SIZE(PowerNames) == POWERS_NUM_POWERS + 1, "Incorrect array size");
5757
#endif // end DEFINE_POWER_NAMES

GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ static const char *const TheWeaponBonusNames[] =
245245
"FRENZY_TWO",
246246
"FRENZY_THREE",
247247

248-
NULL
248+
nullptr
249249
};
250250
static_assert(ARRAY_SIZE(TheWeaponBonusNames) == WEAPONBONUSCONDITION_COUNT + 1, "Incorrect array size");
251251
#endif
@@ -300,7 +300,7 @@ static const char *const TheWeaponBonusFieldNames[] =
300300
"RANGE",
301301
"RATE_OF_FIRE",
302302
"PRE_ATTACK",
303-
NULL
303+
nullptr
304304
};
305305
static_assert(ARRAY_SIZE(TheWeaponBonusFieldNames) == WeaponBonus::FIELD_COUNT + 1, "Incorrect array size");
306306
#endif

0 commit comments

Comments
 (0)