Fix windows compilation.

src/dlls/extdll.h

@@ -31,6 +31,7 @@
 #pragma warning(disable : 4201)		// nameless struct/union
 #pragma warning(disable : 4514)		// unreferenced inline function removed
 #pragma warning(disable : 4100)		// unreferenced formal parameter
+#pragma warning(disable : 4390)		// empty controlled statement (seems to work fine? monster_api.cpp[101/115])
 
 // Prevent tons of unused windows definitions
 #ifdef _WIN32

src/dlls/gargantua.cpp

@@ -1266,13 +1266,10 @@ void CSpiral::Think( void )
 
 void SpawnExplosion( Vector center, float randomRange, float time, int magnitude, edict_t *owner )
 {
+	/* no need for this
 	KeyValueData	kvd;
 	char			buf[128];
 
-	center.x += RANDOM_FLOAT( -randomRange, randomRange );
-	center.y += RANDOM_FLOAT( -randomRange, randomRange );
-
-    /*
 	CMBaseEntity *pExplosion = CreateClassPtr((CEnvExplosion *)NULL); // CMBaseEntity::Create( "env_explosion", center, g_vecZero, NULL );
 	sprintf( buf, "%3d", magnitude );
 	kvd.szKeyName = "iMagnitude";
@@ -1285,6 +1282,9 @@ void SpawnExplosion( Vector center, float randomRange, float time, int magnitude
 	pExplosion->pev->nextthink = gpGlobals->time + time;
     */
 
+	center.x += RANDOM_FLOAT( -randomRange, randomRange );
+	center.y += RANDOM_FLOAT( -randomRange, randomRange );
+
     // explode.h
     ExplosionCreate( center, g_vecZero, owner, magnitude, SF_ENVEXPLOSION_NODAMAGE, time );
 }

src/dlls/monster_config.cpp

@@ -282,7 +282,7 @@ void scan_monster_cfg(FILE *fp)
 				// Bruteforce to remove quotes
 				char parse[66] = {0};
 				int skip = 0;
-				for (int i = 0; i < strlen(input); i++)
+				for (unsigned i = 0; i < strlen(input); i++)
 				{
 					if (input[i] == '"')
 					{
@@ -317,12 +317,11 @@ void scan_monster_cfg(FILE *fp)
 	}
 }
 
-void process_monster_cfg(void)
+bool process_monster_cfg(void)
 {
 	char game_dir[256];
 	char filename[256];
 	FILE *fp = NULL;
-	bool status = FALSE;  // no error
 
 	monster_spawn_count = 0;
 
@@ -351,8 +350,7 @@ void process_monster_cfg(void)
 		{
 			//META_CONS("[MONSTER] ERROR: Could not open \"%s\"!", filename);
 			LOG_MESSAGE(PLID, "ERROR: Could not open \"%s\" file!", filename);
-
+			return TRUE; // error
-			return;
 		}
 
 		scan_monster_cfg(fp);
@@ -360,7 +358,7 @@ void process_monster_cfg(void)
 		fclose(fp);
 	}
 
-	return;
+	return FALSE; // all ok
 }
 
 

src/dlls/monster_mm.dsp

@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "monster_mm_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\dlls" /I "..\common" /I "..\engine" /I "..\pm_shared" /I "..\..\metamod" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "monster_mm_EXPORTS" /D strcasecmp=stricmp /D strncasecmp=_strnicmp /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\dlls" /I "..\common" /I "..\engine" /I "..\pm_shared" /I "..\metamod" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "monster_mm_EXPORTS" /D strcasecmp=stricmp /D strncasecmp=_strnicmp /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -55,22 +55,6 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\monster_mm.def"
-# Begin Custom Build - Copying to DLL folder
-TargetPath=.\Release\monster_mm.dll
-TargetName=monster_mm
-InputPath=.\Release\monster_mm.dll
-SOURCE="$(InputPath)"
-
-"$(TargetName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(TargetPath) D:\Half-Life\valve\dlls 
-	copy $(TargetPath) D:\Half-Life\tfc\dlls 
-	copy $(TargetPath) D:\Half-Life\cstrike\dlls 
-	copy $(TargetPath) D:\Half-Life\dmc\dlls 
-	copy $(TargetPath) D:\Half-Life\dod\dlls 
-	copy $(TargetPath) D:\Half-Life\firearms\dlls 
-	copy $(TargetPath) D:\Half-Life\frontline\dlls 
-	
-# End Custom Build
 
 !ELSEIF  "$(CFG)" == "monster_mm - Win32 Debug"
 
@@ -86,7 +70,7 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "monster_mm_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\dlls" /I "..\common" /I "..\engine" /I "..\pm_shared" /I "..\..\metamod" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "monster_mm_EXPORTS" /D strcasecmp=stricmp /D strncasecmp=_strnicmp /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\dlls" /I "..\common" /I "..\engine" /I "..\pm_shared" /I "..\metamod" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "monster_mm_EXPORTS" /D strcasecmp=stricmp /D strncasecmp=_strnicmp /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -98,23 +82,6 @@ BSC32=bscmake.exe
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:".\monster_mm.def" /pdbtype:sept
-# Begin Custom Build - Copying to DLL folder
-TargetPath=.\Debug\monster_mm.dll
-TargetName=monster_mm
-InputPath=.\Debug\monster_mm.dll
-SOURCE="$(InputPath)"
-
-"$(TargetName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy $(TargetPath) D:\Half-Life\valve\dlls 
-	copy $(TargetPath) D:\Half-Life\tfc\dlls 
-	copy $(TargetPath) D:\Half-Life\cstrike\dlls 
-	copy $(TargetPath) D:\Half-Life\dmc\dlls 
-	copy $(TargetPath) D:\Half-Life\dod\dlls 
-	copy $(TargetPath) D:\Half-Life\firearms\dlls 
-	copy $(TargetPath) D:\Half-Life\frontline\dlls 
-	copy $(TargetPath) D:\Half-Life\gearbox\dlls 
-	
-# End Custom Build
 
 !ENDIF 
 
@@ -183,14 +150,26 @@ SOURCE=.\effects.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\explode.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\flyingmonster.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\gargantua.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\ggrenade.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\gonome.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\h_ai.cpp
 # End Source File
 # Begin Source File
@@ -223,6 +202,10 @@ SOURCE=.\islave.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\massn.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\monster_api.cpp
 # End Source File
 # Begin Source File
@@ -243,10 +226,26 @@ SOURCE=.\nodes.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\otis.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\pitdrone.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\scientist.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\shock.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\shockroach.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\skill.cpp
 # End Source File
 # Begin Source File
@@ -255,10 +254,18 @@ SOURCE=.\sound.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\sporegrenade.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\squeakgrenade.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\strooper.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\subs.cpp
 # End Source File
 # Begin Source File
@@ -267,10 +274,18 @@ SOURCE=.\talkmonster.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\turret.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\util.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\voltigore.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\weapons.cpp
 # End Source File
 # Begin Source File
@@ -287,6 +302,10 @@ SOURCE=.\activity.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\activitymap.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\animation.h
 # End Source File
 # Begin Source File
@@ -315,6 +334,10 @@ SOURCE=.\decals.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\defaultai.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\doors.h
 # End Source File
 # Begin Source File
@@ -339,10 +362,18 @@ SOURCE=.\func_break.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\hornet.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\monster_plugin.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\monsterevent.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\monsters.h
 # End Source File
 # Begin Source File
@@ -351,10 +382,18 @@ SOURCE=.\nodes.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\plane.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\schedule.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\shock.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\skill.h
 # End Source File
 # Begin Source File

src/dlls/monster_plugin.h

@@ -5,11 +5,11 @@
 #ifndef MONSTER_PLUGIN_H
 #define MONSTER_PLUGIN_H
 
-typedef struct pKVD
+typedef struct
 {
 	char key[33];
 	char value[33];
-};
+} pKVD;
 
 #define MAX_KEYVALUES 32
 

src/dlls/nodes.cpp

@@ -25,12 +25,12 @@
 #include	"animation.h"
 #include	"doors.h"
 
-//#if !defined ( _WIN32 ) 
+#if !defined ( _WIN32 ) 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h> // mkdir
-//#endif
+#endif
 
 #define	HULL_STEP_SIZE 16// how far the test hull moves on each step
 #define	NODE_HEIGHT	8	// how high to lift nodes off the ground after we drop them all (make stair/ramp mapping easier)
@@ -38,7 +38,7 @@
 // to help eliminate node clutter by level designers, this is used to cap how many other nodes
 // any given node is allowed to 'see' in the first stage of graph creation "LinkVisibleNodes()".
 #define	MAX_NODE_INITIAL_LINKS	128
-#define	MAX_NODES               1024
+//#define	MAX_NODES               1024	// already defined in monster_plugin.h
 
 Vector VecBModelOrigin( entvars_t* pevBModel );
 

src/metamod/stdint_c99.h

@@ -0,0 +1,229 @@
+/* ISO C9x  7.18  Integer types <stdint.h>
+* Based on ISO/IEC SC22/WG14 9899 Committee draft (SC22 N2794)
+*
+*  THIS SOFTWARE IS NOT COPYRIGHTED
+*
+*  Contributor: Danny Smith <danny_r_smith_2001@yahoo.co.nz>
+*
+*  This source code is offered for use in the public domain. You may
+*  use, modify or distribute it freely.
+*
+*  This code is distributed in the hope that it will be useful but
+*  WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
+*  DISCLAIMED. This includes but is not limited to warranties of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*
+*  Date: 2000-12-02
+*
+* mwb: This was modified in the following ways:
+*
+*      - make it compatible with Visual C++ 6 (which uses 
+*          non-standard keywords and suffixes for 64-bit types)
+*      - some environments need stddef.h included (for wchar stuff?)
+*      - handle the fact that Microsoft's limits.h header defines
+*          SIZE_MAX
+*      - make corrections for SIZE_MAX, INTPTR_MIN, INTPTR_MAX, UINTPTR_MAX,
+*          PTRDIFF_MIN, PTRDIFF_MAX, SIG_ATOMIC_MIN, and SIG_ATOMIC_MAX
+*          to be 64-bit aware.
+*/
+
+#ifndef _STDINT_H
+#define _STDINT_H
+#define __need_wint_t
+#define __need_wchar_t
+#include <wchar.h>
+#include <stddef.h>
+
+#if _MSC_VER && (_MSC_VER < 1300)
+/* using MSVC 6 or earlier - no "long long" type, but might have _int64 type */
+#define __STDINT_LONGLONG           __int64
+#define __STDINT_LONGLONG_SUFFIX    i64
+#else
+#define __STDINT_LONGLONG           long long
+#define __STDINT_LONGLONG_SUFFIX    LL
+#endif
+
+#if !defined( PASTE)
+#define PASTE2( x, y) x##y
+#define PASTE( x, y)  PASTE2( x, y)
+#endif /* PASTE */
+
+/* 7.18.1.1  Exact-width integer types */
+typedef signed char int8_t;
+typedef unsigned char   uint8_t;
+typedef short  int16_t;
+typedef unsigned short  uint16_t;
+typedef int  int32_t;
+typedef unsigned   uint32_t;
+typedef __STDINT_LONGLONG  int64_t;
+typedef unsigned __STDINT_LONGLONG   uint64_t;
+
+/* 7.18.1.2  Minimum-width integer types */
+typedef signed char int_least8_t;
+typedef unsigned char   uint_least8_t;
+typedef short  int_least16_t;
+typedef unsigned short  uint_least16_t;
+typedef int  int_least32_t;
+typedef unsigned   uint_least32_t;
+typedef __STDINT_LONGLONG  int_least64_t;
+typedef unsigned __STDINT_LONGLONG   uint_least64_t;
+
+/*  7.18.1.3  Fastest minimum-width integer types 
+*  Not actually guaranteed to be fastest for all purposes
+*  Here we use the exact-width types for 8 and 16-bit ints. 
+*/
+typedef char int_fast8_t;
+typedef unsigned char uint_fast8_t;
+typedef short  int_fast16_t;
+typedef unsigned short  uint_fast16_t;
+typedef int  int_fast32_t;
+typedef unsigned  int  uint_fast32_t;
+typedef __STDINT_LONGLONG  int_fast64_t;
+typedef unsigned __STDINT_LONGLONG   uint_fast64_t;
+
+/* 7.18.1.4  Integer types capable of holding object pointers */
+#ifndef _INTPTR_T_DEFINED
+#define _INTPTR_T_DEFINED
+#ifdef _WIN64
+typedef __STDINT_LONGLONG intptr_t
+#else
+typedef int intptr_t;
+#endif /* _WIN64 */
+#endif /* _INTPTR_T_DEFINED */
+
+#ifndef _UINTPTR_T_DEFINED
+#define _UINTPTR_T_DEFINED
+#ifdef _WIN64
+typedef unsigned __STDINT_LONGLONG uintptr_t
+#else
+typedef unsigned int uintptr_t;
+#endif /* _WIN64 */
+#endif /* _UINTPTR_T_DEFINED */
+
+/* 7.18.1.5  Greatest-width integer types */
+typedef __STDINT_LONGLONG  intmax_t;
+typedef unsigned __STDINT_LONGLONG   uintmax_t;
+
+/* 7.18.2  Limits of specified-width integer types */
+#if !defined ( __cplusplus) || defined (__STDC_LIMIT_MACROS)
+
+/* 7.18.2.1  Limits of exact-width integer types */
+#define INT8_MIN (-128) 
+#define INT16_MIN (-32768)
+#define INT32_MIN (-2147483647 - 1)
+#define INT64_MIN  (PASTE( -9223372036854775807, __STDINT_LONGLONG_SUFFIX) - 1)
+
+#define INT8_MAX 127
+#define INT16_MAX 32767
+#define INT32_MAX 2147483647
+#define INT64_MAX (PASTE( 9223372036854775807, __STDINT_LONGLONG_SUFFIX))
+
+#define UINT8_MAX 0xff /* 255U */
+#define UINT16_MAX 0xffff /* 65535U */
+#define UINT32_MAX 0xffffffff  /* 4294967295U */
+#define UINT64_MAX (PASTE( 0xffffffffffffffffU, __STDINT_LONGLONG_SUFFIX)) /* 18446744073709551615ULL */
+
+/* 7.18.2.2  Limits of minimum-width integer types */
+#define INT_LEAST8_MIN INT8_MIN
+#define INT_LEAST16_MIN INT16_MIN
+#define INT_LEAST32_MIN INT32_MIN
+#define INT_LEAST64_MIN INT64_MIN
+
+#define INT_LEAST8_MAX INT8_MAX
+#define INT_LEAST16_MAX INT16_MAX
+#define INT_LEAST32_MAX INT32_MAX
+#define INT_LEAST64_MAX INT64_MAX
+
+#define UINT_LEAST8_MAX UINT8_MAX
+#define UINT_LEAST16_MAX UINT16_MAX
+#define UINT_LEAST32_MAX UINT32_MAX
+#define UINT_LEAST64_MAX UINT64_MAX
+
+/* 7.18.2.3  Limits of fastest minimum-width integer types */
+#define INT_FAST8_MIN INT8_MIN
+#define INT_FAST16_MIN INT16_MIN
+#define INT_FAST32_MIN INT32_MIN
+#define INT_FAST64_MIN INT64_MIN
+
+#define INT_FAST8_MAX INT8_MAX
+#define INT_FAST16_MAX INT16_MAX
+#define INT_FAST32_MAX INT32_MAX
+#define INT_FAST64_MAX INT64_MAX
+
+#define UINT_FAST8_MAX UINT8_MAX
+#define UINT_FAST16_MAX UINT16_MAX
+#define UINT_FAST32_MAX UINT32_MAX
+#define UINT_FAST64_MAX UINT64_MAX
+
+/* 7.18.2.4  Limits of integer types capable of holding object pointers */ 
+#ifdef _WIN64
+#define INTPTR_MIN INT64_MIN
+#define INTPTR_MAX INT64_MAX
+#define UINTPTR_MAX UINT64_MAX
+#else
+#define INTPTR_MIN INT32_MIN
+#define INTPTR_MAX INT32_MAX
+#define UINTPTR_MAX UINT32_MAX
+#endif /* _WIN64 */
+
+/* 7.18.2.5  Limits of greatest-width integer types */
+#define INTMAX_MIN INT64_MIN
+#define INTMAX_MAX INT64_MAX
+#define UINTMAX_MAX UINT64_MAX
+
+/* 7.18.3  Limits of other integer types */
+#define PTRDIFF_MIN INTPTR_MIN
+#define PTRDIFF_MAX INTPTR_MAX
+
+#define SIG_ATOMIC_MIN INTPTR_MIN
+#define SIG_ATOMIC_MAX INTPTR_MAX
+
+/* we need to check for SIZE_MAX already defined because MS defines it in limits.h */
+#ifndef SIZE_MAX
+#define SIZE_MAX UINTPTR_MAX
+#endif
+
+#ifndef WCHAR_MIN  /* also in wchar.h */ 
+#define WCHAR_MIN 0
+#define WCHAR_MAX ((wchar_t)-1) /* UINT16_MAX */
+#endif
+
+/* wint_t is unsigned short for compatibility with MS runtime */
+#define WINT_MIN 0
+#define WINT_MAX ((wint_t)-1) /* UINT16_MAX */
+
+#endif /* !defined ( __cplusplus) || defined __STDC_LIMIT_MACROS */
+
+/* 7.18.4  Macros for integer constants */
+#if !defined ( __cplusplus) || defined (__STDC_CONSTANT_MACROS)
+
+/* 7.18.4.1  Macros for minimum-width integer constants
+	
+	Accoding to Douglas Gwyn <gwyn@arl.mil>:
+	"This spec was changed in ISO/IEC 9899:1999 TC1; in ISO/IEC
+	9899:1999 as initially published, the expansion was required
+	to be an integer constant of precisely matching type, which
+	is impossible to accomplish for the shorter types on most
+	platforms, because C99 provides no standard way to designate
+	an integer constant with width less than that of type int.
+	TC1 changed this to require just an integer constant
+	*expression* with *promoted* type."
+*/
+
+#define INT8_C(val) ((int8_t) + (val))
+#define UINT8_C(val) ((uint8_t) + (val##U))
+#define INT16_C(val) ((int16_t) + (val))
+#define UINT16_C(val) ((uint16_t) + (val##U))
+
+#define INT32_C(val) val##L
+#define UINT32_C(val) val##UL
+#define INT64_C(val) (PASTE( val, __STDINT_LONGLONG_SUFFIX))
+#define UINT64_C(val)(PASTE( PASTE( val, U), __STDINT_LONGLONG_SUFFIX))
+
+/* 7.18.4.2  Macros for greatest-width integer constants */
+#define INTMAX_C(val)  INT64_C(val)
+#define UINTMAX_C(val) UINT64_C(val)
+
+#endif  /* !defined ( __cplusplus) || defined __STDC_CONSTANT_MACROS */
+
+#endif