v1.443 final build

Author: APGRoboCop

dlls/HPB_bot.vcxproj

@@ -132,8 +132,10 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\dlls;..\engine;..\common;..\pm_shared;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;VALVE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;VALVE_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BrowseInformation>true</BrowseInformation>
+      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <FloatingPointModel>Fast</FloatingPointModel>
     </ClCompile>
     <Midl>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -178,15 +180,16 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\dlls;..\engine;..\common;..\pm_shared;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;VALVE_DLL;RCBOT_META_BUILD;HPB_bot_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;VALVE_DLL;RCBOT_META_BUILD;HPB_bot_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AssemblerListingLocation>.\HPB_bot___Win32_MetaMod_Release\</AssemblerListingLocation>
       <BrowseInformation>true</BrowseInformation>
       <PrecompiledHeaderOutputFile>.\HPB_bot___Win32_MetaMod_Release\HPB_bot.pch</PrecompiledHeaderOutputFile>
       <ProgramDataBaseFileName>.\HPB_bot___Win32_MetaMod_Release\</ProgramDataBaseFileName>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <FunctionLevelLinking>true</FunctionLevelLinking>
+      <FloatingPointModel>Fast</FloatingPointModel>
     </ClCompile>
     <Midl>
       <SuppressStartupBanner>true</SuppressStartupBanner>

dlls/Makefile

@@ -14,7 +14,8 @@ BASEFLAGS = -Dstricmp=strcasecmp -Dstrcmpi=strcasecmp -DRCBOT_META_BUILD -D__lin
 #CPPFLAGS = ${BASEFLAGS} -g -ggdb -I. -I../engine -I../common -I../pm_shared
 
 CPPFLAGS = ${BASEFLAGS} -mtune=generic -march=i686 -msse -msse2 -mfpmath=sse -s -pipe -O2 \
-			-Wno-write-strings -Wno-unused-local-typedefs -I. -I../engine -I../common -I../pm_shared
+	-Wno-write-strings -Wno-unused-local-typedefs \
+	-funsafe-math-optimizations -I. -I../engine -I../common -I../pm_shared
 
 OBJ = bits.o bot.o bot_client.o bot_commands.o bot_ga.o bot_menu.o bot_navigate.o bot_nn.o \
 	bot_rep.o bot_visibles.o bot_weapons.o client.o dir.o dll.o engine.o ga.o globals.o \

dlls/Release

@@ -54,7 +54,7 @@
 #include "meta_api.h"
 #endif
 #include "cbase.h" // Need CBASE for classify()
-#include "player.h"
+//#include "player.h"
 #include "bot_const.h"
 #include "bot.h"
 #include "waypoint.h"

dlls/bot.cpp

@@ -1115,17 +1115,17 @@ typedef enum
 #ifdef RCBOT_META_BUILD
 
 #ifdef _DEBUG
-#define BOT_VER "1.442_mm_debug"
+#define BOT_VER "1.443_mm_debug"
 #else
-#define BOT_VER "1.442_mm"
+#define BOT_VER "1.443_mm"
 #endif
 
 #else
 
 #ifdef _DEBUG
-#define BOT_VER "1.442_debug"
+#define BOT_VER "1.443_debug"
 #else
-#define BOT_VER "1.442"
+#define BOT_VER "1.443"
 #endif
 
 #endif

dlls/bot_const.h

@@ -38,7 +38,7 @@
 #include "meta_api.h"
 #endif
 #include "cbase.h" // Need CBASE for classify()
-#include "player.h"
+//#include "player.h"
 #include "bot_const.h"
 #include "bot.h"
 #include "bot_ga.h"

dlls/bot_ga.cpp

@@ -14,7 +14,8 @@ BASEFLAGS = -Dstricmp=strcasecmp -Dstrcmpi=strcasecmp -D__linux__ -std=gnu++11#
 #CPPFLAGS = ${BASEFLAGS} -g -ggdb -I. -I../engine -I../common -I../pm_shared
 
 CPPFLAGS = ${BASEFLAGS} -mtune=generic -march=i686 -msse -msse2 -mfpmath=sse -s -pipe -O2 \
-			-Wno-write-strings -Wno-unused-local-typedefs -I. -I../engine -I../common -I../pm_shared
+	-Wno-write-strings -Wno-unused-local-typedefs \
+	-funsafe-math-optimizations -I. -I../engine -I../common -I../pm_shared
 
 OBJ = bot.o bot_client.o bot_commands.o bot_menu.o bot_navigate.o bot_rep.o bot_weapons.o client.o dir.o \
 	dll.o engine.o globals.o h_export.o linkfunc.o megahal.o netmessages.o rcbot_meta_api.o util.o waypoint.o 

dlls/makefile_linux_sa

@@ -37,6 +37,7 @@
 #ifndef META_API_H
 #define META_API_H
 
+#include "comp_dep.h"			// Metamod API now using 5:13 for RCBot [APG]RoboCop[CL]
 #include "dllapi.h"				// GETENTITYAPI_FN, etc
 #include "engine_api.h"			// GET_ENGINE_FUNCTIONS_FN, etc
 #include "plinfo.h"				// plugin_info_t, etc
@@ -59,7 +60,10 @@
 // Version 5:8	added GetPluginPath [v1.11]
 // Version 5:9	added GetGameInfo [v1.14]
 // Version 5:10 added GINFO_REALDLL_FULLPATH for GetGameInfo [v1.17]
-#define META_INTERFACE_VERSION "5:10"
+// Version 5:11 added plugin loading and unloading API [v1.18]
+// Version 5:12 added IS_QUERYING_CLIENT_CVAR to mutils [v1.18]
+// Version 5:13 added MAKE_REQUESTID and GET_HOOK_TABLES to mutils [v1.19]
+#define META_INTERFACE_VERSION "5:13"
 
 #ifdef UNFINISHED
 // Version 5:99	added event hook utility functions [v.???]
@@ -95,7 +99,7 @@ typedef struct meta_globals_s {
 	void *override_ret;		// readable; return value from overriding/superceding plugin
 } meta_globals_t;
 
-extern meta_globals_t *gpMetaGlobals;
+extern meta_globals_t *gpMetaGlobals DLLHIDDEN;
 #define SET_META_RESULT(result)			gpMetaGlobals->mres=result
 #define RETURN_META(result) \
 	do { gpMetaGlobals->mres=result; return; } while(0)
@@ -125,8 +129,8 @@ typedef struct {
 } gamedll_funcs_t;
 
 // Declared in plugin; referenced in macros.
-extern gamedll_funcs_t *gpGamedllFuncs;
-extern mutil_funcs_t *gpMetaUtilFuncs;
+extern gamedll_funcs_t *gpGamedllFuncs DLLHIDDEN;
+extern mutil_funcs_t *gpMetaUtilFuncs DLLHIDDEN;
 
 // Tell the dll that we'll be loading it as a metamod plugin, in case it
 // needs to do something special prior to the standard query/attach
@@ -238,5 +242,6 @@ C_DLLEXPORT int GetEngineFunctions_Post(enginefuncs_t *pengfuncsFromEngine,
 #define MNEW_OnFreeEntPrivateData		MNEW_FUNC->pfnOnFreeEntPrivateData
 #define MNEW_GameShutdown				MNEW_FUNC->pfnGameShutdown
 #define MNEW_ShouldCollide				MNEW_FUNC->pfnShouldCollide
+#define MNEW_CvarValue					MNEW_FUNC->pfnCvarValue
 
 #endif /* META_API_H */

dlls/meta_api.h

@@ -1,81 +1,81 @@
-// vi: set ts=4 sw=4 :
-// vim: set tw=75 :
-
-// engine_t.h - The engine_t type
-
-/*
- * Copyright (c) 2001-2006 Will Day <[email protected]>
- *
- *    This file is part of Metamod.
- *
- *    Metamod is free software; you can redistribute it and/or modify it
- *    under the terms of the GNU General Public License as published by the
- *    Free Software Foundation; either version 2 of the License, or (at
- *    your option) any later version.
- *
- *    Metamod is distributed in the hope that it will be useful, but
- *    WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *    General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with Metamod; if not, write to the Free Software Foundation,
- *    Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *    In addition, as a special exception, the author gives permission to
- *    link the code of this program with the Half-Life Game Engine ("HL
- *    Engine") and Modified Game Libraries ("MODs") developed by Valve,
- *    L.L.C ("Valve").  You must obey the GNU General Public License in all
- *    respects for all of the code used other than the HL Engine and MODs
- *    from Valve.  If you modify this file, you may extend this exception
- *    to your version of the file, but you are not obligated to do so.  If
- *    you do not wish to do so, delete this exception statement from your
- *    version.
- *
- */
-
-#ifndef MM_ENGINE_T_H
-#define MM_ENGINE_T_H
-
-#include "eiface.h"             // engfuncs_t, globalvars_t
-#include "engineinfo.h"         // EngineInfo
-
-
-// Our structure for storing engine references.
-struct engine_t {
-    engine_t();
-    engine_t(const engine_t&);
-    engine_t& operator=(const engine_t&);
-
-	enginefuncs_t	*funcs;			// engine funcs
-	globalvars_t	*globals;		// engine globals
-	enginefuncs_t	*pl_funcs;		// "modified" eng funcs we give to plugins
-    EngineInfo       info;          // some special info elements
-};
-
-inline engine_t::engine_t() 
-    : funcs(NULL), globals(NULL), pl_funcs(NULL), info() 
-{
-}
-
-
-inline engine_t::engine_t(const engine_t& _rhs) 
-    : funcs(_rhs.funcs), globals(_rhs.globals), pl_funcs(_rhs.pl_funcs), info(_rhs.info) 
-{
-}
-
-
-inline engine_t& engine_t::operator=(const engine_t& _rhs) 
-{
-    funcs = _rhs.funcs;
-    globals = _rhs.globals;
-    pl_funcs = _rhs.pl_funcs;
-    info = _rhs.info;
-    return *this;
-}
-
-
-extern engine_t Engine;
-
-#endif /* MM_ENGINE_T_H */
-
+// vi: set ts=4 sw=4 :
+// vim: set tw=75 :
+
+// engine_t.h - The engine_t type
+
+/*
+ * Copyright (c) 2001-2006 Will Day <[email protected]>
+ *
+ *    This file is part of Metamod.
+ *
+ *    Metamod is free software; you can redistribute it and/or modify it
+ *    under the terms of the GNU General Public License as published by the
+ *    Free Software Foundation; either version 2 of the License, or (at
+ *    your option) any later version.
+ *
+ *    Metamod is distributed in the hope that it will be useful, but
+ *    WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with Metamod; if not, write to the Free Software Foundation,
+ *    Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *    In addition, as a special exception, the author gives permission to
+ *    link the code of this program with the Half-Life Game Engine ("HL
+ *    Engine") and Modified Game Libraries ("MODs") developed by Valve,
+ *    L.L.C ("Valve").  You must obey the GNU General Public License in all
+ *    respects for all of the code used other than the HL Engine and MODs
+ *    from Valve.  If you modify this file, you may extend this exception
+ *    to your version of the file, but you are not obligated to do so.  If
+ *    you do not wish to do so, delete this exception statement from your
+ *    version.
+ *
+ */
+
+#ifndef MM_ENGINE_T_H
+#define MM_ENGINE_T_H
+
+#include "eiface.h"             // engfuncs_t, globalvars_t
+#include "engineinfo.h"         // EngineInfo
+
+
+// Our structure for storing engine references.
+struct engine_t {
+    engine_t();
+    engine_t(const engine_t&);
+    engine_t& operator=(const engine_t&);
+
+	enginefuncs_t	*funcs;			// engine funcs
+	globalvars_t	*globals;		// engine globals
+	enginefuncs_t	*pl_funcs;		// "modified" eng funcs we give to plugins
+    EngineInfo       info;          // some special info elements
+};
+
+inline engine_t::engine_t() 
+    : funcs(NULL), globals(NULL), pl_funcs(NULL), info() 
+{
+}
+
+
+inline engine_t::engine_t(const engine_t& _rhs) 
+    : funcs(_rhs.funcs), globals(_rhs.globals), pl_funcs(_rhs.pl_funcs), info(_rhs.info) 
+{
+}
+
+
+inline engine_t& engine_t::operator=(const engine_t& _rhs) 
+{
+    funcs = _rhs.funcs;
+    globals = _rhs.globals;
+    pl_funcs = _rhs.pl_funcs;
+    info = _rhs.info;
+    return *this;
+}
+
+
+extern engine_t Engine;
+
+#endif /* MM_ENGINE_T_H */
+