Code review changes

Fixup bound logic issue and extern arrays.

Author: nullsystem

src/game/client/CMakeLists.txt

@@ -1668,6 +1668,7 @@ target_sources_grouped(
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_aa13.h
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_balc.cpp
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_balc.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_bits.cpp
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_bits.h
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_detpack.cpp
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_detpack.h

src/game/server/CMakeLists.txt

@@ -1521,6 +1521,7 @@ target_sources_grouped(
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_aa13.h
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_balc.cpp
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_balc.h
+    ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_bits.cpp
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_bits.h
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_detpack.cpp
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons/weapon_detpack.h

src/game/shared/neo/neo_crosshair.cpp

@@ -14,6 +14,17 @@ extern int g_verbose;
 #include "mathlib/mathlib.h"
 #include "neo_serial.h"
 
+const ENeoCrosshairWep MAP_WEAPON_TYPE_TO_XHAIR[WEP_TYPE__TOTAL] = {
+	CROSSHAIR_WEP_NONE,			// WEP_TYPE_NIL
+	CROSSHAIR_WEP_NONE,			// WEP_TYPE_THROWABLE
+	CROSSHAIR_WEP_SECONDARY,	// WEP_TYPE_PISTOL
+	CROSSHAIR_WEP_DEFAULT,		// WEP_TYPE_SMG
+	CROSSHAIR_WEP_SHOTGUN,		// WEP_TYPE_SHOTGUN
+	CROSSHAIR_WEP_DEFAULT,		// WEP_TYPE_RIFLE
+	CROSSHAIR_WEP_DEFAULT,		// WEP_TYPE_MACHINEGUN
+	CROSSHAIR_WEP_NONE,			// WEP_TYPE_SNIPER
+};
+
 #ifdef CLIENT_DLL
 #include "neo_gamerules.h"
 #include "weapon_neobasecombatweapon.h"

src/game/shared/neo/neo_crosshair.h

@@ -67,16 +67,7 @@ enum ENeoCrosshairWep
 	CROSSHAIR_WEP__TOTAL,
 };
 
-static const ENeoCrosshairWep MAP_WEAPON_TYPE_TO_XHAIR[WEP_TYPE__TOTAL] = {
-	CROSSHAIR_WEP_NONE,			// WEP_TYPE_NIL
-	CROSSHAIR_WEP_NONE,			// WEP_TYPE_THROWABLE
-	CROSSHAIR_WEP_SECONDARY,	// WEP_TYPE_PISTOL
-	CROSSHAIR_WEP_DEFAULT,		// WEP_TYPE_SMG
-	CROSSHAIR_WEP_SHOTGUN,		// WEP_TYPE_SHOTGUN
-	CROSSHAIR_WEP_DEFAULT,		// WEP_TYPE_RIFLE
-	CROSSHAIR_WEP_DEFAULT,		// WEP_TYPE_MACHINEGUN
-	CROSSHAIR_WEP_NONE,			// WEP_TYPE_SNIPER
-};
+extern const ENeoCrosshairWep MAP_WEAPON_TYPE_TO_XHAIR[WEP_TYPE__TOTAL];
 
 enum NeoCrosshairWepFlag_
 {

src/game/shared/neo/neo_serial.cpp

@@ -24,7 +24,7 @@ enum ESerialVariantType
 static void StrCatCh(char (&szMutStr)[NEO_XHAIR_SEQMAX], const char ch)
 {
 	const int iSize = V_strlen(szMutStr);
-	if (iSize < NEO_XHAIR_SEQMAX)
+	if ((iSize + 1) < NEO_XHAIR_SEQMAX)
 	{
 		szMutStr[iSize] = ch;
 		szMutStr[iSize + 1] = '\0';

src/game/shared/neo/weapons/weapon_bits.cpp

@@ -0,0 +1,13 @@
+#include "weapon_bits.h"
+
+#define DEFINE_WEAPON_TYPE(_x1, _x2, _x3, weptype) weptype,
+#define DEFINE_WEAPON_TYPE_ALT(_x1, _x2, _x3, _x4, weptype) weptype,
+
+const ENeoWeaponType NEO_WEAPON_TYPE[NEO_WIDX__TOTAL] = {
+	WEP_TYPE_NIL, // 0 = invalid, set none
+	FOR_LIST_WEAPONS(DEFINE_WEAPON_TYPE, DEFINE_WEAPON_TYPE_ALT)
+#ifdef INCLUDE_WEP_PBK
+	WEP_TYPE_MACHINEGUN,
+#endif
+};
+

src/game/shared/neo/weapons/weapon_bits.h

@@ -73,16 +73,7 @@ enum NeoWepBits : NEO_WEP_BITS_UNDERLYING_TYPE
 #endif
 };
 
-#define DEFINE_CROSSHAIR_TYPE(_x1, _x2, _x3, weptype) weptype,
-#define DEFINE_CROSSHAIR_TYPE_ALT(_x1, _x2, _x3, _x4, weptype) weptype,
-
-static const ENeoWeaponType NEO_WEAPON_TYPE[NEO_WIDX__TOTAL] = {
-	WEP_TYPE_NIL, // 0 = invalid, set none
-	FOR_LIST_WEAPONS(DEFINE_CROSSHAIR_TYPE, DEFINE_CROSSHAIR_TYPE_ALT)
-#ifdef INCLUDE_WEP_PBK
-	WEP_TYPE_MACHINEGUN,
-#endif
-};
+extern const ENeoWeaponType NEO_WEAPON_TYPE[NEO_WIDX__TOTAL];
 
 // Some other related type safety checks also rely on this equaling zero.
 static_assert(NEO_WEP_INVALID == 0);

src/tests/test_neo_crosshair.cpp

@@ -339,7 +339,7 @@ void TestSerial_LongestLength()
 	char szExportSeq[NEO_XHAIR_SEQMAX];
 	ExportCrosshair(&xhairInfo, szExportSeq);
 	// Make sure it's not maxing out the string
-	TEST_VERIFY(V_strlen(szExportSeq) < (NEO_XHAIR_SEQMAX - 1));
+	TEST_VERIFY(V_strlen(szExportSeq) < (NEO_XHAIR_SEQMAX - 1 - 1));
 	TEST_COMPARE_STR(szExportSeq, SERIAL_TEST_STR);
 }