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

disable gcc -fno-builtin

Browse source
This commit is contained in:
jeefo 2016-09-14 09:20:33 +03:00
commit bcf11cf6ff
6 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/core.h
View file

@ -58,12 +58,14 @@ enum TaskID
enum GameFlags enum GameFlags
{ {
GAME_CSTRIKE16 = (1 << 0), // Counter-Strike 1.6 and Above GAME_CSTRIKE16 = (1 << 0), // Counter-Strike 1.6 and Above
GAME_XASH = (1 << 1), // Counter-Strike 1.6 under the xash engine (additional flag) GAME_XASH_ENGINE = (1 << 1), // Counter-Strike 1.6 under the xash engine (additional flag)
GAME_CZERO = (1 << 2), // Counter-Strike: Condition Zero GAME_CZERO = (1 << 2), // Counter-Strike: Condition Zero
GAME_LEGACY = (1 << 3), // Counter-Strike 1.3-1.5 with/without Steam GAME_LEGACY = (1 << 3), // Counter-Strike 1.3-1.5 with/without Steam
GAME_MOBILITY = (1 << 4), // additional flag that bot is running on android (additional flag) GAME_MOBILITY = (1 << 4), // additional flag that bot is running on android (additional flag)
GAME_OFFICIAL_CSBOT = (1 << 5), // additional flag that indicates official cs bots are in game GAME_OFFICIAL_CSBOT = (1 << 5), // additional flag that indicates official cs bots are in game
GAME_METAMOD = (1 << 6) GAME_METAMOD = (1 << 6), // game running under metamod
GAME_SUPPORT_SVC_PINGS = (1 << 7), // on that game version we can fake bots pings
GAME_SUPPORT_BOT_VOICE = (1 << 8) // on that game version we can use chatter
}; };
// bot menu ids // bot menu ids

2
project/makefile
View file

@ -55,7 +55,7 @@ endif
LINK += -m32 -lm -ldl LINK += -m32 -lm -ldl
CFLAGS += -msse2 -std=c++11 -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
BINARY = $(PROJECT).$(LIB_EXT) BINARY = $(PROJECT).$(LIB_EXT)

2
source/basecode.cpp
View file

@ -1445,7 +1445,7 @@ void Bot::PurchaseWeapons (void)
bool teamEcoValid = bots.IsEcoValid (m_team); bool teamEcoValid = bots.IsEcoValid (m_team);
// do this, because xash engine is not capable to run all the features goldsrc, but we have cs 1.6 on it, so buy table must be the same // do this, because xash engine is not capable to run all the features goldsrc, but we have cs 1.6 on it, so buy table must be the same
bool isOldGame = (g_gameFlags & GAME_LEGACY) && !(g_gameFlags & GAME_XASH); bool isOldGame = (g_gameFlags & GAME_LEGACY) && !(g_gameFlags & GAME_XASH_ENGINE);
switch (m_buyState) switch (m_buyState)
{ {

8
source/interface.cpp
View file

@ -2419,7 +2419,7 @@ void pfnMessageBegin (int msgDest, int msgType, const float *origin, edict_t *ed
} }
engine.ResetMessageCapture (); engine.ResetMessageCapture ();
if ((!(g_gameFlags & GAME_LEGACY) || (g_gameFlags & GAME_XASH)) && msgDest == MSG_SPEC && msgType == engine.FindMessageId (NETMSG_HLTV)) if ((!(g_gameFlags & GAME_LEGACY) || (g_gameFlags & GAME_XASH_ENGINE)) && msgDest == MSG_SPEC && msgType == engine.FindMessageId (NETMSG_HLTV))
engine.SetOngoingMessageId (NETMSG_HLTV); engine.SetOngoingMessageId (NETMSG_HLTV);
engine.TryCaptureMessage (msgType, NETMSG_WEAPONLIST); engine.TryCaptureMessage (msgType, NETMSG_WEAPONLIST);
@ -3029,7 +3029,7 @@ Library *LoadCSBinary (void)
// detect xash engine // detect xash engine
if (g_engfuncs.pfnCVarGetPointer ("build") != nullptr) if (g_engfuncs.pfnCVarGetPointer ("build") != nullptr)
{ {
g_gameFlags |= (GAME_LEGACY | GAME_XASH); g_gameFlags |= (GAME_LEGACY | GAME_XASH_ENGINE);
if (g_gameFlags & GAME_METAMOD) if (g_gameFlags & GAME_METAMOD)
{ {
@ -3088,7 +3088,7 @@ DLL_GIVEFNPTRSTODLL GiveFnptrsToDll (enginefuncs_t *functionTable, globalvars_t
} }
#ifdef PLATFORM_ANDROID #ifdef PLATFORM_ANDROID
g_gameFlags |= (GAME_LEGACY | GAME_XASH | GAME_MOBILITY); g_gameFlags |= (GAME_LEGACY | GAME_XASH_ENGINE | GAME_MOBILITY);
if (g_gameFlags & GAME_METAMOD) if (g_gameFlags & GAME_METAMOD)
return; // we should stop the attempt for loading the real gamedll, since metamod handle this for us return; // we should stop the attempt for loading the real gamedll, since metamod handle this for us
@ -3127,7 +3127,7 @@ DLL_GIVEFNPTRSTODLL GiveFnptrsToDll (enginefuncs_t *functionTable, globalvars_t
else if (g_gameFlags & GAME_CSTRIKE16) else if (g_gameFlags & GAME_CSTRIKE16)
gameVersionStr.Assign ("v1.6"); gameVersionStr.Assign ("v1.6");
if (g_gameFlags & GAME_XASH) if (g_gameFlags & GAME_XASH_ENGINE)
{ {
gameVersionStr.Append (" @ Xash3D Engine"); gameVersionStr.Append (" @ Xash3D Engine");

2
source/navigate.cpp
View file

@ -1107,7 +1107,7 @@ bool Bot::DoWaypointNav (void)
if (Random.Int (1, 100) < 50) if (Random.Int (1, 100) < 50)
{ {
// do not use door directrly under xash, or we will get failed assert in gamedll code // do not use door directrly under xash, or we will get failed assert in gamedll code
if (g_gameFlags & GAME_XASH) if (g_gameFlags & GAME_XASH_ENGINE)
pev->button |= IN_USE; pev->button |= IN_USE;
else else
MDLL_Use (tr.pHit, GetEntity ()); // also 'use' the door randomly MDLL_Use (tr.pHit, GetEntity ()); // also 'use' the door randomly

6
source/support.cpp
View file

@ -149,7 +149,7 @@ void DisplayMenuToClient (edict_t *ent, MenuId menu)
break; break;
} }
} }
const char *displayText = ((g_gameFlags & (GAME_XASH | GAME_MOBILITY)) && !yb_display_menu_text.GetBool ()) ? " " : menuPtr->text.GetBuffer (); const char *displayText = ((g_gameFlags & (GAME_XASH_ENGINE | GAME_MOBILITY)) && !yb_display_menu_text.GetBool ()) ? " " : menuPtr->text.GetBuffer ();
while (strlen (displayText) >= 64) while (strlen (displayText) >= 64)
{ {
@ -528,7 +528,7 @@ void CheckWelcomeMessage (void)
Array <String> sentences; Array <String> sentences;
if (!(g_gameFlags & (GAME_MOBILITY | GAME_XASH))) if (!(g_gameFlags & (GAME_MOBILITY | GAME_XASH_ENGINE)))
{ {
// add default messages // add default messages
sentences.Push ("hello user,communication is acquired"); sentences.Push ("hello user,communication is acquired");
@ -554,7 +554,7 @@ void CheckWelcomeMessage (void)
if (receiveTime > 0.0f && receiveTime < engine.Time () && !alreadyReceived && (g_numWaypoints > 0 ? g_gameWelcomeSent : true)) if (receiveTime > 0.0f && receiveTime < engine.Time () && !alreadyReceived && (g_numWaypoints > 0 ? g_gameWelcomeSent : true))
{ {
if (!(g_gameFlags & (GAME_MOBILITY | GAME_XASH))) if (!(g_gameFlags & (GAME_MOBILITY | GAME_XASH_ENGINE)))
engine.IssueCmd ("speak \"%s\"", const_cast <char *> (sentences.GetRandomElement ().GetBuffer ())); engine.IssueCmd ("speak \"%s\"", const_cast <char *> (sentences.GetRandomElement ().GetBuffer ()));
engine.ChatPrintf ("----- %s v%s (Build: %u), {%s}, (c) 2016, by %s (%s)-----", PRODUCT_NAME, PRODUCT_VERSION, GenerateBuildNumber (), PRODUCT_DATE, PRODUCT_AUTHOR, PRODUCT_URL); engine.ChatPrintf ("----- %s v%s (Build: %u), {%s}, (c) 2016, by %s (%s)-----", PRODUCT_NAME, PRODUCT_VERSION, GenerateBuildNumber (), PRODUCT_DATE, PRODUCT_AUTHOR, PRODUCT_URL);