refactor: convert NULL to nullptr or 0 in array/struct initializers

Author: bobtista

Core/GameEngine/Source/Common/Audio/GameAudio.cpp

@@ -133,7 +133,7 @@ static const FieldParse audioSettingsFieldParseTable[] =
   { "ZoomMaxDistance",		INI::parseReal,									nullptr,							offsetof( AudioSettings, m_zoomMaxDistance ) },
   { "ZoomSoundVolumePercentageAmount",		INI::parsePercentToReal,	nullptr,		offsetof( AudioSettings, m_zoomSoundVolumePercentageAmount ) },
 
-	{ nullptr, nullptr, nullptr, NULL }
+	{ nullptr, nullptr, nullptr, 0 }
 };
 
 // Singleton TheAudio /////////////////////////////////////////////////////////////////////////////

Core/Tools/Babylon/TransDB.cpp

@@ -45,7 +45,7 @@ static LANGINFO langinfo[] =
 		{ LANGID_KOREAN, "Korean", "ko", "k" },
 		{ LANGID_CHINESE, "Chinese", "ch", "c" },
 		{ LANGID_JABBER, "Jabberwockie", "jb", "e" },
-		{ LANGID_UNKNOWN, "Unknown", nullptr, NULL }
+		{ LANGID_UNKNOWN, "Unknown", nullptr, nullptr }
 	};
 
 LANGINFO *GetLangInfo ( int index )

Core/Tools/CRCDiff/CRCDiff.cpp

@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
 	atexit(exitWait);
 	const char *inFname[2];
 	const char *outFname = "out.html";
-	FILE *ifp[2] = {NULL, NULL};
+	FILE *ifp[2] = { nullptr, nullptr};
 	std::string header, footer;
 
 	if (argc != 7)

Core/Tools/Launcher/findpatch.cpp

@@ -36,7 +36,7 @@ int Find_Patch(OUT char *filename,int maxlen, ConfigFile &config)
   WIN32_FIND_DATA     findData;
   char                string[128];
   HANDLE              hFile;
-  const char         *extensions[]={"web","exe","exn","rtp",NULL};
+  const char         *extensions[]={"web","exe","exn","rtp", nullptr};
   int                 i;
   int                 skuIndex=0;
   Wstring             key;

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

@@ -271,7 +271,7 @@ static const LookupListRec CommandButtonMappedBorderTypeNames[] =
 	{ "ACTION",				COMMAND_BUTTON_BORDER_ACTION },
 	{ "SYSTEM",				COMMAND_BUTTON_BORDER_SYSTEM },
 
-	{ NULL, 0	}
+	{ nullptr, 0	}
 };
 static_assert(ARRAY_SIZE(CommandButtonMappedBorderTypeNames) == COMMAND_BUTTON_BORDER_COUNT + 1, "Incorrect array size");
 //-------------------------------------------------------------------------------------------------

Generals/Code/GameEngine/Include/GameClient/Credits.h

@@ -81,7 +81,7 @@ static const LookupListRec CreditStyleNames[] =
 	{ "NORMAL",			CREDIT_STYLE_NORMAL },
 	{ "COLUMN",				CREDIT_STYLE_COLUMN },
 	// CREDIT_STYLE_BLANK
-	{ NULL, 0	}
+	{ nullptr, 0	}
 };
 static_assert(ARRAY_SIZE(CreditStyleNames) == MAX_CREDIT_STYLES, "Incorrect array size");
 

Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h

@@ -103,7 +103,7 @@ static const LookupListRec TransitionStyleNames[] =
 	{ "CONTROLBARARROW",			CONTROL_BAR_ARROW_TRANSITION },
 	{ "SCORESCALEUP",			SCORE_SCALE_UP_TRANSITION },
 	{ "REVERSESOUND",			REVERSE_SOUND_TRANSITION },
-	{ NULL, 0	}
+	{ nullptr, 0	}
 };
 static_assert(ARRAY_SIZE(TransitionStyleNames) == MAX_TRANSITION_WINDOW_STYLES + 1, "Incorrect array size");
 

Generals/Code/GameEngine/Include/GameClient/MetaEvent.h

@@ -55,7 +55,7 @@ static const LookupListRec CategoryListName[] =
 	{"TEAM",							CATEGORY_TEAM},
 	{"MISC",							CATEGORY_MISC},
 	{"DEBUG",							CATEGORY_DEBUG},
-	{NULL, 0}
+	{ nullptr, 0}
 };
 
 
@@ -258,7 +258,7 @@ static const LookupListRec KeyNames[] =
 	{ "KEY_INS", MK_INS },
 	{ "KEY_DEL", MK_DEL },
 	{ "KEY_NONE", MK_NONE },
-	{ NULL, 0	}
+	{ nullptr, 0	}
 };
 
 // -------------------------------------------------------------------------------
@@ -276,7 +276,7 @@ static const LookupListRec TransitionNames[] =
 	{ "DOWN",				DOWN },
 	{ "UP",					UP },
 	{ "DOUBLEDOWN",	DOUBLEDOWN },
-	{ NULL, 0	}
+	{ nullptr, 0	}
 };
 static_assert(ARRAY_SIZE(TransitionNames) == MAPPABLE_KEY_TRANSITION_COUNT + 1, "Incorrect array size");
 
@@ -304,7 +304,7 @@ static const LookupListRec ModifierNames[] =
 	{ "SHIFT_CTRL",				SHIFT_CTRL },
 	{ "SHIFT_ALT",				SHIFT_ALT },
 	{ "SHIFT_ALT_CTRL" ,	SHIFT_ALT_CTRL },
-	{ NULL, 0	}
+	{ nullptr, 0	}
 };
 
 

Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h

@@ -59,7 +59,7 @@ class CreateCrateDieModuleData : public DieModuleData
 
 		static const FieldParse dataFieldParse[] =
 		{
-			{ "CrateData",	CreateCrateDieModuleData::parseCrateData,		nullptr, NULL },
+			{ "CrateData",	CreateCrateDieModuleData::parseCrateData,		nullptr, 0 },
 			{ 0, 0, 0, 0 }
 		};
     p.add(dataFieldParse);

Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h

@@ -66,7 +66,7 @@ static const LookupListRec TheWeaponSlotTypeNamesLookupList[] =
 	{ "SECONDARY",	SECONDARY_WEAPON },
 	{ "TERTIARY",		TERTIARY_WEAPON },
 
-	{ NULL, 0	}
+	{ nullptr, 0	}
 };
 static_assert(ARRAY_SIZE(TheWeaponSlotTypeNamesLookupList) == WEAPONSLOT_COUNT + 1, "Incorrect array size");