markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleaned up posix makefile

Browse source
This commit is contained in:
jeefo 2016-09-13 22:40:06 +03:00
commit 8155d08769
7 changed files with 142 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

25
include/corelib.h
View file

@ -41,6 +41,31 @@ typedef unsigned long uint32;
template <typename T> inline T A_min (T a, T b) { return a < b ? a : b; } template <typename T> inline T A_min (T a, T b) { return a < b ? a : b; }
template <typename T> inline T A_max (T a, T b) { return a > b ? a : b; } template <typename T> inline T A_max (T a, T b) { return a > b ? a : b; }
// Fast stricmp got somewhere from chromium
static inline int A_stricmp (const char *str1, const char *str2, int length = -1)
{
int iter = 0;
if (length == -1)
length = strlen (str2);
for (; iter < length; iter++)
{
if ((str1[iter] | 32) != (str2[iter] | 32))
break;
}
if (iter != length)
return 1;
return 0;
}
// Cross platform strdup
static inline char *A_strdup (const char *str)
{
return strcpy (new char[strlen (str) + 1], str);
}
// //
// Title: Utility Classes Header // Title: Utility Classes Header
// //

11
include/engine/util.h
View file

@ -225,17 +225,6 @@ static inline void STOP_SOUND (edict_t *entity, int channel, const char *sample)
EMIT_SOUND_DYN (entity, channel, sample, 0, 0, SND_STOP, PITCH_NORM); EMIT_SOUND_DYN (entity, channel, sample, 0, 0, SND_STOP, PITCH_NORM);
} }
/// ///
// Bot Additions //
/// ///
// removes linker warning when using msvcrt library
#if defined ( _MSC_VER )
#define stricmp _stricmp
#define unlink _unlink
#define mkdir _mkdir
#endif
// macro to handle memory allocation fails // macro to handle memory allocation fails
#define TerminateOnMalloc() \ #define TerminateOnMalloc() \
AddLogEntry (true, LL_FATAL, "Memory Allocation Fail!\nFile: %s (Line: %d)", __FILE__, __LINE__) \ AddLogEntry (true, LL_FATAL, "Memory Allocation Fail!\nFile: %s (Line: %d)", __FILE__, __LINE__) \

22
include/platform.h
View file

@ -56,11 +56,11 @@
#pragma comment (linker, "/SECTION:.data,RW") #pragma comment (linker, "/SECTION:.data,RW")
#endif #endif
typedef int (FAR *EntityAPI_t) (gamefuncs_t *, int); typedef int (*GetEntityApi2_FN) (gamefuncs_t *, int);
typedef int (FAR *NewEntityAPI_t) (newgamefuncs_t *, int *); typedef int (*GetNewEntityApi_FN) (newgamefuncs_t *, int *);
typedef int (FAR *BlendAPI_t) (int, void **, void *, float (*)[3][4], float (*)[128][3][4]); typedef int (*GetBlendingInterface_FN) (int, void **, void *, float (*)[3][4], float (*)[128][3][4]);
typedef void (__stdcall *FuncPointers_t) (enginefuncs_t *, globalvars_t *); typedef void (*Entity_FN) (entvars_t *);
typedef void (FAR *EntityPtr_t) (entvars_t *); typedef void (__stdcall *GiveFnptrsToDll_FN) (enginefuncs_t *, globalvars_t *);
#elif defined (PLATFORM_LINUX) || defined (PLATFORM_OSX) #elif defined (PLATFORM_LINUX) || defined (PLATFORM_OSX)
@ -85,12 +85,14 @@
#define PLATFORM_ANDROID 1 #define PLATFORM_ANDROID 1
#endif #endif
typedef int (*EntityAPI_t) (gamefuncs_t *, int); typedef int (*GetEntityApi2_FN) (gamefuncs_t *, int);
typedef int (*NewEntityAPI_t) (newgamefuncs_t *, int *); typedef int (*GetNewEntityApi_FN) (newgamefuncs_t *, int *);
typedef int (*BlendAPI_t) (int, void **, void *, float (*)[3][4], float (*)[128][3][4]); typedef int (*GetBlendingInterface_FN) (int, void **, void *, float (*)[3][4], float (*)[128][3][4]);
typedef void (*FuncPointers_t) (enginefuncs_t *, globalvars_t *); typedef void (*Entity_FN) (entvars_t *);
typedef void (*EntityPtr_t) (entvars_t *); typedef void (*GiveFnptrsToDll_FN) (enginefuncs_t *, globalvars_t *);
// posix compatibility
#define _unlink unlink
#else #else
#error "Platform unrecognized." #error "Platform unrecognized."
#endif #endif

52
project/makefile
View file

@ -4,7 +4,7 @@
# #
# This software is licensed under the BSD-style license. # This software is licensed under the BSD-style license.
# Additional exceptions apply. For full license details, see LICENSE.txt or visit: # Additional exceptions apply. For full license details, see LICENSE.txt or visit:
# http://yapb.jeefo.net/license # https://yapb.jeefo.net/license
# #
# Based on Makefile written by David "BAILOPAN" Anderson. # Based on Makefile written by David "BAILOPAN" Anderson.
# #
@ -22,28 +22,30 @@ OBJECTS = $(SRC_DIR)/basecode.cpp \
$(SRC_DIR)/support.cpp \ $(SRC_DIR)/support.cpp \
$(SRC_DIR)/waypoint.cpp \ $(SRC_DIR)/waypoint.cpp \
C_OPT_FLAGS = -O2 -DNDEBUG=1 -fno-exceptions -fno-rtti -funroll-loops -fomit-frame-pointer -pipe -mtune=native C_OPT_FLAGS = -O2 -DNDEBUG -pipe -fno-strict-aliasing
C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3 C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
C_GCC4_FLAGS = -fvisibility=hidden
CPP_GCC4_FLAGS = -fvisibility-inlines-hidden C_GCC_FLAGS = -fvisibility=hidden
CPP_GCC_FLAGS = -fvisibility-inlines-hidden
CPP = clang-3.7 CPP = clang-3.7
CPP_OSX = clang CPP_MAC = o32-clang
LINK = LINK =
INCLUDE = -I../include -I../include/engine INCLUDE = -I../include -I../include/engine
ifeq "$(OSX)" "true" ifeq "$(MAC)" "true"
OS = Darwin OS = Darwin
CPP_OSX = o32-clang CPP_MAC = o32-clang
else else
OS := $(shell uname -s) OS := $(shell uname -s)
endif endif
ifeq "$(OS)" "Darwin" ifeq "$(OS)" "Darwin"
CPP = $(CPP_OSX) CPP = $(CPP_MAC)
LIB_EXT = dylib LIB_EXT = dylib
CFLAGS += -DOSX -D_OSX -DPOSIX CFLAGS += -DOSX -D_OSX -DPOSIX
LINK += -dynamiclib -lstdc++ -mmacosx-version-min=10.5 LINK += -dynamiclib -lstdc++ -mmacosx-version-min=10.5 -arch i386
else else
LIB_EXT = so LIB_EXT = so
CFLAGS += -DLINUX -D_LINUX -DPOSIX CFLAGS += -DLINUX -D_LINUX -DPOSIX
@ -52,7 +54,7 @@ endif
LINK += -m32 -lm -ldl LINK += -m32 -lm -ldl
CFLAGS += -msse2 -std=c++11 -DHAVE_STDINT_H -D__extern_always_inline=inline -D_strdup=strdup -Dstricmp=strcasecmp -Dstrcmpi=strcasecmp -fno-strict-aliasing -m32 -Wall -Werror -Wextra CFLAGS += -msse2 -std=c++11 -m32 -Wall -Werror -Wextra
CPPFLAGS += -fno-exceptions -fno-rtti -fno-builtin CPPFLAGS += -fno-exceptions -fno-rtti -fno-builtin
BINARY = $(PROJECT).$(LIB_EXT) BINARY = $(PROJECT).$(LIB_EXT)
@ -72,8 +74,8 @@ endif
IS_CLANG := $(shell $(CPP) --version | head -1 | grep clang > /dev/null && echo "1" || echo "0") IS_CLANG := $(shell $(CPP) --version | head -1 | grep clang > /dev/null && echo "1" || echo "0")
ifeq "$(IS_CLANG)" "1" ifeq "$(IS_CLANG)" "1"
CFLAGS += $(C_GCC4_FLAGS) CFLAGS += $(C_GCC_FLAGS)
CPPFLAGS += $(CPP_GCC4_FLAGS) CPPFLAGS += $(CPP_GCC_FLAGS)
endif endif
# OS is Linux and not using clang # OS is Linux and not using clang
@ -92,6 +94,8 @@ $(BIN_DIR)/%.o: %.cpp
$(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $(subst $(SRC_DIR)/,,$@) -c $< $(CPP) $(INCLUDE) $(CFLAGS) $(CPPFLAGS) -o $(subst $(SRC_DIR)/,,$@) -c $<
main: main:
mkdir -p release
mkdir -p debug
$(MAKE) $(PROJECT) $(MAKE) $(PROJECT)
$(PROJECT): $(OBJ_BIN) $(PROJECT): $(OBJ_BIN)
@ -105,19 +109,23 @@ release:
mkdir -p release mkdir -p release
$(MAKE) main DEBUG=false $(MAKE) main DEBUG=false
release_osx: release_mac:
mkdir -p release $(MAKE) main MAC=true DEBUG=false
$(MAKE) main OSX=true DEBUG=false
debug_osx: debug_mac:
mkdir -p debug $(MAKE) main MAC=true DEBUG=true
$(MAKE) main OSX=true DEBUG=true
all_linux: release debug all_linux:
all_osx: release_osx debug_osx release debug
all: all_linux all_osx
default: all all_mac:
release_mac debug_mac
all:
all_linux all_mac
default:
all_linux
clean: clean:
rm -rf release rm -rf release

132
source/interface.cpp
View file

@ -21,59 +21,59 @@ ConVar mp_startmoney ("mp_startmoney", nullptr, VT_NOREGISTER);
int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const char *arg2, const char *arg3, const char *arg4, const char *arg5, const char *self) int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const char *arg2, const char *arg3, const char *arg4, const char *arg5, const char *self)
{ {
// adding one bot with random parameters to random team // adding one bot with random parameters to random team
if (stricmp (arg0, "addbot") == 0 || stricmp (arg0, "add") == 0) if (A_stricmp (arg0, "addbot") == 0 || A_stricmp (arg0, "add") == 0)
bots.AddBot (arg4, arg1, arg2, arg3, arg5); bots.AddBot (arg4, arg1, arg2, arg3, arg5);
// adding one bot with high difficulty parameters to random team // adding one bot with high difficulty parameters to random team
else if (stricmp (arg0, "addbot_hs") == 0 || stricmp (arg0, "addhs") == 0) else if (A_stricmp (arg0, "addbot_hs") == 0 || A_stricmp (arg0, "addhs") == 0)
bots.AddBot (arg4, "4", "1", arg3, arg5); bots.AddBot (arg4, "4", "1", arg3, arg5);
// adding one bot with random parameters to terrorist team // adding one bot with random parameters to terrorist team
else if (stricmp (arg0, "addbot_t") == 0 || stricmp (arg0, "add_t") == 0) else if (A_stricmp (arg0, "addbot_t") == 0 || A_stricmp (arg0, "add_t") == 0)
bots.AddBot (arg4, arg1, arg2, "1", arg5); bots.AddBot (arg4, arg1, arg2, "1", arg5);
// adding one bot with random parameters to counter-terrorist team // adding one bot with random parameters to counter-terrorist team
else if (stricmp (arg0, "addbot_ct") == 0 || stricmp (arg0, "add_ct") == 0) else if (A_stricmp (arg0, "addbot_ct") == 0 || A_stricmp (arg0, "add_ct") == 0)
bots.AddBot (arg4, arg1, arg2, "2", arg5); bots.AddBot (arg4, arg1, arg2, "2", arg5);
// kicking off one bot from the terrorist team // kicking off one bot from the terrorist team
else if (stricmp (arg0, "kickbot_t") == 0 || stricmp (arg0, "kick_t") == 0) else if (A_stricmp (arg0, "kickbot_t") == 0 || A_stricmp (arg0, "kick_t") == 0)
bots.RemoveFromTeam (TERRORIST); bots.RemoveFromTeam (TERRORIST);
// kicking off one bot from the counter-terrorist team // kicking off one bot from the counter-terrorist team
else if (stricmp (arg0, "kickbot_ct") == 0 || stricmp (arg0, "kick_ct") == 0) else if (A_stricmp (arg0, "kickbot_ct") == 0 || A_stricmp (arg0, "kick_ct") == 0)
bots.RemoveFromTeam (CT); bots.RemoveFromTeam (CT);
// kills all bots on the terrorist team // kills all bots on the terrorist team
else if (stricmp (arg0, "killbots_t") == 0 || stricmp (arg0, "kill_t") == 0) else if (A_stricmp (arg0, "killbots_t") == 0 || A_stricmp (arg0, "kill_t") == 0)
bots.KillAll (TERRORIST); bots.KillAll (TERRORIST);
// kills all bots on the counter-terrorist team // kills all bots on the counter-terrorist team
else if (stricmp (arg0, "killbots_ct") == 0 || stricmp (arg0, "kill_ct") == 0) else if (A_stricmp (arg0, "killbots_ct") == 0 || A_stricmp (arg0, "kill_ct") == 0)
bots.KillAll (CT); bots.KillAll (CT);
// list all bots playeing on the server // list all bots playeing on the server
else if (stricmp (arg0, "listbots") == 0 || stricmp (arg0, "list") == 0) else if (A_stricmp (arg0, "listbots") == 0 || A_stricmp (arg0, "list") == 0)
bots.ListBots (); bots.ListBots ();
// kick off all bots from the played server // kick off all bots from the played server
else if (stricmp (arg0, "kickbots") == 0 || stricmp (arg0, "kickall") == 0) else if (A_stricmp (arg0, "kickbots") == 0 || A_stricmp (arg0, "kickall") == 0)
bots.RemoveAll (); bots.RemoveAll ();
// kill all bots on the played server // kill all bots on the played server
else if (stricmp (arg0, "killbots") == 0 || stricmp (arg0, "killall") == 0) else if (A_stricmp (arg0, "killbots") == 0 || A_stricmp (arg0, "killall") == 0)
bots.KillAll (); bots.KillAll ();
// kick off one random bot from the played server // kick off one random bot from the played server
else if (stricmp (arg0, "kickone") == 0 || stricmp (arg0, "kick") == 0) else if (A_stricmp (arg0, "kickone") == 0 || A_stricmp (arg0, "kick") == 0)
bots.RemoveRandom (); bots.RemoveRandom ();
// fill played server with bots // fill played server with bots
else if (stricmp (arg0, "fillserver") == 0 || stricmp (arg0, "fill") == 0) else if (A_stricmp (arg0, "fillserver") == 0 || A_stricmp (arg0, "fill") == 0)
bots.FillServer (atoi (arg1), IsNullString (arg2) ? -1 : atoi (arg2), IsNullString (arg3) ? -1 : atoi (arg3), IsNullString (arg4) ? -1 : atoi (arg4)); bots.FillServer (atoi (arg1), IsNullString (arg2) ? -1 : atoi (arg2), IsNullString (arg3) ? -1 : atoi (arg3), IsNullString (arg4) ? -1 : atoi (arg4));
// select the weapon mode for bots // select the weapon mode for bots
else if (stricmp (arg0, "weaponmode") == 0 || stricmp (arg0, "wmode") == 0) else if (A_stricmp (arg0, "weaponmode") == 0 || A_stricmp (arg0, "wmode") == 0)
{ {
int selection = atoi (arg1); int selection = atoi (arg1);
@ -85,7 +85,7 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
} }
// force all bots to vote to specified map // force all bots to vote to specified map
else if (stricmp (arg0, "votemap") == 0) else if (A_stricmp (arg0, "votemap") == 0)
{ {
if (!IsNullString (arg1)) if (!IsNullString (arg1))
{ {
@ -104,7 +104,7 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
} }
// displays version information // displays version information
else if (stricmp (arg0, "version") == 0 || stricmp (arg0, "ver") == 0) else if (A_stricmp (arg0, "version") == 0 || A_stricmp (arg0, "ver") == 0)
{ {
char versionData[] = char versionData[] =
"------------------------------------------------\n" "------------------------------------------------\n"
@ -119,7 +119,7 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
} }
// display some sort of help information // display some sort of help information
else if (stricmp (arg0, "?") == 0 || stricmp (arg0, "help") == 0) else if (A_stricmp (arg0, "?") == 0 || A_stricmp (arg0, "help") == 0)
{ {
engine.ClientPrintf (ent, "Bot Commands:"); engine.ClientPrintf (ent, "Bot Commands:");
engine.ClientPrintf (ent, "%s version\t - display version information.", self); engine.ClientPrintf (ent, "%s version\t - display version information.", self);
@ -132,7 +132,7 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
engine.ClientPrintf (ent, "%s votemap\t - allows dead bots to vote for specific map.", self); engine.ClientPrintf (ent, "%s votemap\t - allows dead bots to vote for specific map.", self);
engine.ClientPrintf (ent, "%s cmenu\t - displaying bots command menu.", self); engine.ClientPrintf (ent, "%s cmenu\t - displaying bots command menu.", self);
if (stricmp (arg1, "full") == 0 || stricmp (arg1, "f") == 0 || stricmp (arg1, "?") == 0) if (A_stricmp (arg1, "full") == 0 || A_stricmp (arg1, "f") == 0 || A_stricmp (arg1, "?") == 0)
{ {
engine.ClientPrintf (ent, "%s add_t\t - creates one random bot to terrorist team.", self); engine.ClientPrintf (ent, "%s add_t\t - creates one random bot to terrorist team.", self);
engine.ClientPrintf (ent, "%s add_ct\t - creates one random bot to ct team.", self); engine.ClientPrintf (ent, "%s add_ct\t - creates one random bot to ct team.", self);
@ -171,7 +171,7 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
} }
} }
} }
else if (stricmp (arg0, "bot_takedamage") == 0 && !IsNullString (arg1)) else if (A_stricmp (arg0, "bot_takedamage") == 0 && !IsNullString (arg1))
{ {
bool isOn = !!(atoi (arg1) == 1); bool isOn = !!(atoi (arg1) == 1);
@ -187,11 +187,11 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
} }
// displays main bot menu // displays main bot menu
else if (stricmp (arg0, "botmenu") == 0 || stricmp (arg0, "menu") == 0) else if (A_stricmp (arg0, "botmenu") == 0 || A_stricmp (arg0, "menu") == 0)
DisplayMenuToClient (ent, BOT_MENU_MAIN); DisplayMenuToClient (ent, BOT_MENU_MAIN);
// display command menu // display command menu
else if (stricmp (arg0, "cmdmenu") == 0 || stricmp (arg0, "cmenu") == 0) else if (A_stricmp (arg0, "cmdmenu") == 0 || A_stricmp (arg0, "cmenu") == 0)
{ {
if (IsAlive (ent)) if (IsAlive (ent))
DisplayMenuToClient (ent, BOT_MENU_COMMANDS); DisplayMenuToClient (ent, BOT_MENU_COMMANDS);
@ -203,19 +203,19 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
} }
// waypoint manimupulation (really obsolete, can be edited through menu) (supported only on listen server) // waypoint manimupulation (really obsolete, can be edited through menu) (supported only on listen server)
else if (stricmp (arg0, "waypoint") == 0 || stricmp (arg0, "wp") == 0 || stricmp (arg0, "wpt") == 0) else if (A_stricmp (arg0, "waypoint") == 0 || A_stricmp (arg0, "wp") == 0 || A_stricmp (arg0, "wpt") == 0)
{ {
if (engine.IsDedicatedServer () || engine.IsNullEntity (g_hostEntity)) if (engine.IsDedicatedServer () || engine.IsNullEntity (g_hostEntity))
return 2; return 2;
// enables or disable waypoint displaying // enables or disable waypoint displaying
if (stricmp (arg1, "on") == 0) if (A_stricmp (arg1, "on") == 0)
{ {
g_waypointOn = true; g_waypointOn = true;
engine.Printf ("Waypoint Editing Enabled"); engine.Printf ("Waypoint Editing Enabled");
// enables noclip cheat // enables noclip cheat
if (stricmp (arg2, "noclip") == 0) if (A_stricmp (arg2, "noclip") == 0)
{ {
if (g_editNoclip) if (g_editNoclip)
{ {
@ -233,7 +233,7 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
} }
// switching waypoint editing off // switching waypoint editing off
else if (stricmp (arg1, "off") == 0) else if (A_stricmp (arg1, "off") == 0)
{ {
g_waypointOn = false; g_waypointOn = false;
g_editNoclip = false; g_editNoclip = false;
@ -244,11 +244,11 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
} }
// toggles displaying player models on spawn spots // toggles displaying player models on spawn spots
else if (stricmp (arg1, "mdl") == 0 || stricmp (arg1, "models") == 0) else if (A_stricmp (arg1, "mdl") == 0 || A_stricmp (arg1, "models") == 0)
{ {
edict_t *spawnEntity = nullptr; edict_t *spawnEntity = nullptr;
if (stricmp (arg2, "on") == 0) if (A_stricmp (arg2, "on") == 0)
{ {
while (!engine.IsNullEntity (spawnEntity = FIND_ENTITY_BY_CLASSNAME (spawnEntity, "info_player_start"))) while (!engine.IsNullEntity (spawnEntity = FIND_ENTITY_BY_CLASSNAME (spawnEntity, "info_player_start")))
spawnEntity->v.effects &= ~EF_NODRAW; spawnEntity->v.effects &= ~EF_NODRAW;
@ -261,7 +261,7 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
engine.IssueCmd ("mp_timelimit 0"); // disable the time limit engine.IssueCmd ("mp_timelimit 0"); // disable the time limit
engine.IssueCmd ("mp_freezetime 0"); // disable freezetime engine.IssueCmd ("mp_freezetime 0"); // disable freezetime
} }
else if (stricmp (arg2, "off") == 0) else if (A_stricmp (arg2, "off") == 0)
{ {
while (!engine.IsNullEntity (spawnEntity = FIND_ENTITY_BY_CLASSNAME (spawnEntity, "info_player_start"))) while (!engine.IsNullEntity (spawnEntity = FIND_ENTITY_BY_CLASSNAME (spawnEntity, "info_player_start")))
spawnEntity->v.effects |= EF_NODRAW; spawnEntity->v.effects |= EF_NODRAW;
@ -273,32 +273,32 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
} }
// show direction to specified waypoint // show direction to specified waypoint
else if (stricmp (arg1, "find") == 0) else if (A_stricmp (arg1, "find") == 0)
waypoints.SetFindIndex (atoi (arg2)); waypoints.SetFindIndex (atoi (arg2));
// opens adding waypoint menu // opens adding waypoint menu
else if (stricmp (arg1, "add") == 0) else if (A_stricmp (arg1, "add") == 0)
{ {
g_waypointOn = true; // turn waypoints on g_waypointOn = true; // turn waypoints on
DisplayMenuToClient (g_hostEntity, BOT_MENU_WAYPOINT_TYPE); DisplayMenuToClient (g_hostEntity, BOT_MENU_WAYPOINT_TYPE);
} }
// creates basic waypoints on the map (ladder/spawn points/goals) // creates basic waypoints on the map (ladder/spawn points/goals)
else if (stricmp (arg1, "addbasic") == 0) else if (A_stricmp (arg1, "addbasic") == 0)
{ {
waypoints.CreateBasic (); waypoints.CreateBasic ();
engine.CenterPrintf ("Basic waypoints was Created"); engine.CenterPrintf ("Basic waypoints was Created");
} }
// delete nearest to host edict waypoint // delete nearest to host edict waypoint
else if (stricmp (arg1, "delete") == 0) else if (A_stricmp (arg1, "delete") == 0)
{ {
g_waypointOn = true; // turn waypoints on g_waypointOn = true; // turn waypoints on
waypoints.Delete (); waypoints.Delete ();
} }
// save waypoint data into file on hard disk // save waypoint data into file on hard disk
else if (stricmp (arg1, "save") == 0) else if (A_stricmp (arg1, "save") == 0)
{ {
char *waypointSaveMessage = engine.TraslateMessage ("Waypoints Saved"); char *waypointSaveMessage = engine.TraslateMessage ("Waypoints Saved");
@ -315,37 +315,37 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
} }
// remove waypoint and all corresponding files from hard disk // remove waypoint and all corresponding files from hard disk
else if (stricmp (arg1, "erase") == 0) else if (A_stricmp (arg1, "erase") == 0)
waypoints.EraseFromHardDisk (); waypoints.EraseFromHardDisk ();
// load all waypoints again (overrides all changes, that wasn't saved) // load all waypoints again (overrides all changes, that wasn't saved)
else if (stricmp (arg1, "load") == 0) else if (A_stricmp (arg1, "load") == 0)
{ {
if (waypoints.Load ()) if (waypoints.Load ())
engine.Printf ("Waypoints loaded"); engine.Printf ("Waypoints loaded");
} }
// check all nodes for validation // check all nodes for validation
else if (stricmp (arg1, "check") == 0) else if (A_stricmp (arg1, "check") == 0)
{ {
if (waypoints.NodesValid ()) if (waypoints.NodesValid ())
engine.CenterPrintf ("Nodes work Fine"); engine.CenterPrintf ("Nodes work Fine");
} }
// opens menu for setting (removing) waypoint flags // opens menu for setting (removing) waypoint flags
else if (stricmp (arg1, "flags") == 0) else if (A_stricmp (arg1, "flags") == 0)
DisplayMenuToClient (g_hostEntity, BOT_MENU_WAYPOINT_FLAG); DisplayMenuToClient (g_hostEntity, BOT_MENU_WAYPOINT_FLAG);
// setting waypoint radius // setting waypoint radius
else if (stricmp (arg1, "setradius") == 0) else if (A_stricmp (arg1, "setradius") == 0)
waypoints.SetRadius (atoi (arg2)); waypoints.SetRadius (atoi (arg2));
// remembers nearest waypoint // remembers nearest waypoint
else if (stricmp (arg1, "cache") == 0) else if (A_stricmp (arg1, "cache") == 0)
waypoints.CacheWaypoint (); waypoints.CacheWaypoint ();
// teleport player to specified waypoint // teleport player to specified waypoint
else if (stricmp (arg1, "teleport") == 0) else if (A_stricmp (arg1, "teleport") == 0)
{ {
int teleportPoint = atoi (arg2); int teleportPoint = atoi (arg2);
@ -362,7 +362,7 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
} }
// displays waypoint menu // displays waypoint menu
else if (stricmp (arg1, "menu") == 0) else if (A_stricmp (arg1, "menu") == 0)
DisplayMenuToClient (g_hostEntity, BOT_MENU_WAYPOINT_MAIN_PAGE1); DisplayMenuToClient (g_hostEntity, BOT_MENU_WAYPOINT_MAIN_PAGE1);
// otherwise display waypoint current status // otherwise display waypoint current status
@ -371,51 +371,51 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
} }
// path waypoint editing system (supported only on listen server) // path waypoint editing system (supported only on listen server)
else if (stricmp (arg0, "pathwaypoint") == 0 || stricmp (arg0, "path") == 0 || stricmp (arg0, "pwp") == 0) else if (A_stricmp (arg0, "pathwaypoint") == 0 || A_stricmp (arg0, "path") == 0 || A_stricmp (arg0, "pwp") == 0)
{ {
if (engine.IsDedicatedServer () || engine.IsNullEntity (g_hostEntity)) if (engine.IsDedicatedServer () || engine.IsNullEntity (g_hostEntity))
return 2; return 2;
// opens path creation menu // opens path creation menu
if (stricmp (arg1, "create") == 0) if (A_stricmp (arg1, "create") == 0)
DisplayMenuToClient (g_hostEntity, BOT_MENU_WAYPOINT_PATH); DisplayMenuToClient (g_hostEntity, BOT_MENU_WAYPOINT_PATH);
// creates incoming path from the cached waypoint // creates incoming path from the cached waypoint
else if (stricmp (arg1, "create_in") == 0) else if (A_stricmp (arg1, "create_in") == 0)
waypoints.CreatePath (CONNECTION_INCOMING); waypoints.CreatePath (CONNECTION_INCOMING);
// creates outgoing path from current waypoint // creates outgoing path from current waypoint
else if (stricmp (arg1, "create_out") == 0) else if (A_stricmp (arg1, "create_out") == 0)
waypoints.CreatePath (CONNECTION_OUTGOING); waypoints.CreatePath (CONNECTION_OUTGOING);
// creates bidirectional path from cahed to current waypoint // creates bidirectional path from cahed to current waypoint
else if (stricmp (arg1, "create_both") == 0) else if (A_stricmp (arg1, "create_both") == 0)
waypoints.CreatePath (CONNECTION_BOTHWAYS); waypoints.CreatePath (CONNECTION_BOTHWAYS);
// delete special path // delete special path
else if (stricmp (arg1, "delete") == 0) else if (A_stricmp (arg1, "delete") == 0)
waypoints.DeletePath (); waypoints.DeletePath ();
// sets auto path maximum distance // sets auto path maximum distance
else if (stricmp (arg1, "autodistance") == 0) else if (A_stricmp (arg1, "autodistance") == 0)
DisplayMenuToClient (g_hostEntity, BOT_MENU_WAYPOINT_AUTOPATH); DisplayMenuToClient (g_hostEntity, BOT_MENU_WAYPOINT_AUTOPATH);
} }
// automatic waypoint handling (supported only on listen server) // automatic waypoint handling (supported only on listen server)
else if (stricmp (arg0, "autowaypoint") == 0 || stricmp (arg0, "autowp") == 0) else if (A_stricmp (arg0, "autowaypoint") == 0 || A_stricmp (arg0, "autowp") == 0)
{ {
if (engine.IsDedicatedServer () || engine.IsNullEntity (g_hostEntity)) if (engine.IsDedicatedServer () || engine.IsNullEntity (g_hostEntity))
return 2; return 2;
// enable autowaypointing // enable autowaypointing
if (stricmp (arg1, "on") == 0) if (A_stricmp (arg1, "on") == 0)
{ {
g_autoWaypoint = true; g_autoWaypoint = true;
g_waypointOn = true; // turn this on just in case g_waypointOn = true; // turn this on just in case
} }
// disable autowaypointing // disable autowaypointing
else if (stricmp (arg1, "off") == 0) else if (A_stricmp (arg1, "off") == 0)
g_autoWaypoint = false; g_autoWaypoint = false;
// display status // display status
@ -423,13 +423,13 @@ int BotCommandHandler (edict_t *ent, const char *arg0, const char *arg1, const c
} }
// experience system handling (supported only on listen server) // experience system handling (supported only on listen server)
else if (stricmp (arg0, "experience") == 0 || stricmp (arg0, "exp") == 0) else if (A_stricmp (arg0, "experience") == 0 || A_stricmp (arg0, "exp") == 0)
{ {
if (engine.IsDedicatedServer () || engine.IsNullEntity (g_hostEntity)) if (engine.IsDedicatedServer () || engine.IsNullEntity (g_hostEntity))
return 2; return 2;
// write experience table (and visibility table) to hard disk // write experience table (and visibility table) to hard disk
if (stricmp (arg1, "save") == 0) if (A_stricmp (arg1, "save") == 0)
{ {
waypoints.SaveExperienceTab (); waypoints.SaveExperienceTab ();
waypoints.SaveVisibilityTab (); waypoints.SaveVisibilityTab ();
@ -861,7 +861,7 @@ void InitConfig (void)
if (!IsNullString (buffer)) if (!IsNullString (buffer))
{ {
String::TrimExternalBuffer (buffer); String::TrimExternalBuffer (buffer);
temp.translated = _strdup (buffer); temp.translated = A_strdup (buffer);
buffer[0] = 0x0; buffer[0] = 0x0;
} }
@ -871,7 +871,7 @@ void InitConfig (void)
else if (strncmp (line, "[TRANSLATED]", 12) == 0) else if (strncmp (line, "[TRANSLATED]", 12) == 0)
{ {
String::TrimExternalBuffer (buffer); String::TrimExternalBuffer (buffer);
temp.original = _strdup (buffer); temp.original = A_strdup (buffer);
buffer[0] = 0x0; buffer[0] = 0x0;
langState = Lang_Translate; langState = Lang_Translate;
@ -1205,7 +1205,7 @@ void ClientCommand (edict_t *ent)
if (!engine.IsBotCommand () && (ent == g_hostEntity || (g_clients[issuerPlayerIndex].flags & CF_ADMIN))) if (!engine.IsBotCommand () && (ent == g_hostEntity || (g_clients[issuerPlayerIndex].flags & CF_ADMIN)))
{ {
if (stricmp (command, "yapb") == 0 || stricmp (command, "yb") == 0) if (A_stricmp (command, "yapb") == 0 || A_stricmp (command, "yb") == 0)
{ {
int state = BotCommandHandler (ent, IsNullString (arg1) ? "help" : arg1, CMD_ARGV (2), CMD_ARGV (3), CMD_ARGV (4), CMD_ARGV (5), CMD_ARGV (6), CMD_ARGV (0)); int state = BotCommandHandler (ent, IsNullString (arg1) ? "help" : arg1, CMD_ARGV (2), CMD_ARGV (3), CMD_ARGV (4), CMD_ARGV (5), CMD_ARGV (6), CMD_ARGV (0));
@ -1224,7 +1224,7 @@ void ClientCommand (edict_t *ent)
return; return;
} }
else if (stricmp (command, "menuselect") == 0 && !IsNullString (arg1) && g_clients[issuerPlayerIndex].menu != BOT_MENU_IVALID) else if (A_stricmp (command, "menuselect") == 0 && !IsNullString (arg1) && g_clients[issuerPlayerIndex].menu != BOT_MENU_IVALID)
{ {
Client *client = &g_clients[issuerPlayerIndex]; Client *client = &g_clients[issuerPlayerIndex];
int selection = atoi (arg1); int selection = atoi (arg1);
@ -1984,7 +1984,7 @@ void ClientCommand (edict_t *ent)
} }
} }
if (!engine.IsBotCommand () && (stricmp (command, "say") == 0 || stricmp (command, "say_team") == 0)) if (!engine.IsBotCommand () && (A_stricmp (command, "say") == 0 || A_stricmp (command, "say_team") == 0))
{ {
Bot *bot = nullptr; Bot *bot = nullptr;
@ -2794,7 +2794,7 @@ SHARED_LIBRARAY_EXPORT int GetEntityAPI2 (gamefuncs_t *functionTable, int *)
if (!(g_gameFlags & GAME_METAMOD)) if (!(g_gameFlags & GAME_METAMOD))
{ {
auto api_GetEntityAPI = g_gameLib->GetFuncAddr <EntityAPI_t> ("GetEntityAPI"); auto api_GetEntityAPI = g_gameLib->GetFuncAddr <GetEntityApi2_FN> ("GetEntityAPI");
// pass other DLLs engine callbacks to function table... // pass other DLLs engine callbacks to function table...
if (api_GetEntityAPI (&g_functionTable, INTERFACE_VERSION) == 0) if (api_GetEntityAPI (&g_functionTable, INTERFACE_VERSION) == 0)
@ -2853,7 +2853,7 @@ SHARED_LIBRARAY_EXPORT int GetNewDLLFunctions (newgamefuncs_t *functionTable, in
// pass them too, else the DLL interfacing wouldn't be complete and the game possibly wouldn't // pass them too, else the DLL interfacing wouldn't be complete and the game possibly wouldn't
// run properly. // run properly.
auto api_GetNewDLLFunctions = g_gameLib->GetFuncAddr <NewEntityAPI_t> ("GetNewDLLFunctions"); auto api_GetNewDLLFunctions = g_gameLib->GetFuncAddr <GetNewEntityApi_FN> ("GetNewDLLFunctions");
if (api_GetNewDLLFunctions == nullptr) if (api_GetNewDLLFunctions == nullptr)
return FALSE; return FALSE;
@ -2913,7 +2913,7 @@ SHARED_LIBRARAY_EXPORT int Server_GetBlendingInterface (int version, void **ppin
// of the body move, which bones, which hitboxes and how) between the server and the game DLL. // of the body move, which bones, which hitboxes and how) between the server and the game DLL.
// some MODs can be using a different hitbox scheme than the standard one. // some MODs can be using a different hitbox scheme than the standard one.
auto api_GetBlendingInterface = g_gameLib->GetFuncAddr <BlendAPI_t> ("Server_GetBlendingInterface"); auto api_GetBlendingInterface = g_gameLib->GetFuncAddr <GetBlendingInterface_FN> ("Server_GetBlendingInterface");
if (api_GetBlendingInterface == nullptr) if (api_GetBlendingInterface == nullptr)
return FALSE; return FALSE;
@ -3040,7 +3040,7 @@ Library *LoadCSBinary (void)
} }
// detect if we're running modern game // detect if we're running modern game
EntityPtr_t entity = game->GetFuncAddr <EntityPtr_t> ("weapon_famas"); Entity_FN entity = game->GetFuncAddr <Entity_FN> ("weapon_famas");
if (entity != nullptr) if (entity != nullptr)
g_gameFlags |= GAME_CSTRIKE16; g_gameFlags |= GAME_CSTRIKE16;
@ -3143,7 +3143,7 @@ DLL_GIVEFNPTRSTODLL GiveFnptrsToDll (enginefuncs_t *functionTable, globalvars_t
} }
#endif #endif
auto api_GiveFnptrsToDll = g_gameLib->GetFuncAddr <FuncPointers_t> ("GiveFnptrsToDll"); auto api_GiveFnptrsToDll = g_gameLib->GetFuncAddr <GiveFnptrsToDll_FN> ("GiveFnptrsToDll");
if (!api_GiveFnptrsToDll) if (!api_GiveFnptrsToDll)
TerminateOnMalloc (); TerminateOnMalloc ();
@ -3169,10 +3169,10 @@ DLL_ENTRYPOINT
DLL_RETENTRY; // the return data type is OS specific too DLL_RETENTRY; // the return data type is OS specific too
} }
void LinkEntity_Helper (EntityPtr_t &addr, const char *name, entvars_t *pev) void LinkEntity_Helper (Entity_FN &addr, const char *name, entvars_t *pev)
{ {
if (addr == nullptr) if (addr == nullptr)
addr = g_gameLib->GetFuncAddr <EntityPtr_t > (name); addr = g_gameLib->GetFuncAddr <Entity_FN > (name);
if (addr == nullptr) if (addr == nullptr)
return; return;
@ -3183,7 +3183,7 @@ void LinkEntity_Helper (EntityPtr_t &addr, const char *name, entvars_t *pev)
#define LINK_ENTITY(entityName) \ #define LINK_ENTITY(entityName) \
SHARED_LIBRARAY_EXPORT void entityName (entvars_t *pev) \ SHARED_LIBRARAY_EXPORT void entityName (entvars_t *pev) \
{ \ { \
static EntityPtr_t addr; \ static Entity_FN addr; \
LinkEntity_Helper (addr, #entityName, pev); \ LinkEntity_Helper (addr, #entityName, pev); \
} \ } \

8
source/manager.cpp
View file

@ -31,9 +31,11 @@ BotManager::BotManager (void)
m_lastWinner = -1; m_lastWinner = -1;
m_deathMsgSent = false; m_deathMsgSent = false;
m_economicsGood[TERRORIST] = true; for (int i = 0; i < SPECTATOR; i++)
m_economicsGood[CT] = true; {
m_leaderChoosen[i] = false;
m_economicsGood[i] = true;
}
memset (m_bots, 0, sizeof (m_bots)); memset (m_bots, 0, sizeof (m_bots));
m_maintainTime = 0.0f; m_maintainTime = 0.0f;

7
source/waypoint.cpp
View file

@ -1092,7 +1092,7 @@ bool Waypoint::Load (void)
fp.Close (); fp.Close ();
return false; return false;
} }
else if (stricmp (header.mapName, map)) else if (A_stricmp (header.mapName, map))
{ {
sprintf (m_infoBuffer, "%s.pwf - hacked waypoint file, file name doesn't match waypoint header information (mapname: '%s', header: '%s')", map, map, header.mapName); sprintf (m_infoBuffer, "%s.pwf - hacked waypoint file, file name doesn't match waypoint header information (mapname: '%s', header: '%s')", map, map, header.mapName);
AddLogEntry (true, LL_ERROR, m_infoBuffer); AddLogEntry (true, LL_ERROR, m_infoBuffer);
@ -2396,7 +2396,7 @@ void Waypoint::EraseFromHardDisk (void)
{ {
// this function removes waypoint file from the hard disk // this function removes waypoint file from the hard disk
String deleteList[5]; String deleteList[4];
const char *map = engine.GetMapName (); const char *map = engine.GetMapName ();
// if we're delete waypoint, delete all corresponding to it files // if we're delete waypoint, delete all corresponding to it files
@ -2404,13 +2404,12 @@ void Waypoint::EraseFromHardDisk (void)
deleteList[1] = FormatBuffer ("%slearned/%s.exp", GetDataDir (), map); // corresponding to waypoint experience deleteList[1] = FormatBuffer ("%slearned/%s.exp", GetDataDir (), map); // corresponding to waypoint experience
deleteList[3] = FormatBuffer ("%slearned/%s.vis", GetDataDir (), map); // corresponding to waypoint vistable deleteList[3] = FormatBuffer ("%slearned/%s.vis", GetDataDir (), map); // corresponding to waypoint vistable
deleteList[3] = FormatBuffer ("%slearned/%s.pmt", GetDataDir (), map); // corresponding to waypoint path matrix deleteList[3] = FormatBuffer ("%slearned/%s.pmt", GetDataDir (), map); // corresponding to waypoint path matrix
deleteList[4] = FormatBuffer ("%slearned/%s.xml", GetDataDir (), map); // corresponding to waypoint xml database
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
{ {
if (File::Accessible (const_cast <char *> (deleteList[i].GetBuffer ()))) if (File::Accessible (const_cast <char *> (deleteList[i].GetBuffer ())))
{ {
unlink (deleteList[i].GetBuffer ()); _unlink (deleteList[i].GetBuffer ());
AddLogEntry (true, LL_DEFAULT, "File %s, has been deleted from the hard disk", deleteList[i].GetBuffer ()); AddLogEntry (true, LL_DEFAULT, "File %s, has been deleted from the hard disk", deleteList[i].GetBuffer ());
} }
else else