Merge branch 'port-net' into add-crosshair-size-option

src/include/constants.h

@@ -4728,7 +4728,7 @@ enum weaponnum {
 #define NETMODE_SERVER 1
 #define NETMODE_CLIENT 2
 
-#define LOCALPLAYERCOUNT() (g_NetMode ? 1 : PLAYERCOUNT())
+#define LOCALPLAYERCOUNT() playerGetLocalCount()
 
 #endif
 

src/include/data.h

@@ -552,6 +552,7 @@ extern bool g_BlurFbDirty;
 extern s32 g_TickRateDiv;
 extern s32 g_MusicDisableMpDeath;
 extern s32 g_BgunGeMuzzleFlashes;
+extern s32 g_FileAutoSelect;
 
 extern s32 g_NetMode;
 
@@ -562,6 +563,7 @@ extern s32 g_NetMode;
 #define TEX_FILTER_2D g_TexFilter2D
 
 s32 playerGetCount(void);
+s32 playerGetLocalCount(void);
 
 #else // PLATFORM_N64
 

src/include/game/player.h

@@ -110,6 +110,7 @@ struct sndstate *playerSndStart(s32 arg0, s16 sound, struct sndstate **handle, s
 
 #if MAX_PLAYERS > 4
 s32 playerGetCount(void);
+s32 playerGetLocalCount(void);
 #endif
 
 #ifndef PLATFORM_N64