Skip to content

Commit 86167ec

Browse files
committed
v1.443 final build
1 parent f216502 commit 86167ec

17 files changed

+2317
-2302
lines changed

dlls/HPB_bot.vcxproj

+7-4
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,10 @@
132132
<SuppressStartupBanner>true</SuppressStartupBanner>
133133
<WarningLevel>Level3</WarningLevel>
134134
<AdditionalIncludeDirectories>..\dlls;..\engine;..\common;..\pm_shared;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
135-
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;VALVE_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135+
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;VALVE_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136136
<BrowseInformation>true</BrowseInformation>
137+
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
138+
<FloatingPointModel>Fast</FloatingPointModel>
137139
</ClCompile>
138140
<Midl>
139141
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -178,15 +180,16 @@
178180
<SuppressStartupBanner>true</SuppressStartupBanner>
179181
<WarningLevel>Level3</WarningLevel>
180182
<AdditionalIncludeDirectories>..\dlls;..\engine;..\common;..\pm_shared;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
181-
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;VALVE_DLL;RCBOT_META_BUILD;HPB_bot_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
183+
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;VALVE_DLL;RCBOT_META_BUILD;HPB_bot_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
182184
<AssemblerListingLocation>.\HPB_bot___Win32_MetaMod_Release\</AssemblerListingLocation>
183185
<BrowseInformation>true</BrowseInformation>
184186
<PrecompiledHeaderOutputFile>.\HPB_bot___Win32_MetaMod_Release\HPB_bot.pch</PrecompiledHeaderOutputFile>
185187
<ProgramDataBaseFileName>.\HPB_bot___Win32_MetaMod_Release\</ProgramDataBaseFileName>
186-
<IntrinsicFunctions>true</IntrinsicFunctions>
187-
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
188+
<IntrinsicFunctions>false</IntrinsicFunctions>
189+
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
188190
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
189191
<FunctionLevelLinking>true</FunctionLevelLinking>
192+
<FloatingPointModel>Fast</FloatingPointModel>
190193
</ClCompile>
191194
<Midl>
192195
<SuppressStartupBanner>true</SuppressStartupBanner>

dlls/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ BASEFLAGS = -Dstricmp=strcasecmp -Dstrcmpi=strcasecmp -DRCBOT_META_BUILD -D__lin
1414
#CPPFLAGS = ${BASEFLAGS} -g -ggdb -I. -I../engine -I../common -I../pm_shared
1515

1616
CPPFLAGS = ${BASEFLAGS} -mtune=generic -march=i686 -msse -msse2 -mfpmath=sse -s -pipe -O2 \
17-
-Wno-write-strings -Wno-unused-local-typedefs -I. -I../engine -I../common -I../pm_shared
17+
-Wno-write-strings -Wno-unused-local-typedefs \
18+
-funsafe-math-optimizations -I. -I../engine -I../common -I../pm_shared
1819

1920
OBJ = bits.o bot.o bot_client.o bot_commands.o bot_ga.o bot_menu.o bot_navigate.o bot_nn.o \
2021
bot_rep.o bot_visibles.o bot_weapons.o client.o dir.o dll.o engine.o ga.o globals.o \

dlls/Release

0 Bytes
Binary file not shown.

dlls/bot.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#include "meta_api.h"
5555
#endif
5656
#include "cbase.h" // Need CBASE for classify()
57-
#include "player.h"
57+
//#include "player.h"
5858
#include "bot_const.h"
5959
#include "bot.h"
6060
#include "waypoint.h"

dlls/bot_const.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1115,17 +1115,17 @@ typedef enum
11151115
#ifdef RCBOT_META_BUILD
11161116

11171117
#ifdef _DEBUG
1118-
#define BOT_VER "1.442_mm_debug"
1118+
#define BOT_VER "1.443_mm_debug"
11191119
#else
1120-
#define BOT_VER "1.442_mm"
1120+
#define BOT_VER "1.443_mm"
11211121
#endif
11221122

11231123
#else
11241124

11251125
#ifdef _DEBUG
1126-
#define BOT_VER "1.442_debug"
1126+
#define BOT_VER "1.443_debug"
11271127
#else
1128-
#define BOT_VER "1.442"
1128+
#define BOT_VER "1.443"
11291129
#endif
11301130

11311131
#endif

dlls/bot_ga.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "meta_api.h"
3939
#endif
4040
#include "cbase.h" // Need CBASE for classify()
41-
#include "player.h"
41+
//#include "player.h"
4242
#include "bot_const.h"
4343
#include "bot.h"
4444
#include "bot_ga.h"

dlls/makefile_linux_sa

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ BASEFLAGS = -Dstricmp=strcasecmp -Dstrcmpi=strcasecmp -D__linux__ -std=gnu++11#
1414
#CPPFLAGS = ${BASEFLAGS} -g -ggdb -I. -I../engine -I../common -I../pm_shared
1515

1616
CPPFLAGS = ${BASEFLAGS} -mtune=generic -march=i686 -msse -msse2 -mfpmath=sse -s -pipe -O2 \
17-
-Wno-write-strings -Wno-unused-local-typedefs -I. -I../engine -I../common -I../pm_shared
17+
-Wno-write-strings -Wno-unused-local-typedefs \
18+
-funsafe-math-optimizations -I. -I../engine -I../common -I../pm_shared
1819

1920
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 \
2021
dll.o engine.o globals.o h_export.o linkfunc.o megahal.o netmessages.o rcbot_meta_api.o util.o waypoint.o

dlls/meta_api.h

+9-4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#ifndef META_API_H
3838
#define META_API_H
3939

40+
#include "comp_dep.h" // Metamod API now using 5:13 for RCBot [APG]RoboCop[CL]
4041
#include "dllapi.h" // GETENTITYAPI_FN, etc
4142
#include "engine_api.h" // GET_ENGINE_FUNCTIONS_FN, etc
4243
#include "plinfo.h" // plugin_info_t, etc
@@ -59,7 +60,10 @@
5960
// Version 5:8 added GetPluginPath [v1.11]
6061
// Version 5:9 added GetGameInfo [v1.14]
6162
// Version 5:10 added GINFO_REALDLL_FULLPATH for GetGameInfo [v1.17]
62-
#define META_INTERFACE_VERSION "5:10"
63+
// Version 5:11 added plugin loading and unloading API [v1.18]
64+
// Version 5:12 added IS_QUERYING_CLIENT_CVAR to mutils [v1.18]
65+
// Version 5:13 added MAKE_REQUESTID and GET_HOOK_TABLES to mutils [v1.19]
66+
#define META_INTERFACE_VERSION "5:13"
6367

6468
#ifdef UNFINISHED
6569
// Version 5:99 added event hook utility functions [v.???]
@@ -95,7 +99,7 @@ typedef struct meta_globals_s {
9599
void *override_ret; // readable; return value from overriding/superceding plugin
96100
} meta_globals_t;
97101

98-
extern meta_globals_t *gpMetaGlobals;
102+
extern meta_globals_t *gpMetaGlobals DLLHIDDEN;
99103
#define SET_META_RESULT(result) gpMetaGlobals->mres=result
100104
#define RETURN_META(result) \
101105
do { gpMetaGlobals->mres=result; return; } while(0)
@@ -125,8 +129,8 @@ typedef struct {
125129
} gamedll_funcs_t;
126130

127131
// Declared in plugin; referenced in macros.
128-
extern gamedll_funcs_t *gpGamedllFuncs;
129-
extern mutil_funcs_t *gpMetaUtilFuncs;
132+
extern gamedll_funcs_t *gpGamedllFuncs DLLHIDDEN;
133+
extern mutil_funcs_t *gpMetaUtilFuncs DLLHIDDEN;
130134

131135
// Tell the dll that we'll be loading it as a metamod plugin, in case it
132136
// needs to do something special prior to the standard query/attach
@@ -238,5 +242,6 @@ C_DLLEXPORT int GetEngineFunctions_Post(enginefuncs_t *pengfuncsFromEngine,
238242
#define MNEW_OnFreeEntPrivateData MNEW_FUNC->pfnOnFreeEntPrivateData
239243
#define MNEW_GameShutdown MNEW_FUNC->pfnGameShutdown
240244
#define MNEW_ShouldCollide MNEW_FUNC->pfnShouldCollide
245+
#define MNEW_CvarValue MNEW_FUNC->pfnCvarValue
241246

242247
#endif /* META_API_H */

metamod/engine_t.h

+81-81
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,81 @@
1-
// vi: set ts=4 sw=4 :
2-
// vim: set tw=75 :
3-
4-
// engine_t.h - The engine_t type
5-
6-
/*
7-
* Copyright (c) 2001-2006 Will Day <[email protected]>
8-
*
9-
* This file is part of Metamod.
10-
*
11-
* Metamod is free software; you can redistribute it and/or modify it
12-
* under the terms of the GNU General Public License as published by the
13-
* Free Software Foundation; either version 2 of the License, or (at
14-
* your option) any later version.
15-
*
16-
* Metamod is distributed in the hope that it will be useful, but
17-
* WITHOUT ANY WARRANTY; without even the implied warranty of
18-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
19-
* General Public License for more details.
20-
*
21-
* You should have received a copy of the GNU General Public License
22-
* along with Metamod; if not, write to the Free Software Foundation,
23-
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24-
*
25-
* In addition, as a special exception, the author gives permission to
26-
* link the code of this program with the Half-Life Game Engine ("HL
27-
* Engine") and Modified Game Libraries ("MODs") developed by Valve,
28-
* L.L.C ("Valve"). You must obey the GNU General Public License in all
29-
* respects for all of the code used other than the HL Engine and MODs
30-
* from Valve. If you modify this file, you may extend this exception
31-
* to your version of the file, but you are not obligated to do so. If
32-
* you do not wish to do so, delete this exception statement from your
33-
* version.
34-
*
35-
*/
36-
37-
#ifndef MM_ENGINE_T_H
38-
#define MM_ENGINE_T_H
39-
40-
#include "eiface.h" // engfuncs_t, globalvars_t
41-
#include "engineinfo.h" // EngineInfo
42-
43-
44-
// Our structure for storing engine references.
45-
struct engine_t {
46-
engine_t();
47-
engine_t(const engine_t&);
48-
engine_t& operator=(const engine_t&);
49-
50-
enginefuncs_t *funcs; // engine funcs
51-
globalvars_t *globals; // engine globals
52-
enginefuncs_t *pl_funcs; // "modified" eng funcs we give to plugins
53-
EngineInfo info; // some special info elements
54-
};
55-
56-
inline engine_t::engine_t()
57-
: funcs(NULL), globals(NULL), pl_funcs(NULL), info()
58-
{
59-
}
60-
61-
62-
inline engine_t::engine_t(const engine_t& _rhs)
63-
: funcs(_rhs.funcs), globals(_rhs.globals), pl_funcs(_rhs.pl_funcs), info(_rhs.info)
64-
{
65-
}
66-
67-
68-
inline engine_t& engine_t::operator=(const engine_t& _rhs)
69-
{
70-
funcs = _rhs.funcs;
71-
globals = _rhs.globals;
72-
pl_funcs = _rhs.pl_funcs;
73-
info = _rhs.info;
74-
return *this;
75-
}
76-
77-
78-
extern engine_t Engine;
79-
80-
#endif /* MM_ENGINE_T_H */
81-
1+
// vi: set ts=4 sw=4 :
2+
// vim: set tw=75 :
3+
4+
// engine_t.h - The engine_t type
5+
6+
/*
7+
* Copyright (c) 2001-2006 Will Day <[email protected]>
8+
*
9+
* This file is part of Metamod.
10+
*
11+
* Metamod is free software; you can redistribute it and/or modify it
12+
* under the terms of the GNU General Public License as published by the
13+
* Free Software Foundation; either version 2 of the License, or (at
14+
* your option) any later version.
15+
*
16+
* Metamod is distributed in the hope that it will be useful, but
17+
* WITHOUT ANY WARRANTY; without even the implied warranty of
18+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
19+
* General Public License for more details.
20+
*
21+
* You should have received a copy of the GNU General Public License
22+
* along with Metamod; if not, write to the Free Software Foundation,
23+
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24+
*
25+
* In addition, as a special exception, the author gives permission to
26+
* link the code of this program with the Half-Life Game Engine ("HL
27+
* Engine") and Modified Game Libraries ("MODs") developed by Valve,
28+
* L.L.C ("Valve"). You must obey the GNU General Public License in all
29+
* respects for all of the code used other than the HL Engine and MODs
30+
* from Valve. If you modify this file, you may extend this exception
31+
* to your version of the file, but you are not obligated to do so. If
32+
* you do not wish to do so, delete this exception statement from your
33+
* version.
34+
*
35+
*/
36+
37+
#ifndef MM_ENGINE_T_H
38+
#define MM_ENGINE_T_H
39+
40+
#include "eiface.h" // engfuncs_t, globalvars_t
41+
#include "engineinfo.h" // EngineInfo
42+
43+
44+
// Our structure for storing engine references.
45+
struct engine_t {
46+
engine_t();
47+
engine_t(const engine_t&);
48+
engine_t& operator=(const engine_t&);
49+
50+
enginefuncs_t *funcs; // engine funcs
51+
globalvars_t *globals; // engine globals
52+
enginefuncs_t *pl_funcs; // "modified" eng funcs we give to plugins
53+
EngineInfo info; // some special info elements
54+
};
55+
56+
inline engine_t::engine_t()
57+
: funcs(NULL), globals(NULL), pl_funcs(NULL), info()
58+
{
59+
}
60+
61+
62+
inline engine_t::engine_t(const engine_t& _rhs)
63+
: funcs(_rhs.funcs), globals(_rhs.globals), pl_funcs(_rhs.pl_funcs), info(_rhs.info)
64+
{
65+
}
66+
67+
68+
inline engine_t& engine_t::operator=(const engine_t& _rhs)
69+
{
70+
funcs = _rhs.funcs;
71+
globals = _rhs.globals;
72+
pl_funcs = _rhs.pl_funcs;
73+
info = _rhs.info;
74+
return *this;
75+
}
76+
77+
78+
extern engine_t Engine;
79+
80+
#endif /* MM_ENGINE_T_H */
81+

0 commit comments

Comments
 (0)