aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoricculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea>2009-09-15 01:44:58 +0000
committericculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea>2009-09-15 01:44:58 +0000
commite147ed40e85698cd26934efae666565840076cc5 (patch)
tree1da96e426f1497bd756af0e29084c2d7806fdb89
parent93404730059e9c8b6fcbf4e7c0f5ff69a23e6ea1 (diff)
downloadioquake3-aero-e147ed40e85698cd26934efae666565840076cc5.tar.gz
ioquake3-aero-e147ed40e85698cd26934efae666565840076cc5.zip
Renamed bot_developer to botDeveloper to prevent symbol clash.
qagame*.so has a variable named this too, and this confuses the Linux dynamic loader since we're not using -fvisibility=hidden. Fixes Bugzilla #3944. git-svn-id: svn://svn.icculus.org/quake3/trunk@1607 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/botlib/be_aas_main.c2
-rw-r--r--code/botlib/be_aas_route.c6
-rw-r--r--code/botlib/be_aas_sample.c2
-rw-r--r--code/botlib/be_ai_char.c2
-rw-r--r--code/botlib/be_ai_chat.c4
-rw-r--r--code/botlib/be_ai_goal.c2
-rw-r--r--code/botlib/be_ai_move.c20
-rw-r--r--code/botlib/be_ai_weight.c2
-rw-r--r--code/botlib/be_interface.c4
-rw-r--r--code/botlib/be_interface.h2
-rw-r--r--code/botlib/botlib.h2
11 files changed, 24 insertions, 24 deletions
diff --git a/code/botlib/be_aas_main.c b/code/botlib/be_aas_main.c
index 0296b1a..99a183a 100644
--- a/code/botlib/be_aas_main.c
+++ b/code/botlib/be_aas_main.c
@@ -247,7 +247,7 @@ int AAS_StartFrame(float time)
//
aasworld.frameroutingupdates = 0;
//
- if (bot_developer)
+ if (botDeveloper)
{
if (LibVarGetValue("showcacheupdates"))
{
diff --git a/code/botlib/be_aas_route.c b/code/botlib/be_aas_route.c
index e31202b..0d240dc 100644
--- a/code/botlib/be_aas_route.c
+++ b/code/botlib/be_aas_route.c
@@ -311,7 +311,7 @@ int AAS_EnableRoutingArea(int areanum, int enable)
if (areanum <= 0 || areanum >= aasworld.numareas)
{
- if (bot_developer)
+ if (botDeveloper)
{
botimport.Print(PRT_ERROR, "AAS_EnableRoutingArea: areanum %d out of range\n", areanum);
} //end if
@@ -1603,7 +1603,7 @@ int AAS_AreaRouteToGoalArea(int areanum, vec3_t origin, int goalareanum, int tra
//
if (areanum <= 0 || areanum >= aasworld.numareas)
{
- if (bot_developer)
+ if (botDeveloper)
{
botimport.Print(PRT_ERROR, "AAS_AreaTravelTimeToGoalArea: areanum %d out of range\n", areanum);
} //end if
@@ -1611,7 +1611,7 @@ int AAS_AreaRouteToGoalArea(int areanum, vec3_t origin, int goalareanum, int tra
} //end if
if (goalareanum <= 0 || goalareanum >= aasworld.numareas)
{
- if (bot_developer)
+ if (botDeveloper)
{
botimport.Print(PRT_ERROR, "AAS_AreaTravelTimeToGoalArea: goalareanum %d out of range\n", goalareanum);
} //end if
diff --git a/code/botlib/be_aas_sample.c b/code/botlib/be_aas_sample.c
index 6c7adec..095641a 100644
--- a/code/botlib/be_aas_sample.c
+++ b/code/botlib/be_aas_sample.c
@@ -150,7 +150,7 @@ aas_link_t *AAS_AllocAASLink(void)
if (!link)
{
#ifndef BSPC
- if (bot_developer)
+ if (botDeveloper)
#endif
{
botimport.Print(PRT_FATAL, "empty aas link heap\n");
diff --git a/code/botlib/be_ai_char.c b/code/botlib/be_ai_char.c
index 51520f7..d360886 100644
--- a/code/botlib/be_ai_char.c
+++ b/code/botlib/be_ai_char.c
@@ -416,7 +416,7 @@ int BotLoadCachedCharacter(char *charfile, float skill, int reload)
//
botimport.Print(PRT_MESSAGE, "loaded skill %d from %s\n", intskill, charfile);
#ifdef DEBUG
- if (bot_developer)
+ if (botDeveloper)
{
botimport.Print(PRT_MESSAGE, "skill %d loaded in %d msec from %s\n", intskill, Sys_MilliSeconds() - starttime, charfile);
} //end if
diff --git a/code/botlib/be_ai_chat.c b/code/botlib/be_ai_chat.c
index 6d64cf6..5092cec 100644
--- a/code/botlib/be_ai_chat.c
+++ b/code/botlib/be_ai_chat.c
@@ -1992,7 +1992,7 @@ bot_replychat_t *BotLoadReplyChat(char *filename)
botimport.Print(PRT_MESSAGE, "loaded %s\n", filename);
//
//BotDumpReplyChat(replychatlist);
- if (bot_developer)
+ if (botDeveloper)
{
BotCheckReplyChatIntegrety(replychatlist);
} //end if
@@ -2191,7 +2191,7 @@ bot_chat_t *BotLoadInitialChat(char *chatfile, char *chatname)
botimport.Print(PRT_MESSAGE, "loaded %s from %s\n", chatname, chatfile);
//
//BotDumpInitialChat(chat);
- if (bot_developer)
+ if (botDeveloper)
{
BotCheckInitialChatIntegrety(chat);
} //end if
diff --git a/code/botlib/be_ai_goal.c b/code/botlib/be_ai_goal.c
index fbcc20f..8fb7de9 100644
--- a/code/botlib/be_ai_goal.c
+++ b/code/botlib/be_ai_goal.c
@@ -522,7 +522,7 @@ void BotInitInfoEntities(void)
numcampspots++;
} //end else if
} //end for
- if (bot_developer)
+ if (botDeveloper)
{
botimport.Print(PRT_MESSAGE, "%d map locations\n", numlocations);
botimport.Print(PRT_MESSAGE, "%d camp spots\n", numcampspots);
diff --git a/code/botlib/be_ai_move.c b/code/botlib/be_ai_move.c
index 27a855a..2840830 100644
--- a/code/botlib/be_ai_move.c
+++ b/code/botlib/be_ai_move.c
@@ -772,7 +772,7 @@ int BotGetReachabilityToGoal(vec3_t origin, int areanum,
if (i != MAX_AVOIDREACH && avoidreachtries[i] > AVOIDREACH_TRIES)
{
#ifdef DEBUG
- if (bot_developer)
+ if (botDeveloper)
{
botimport.Print(PRT_MESSAGE, "avoiding reachability %d\n", avoidreach[i]);
} //end if
@@ -3076,7 +3076,7 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
} //end if
else
{
- if (bot_developer)
+ if (botDeveloper)
{
botimport.Print(PRT_MESSAGE, "client %d: on func_plat without reachability\n", ms->client);
} //end if
@@ -3106,7 +3106,7 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
} //end if
else
{
- if (bot_developer)
+ if (botDeveloper)
{
botimport.Print(PRT_MESSAGE, "client %d: on func_bobbing without reachability\n", ms->client);
} //end if
@@ -3208,7 +3208,7 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
else
{
#ifdef DEBUG
- if (bot_developer)
+ if (botDeveloper)
{
if (ms->reachability_time < AAS_Time())
{
@@ -3242,7 +3242,7 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
if (!AAS_AreaReachability(ms->areanum))
{
#ifdef DEBUG
- if (bot_developer)
+ if (botDeveloper)
{
botimport.Print(PRT_MESSAGE, "area %d no reachability\n", ms->areanum);
} //end if
@@ -3273,12 +3273,12 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
} //end if
#ifdef DEBUG
- else if (bot_developer)
+ else if (botDeveloper)
{
botimport.Print(PRT_MESSAGE, "goal not reachable\n");
Com_Memset(&reach, 0, sizeof(aas_reachability_t)); //make compiler happy
} //end else
- if (bot_developer)
+ if (botDeveloper)
{
//if still going for the same goal
if (ms->lastgoalareanum == goal->areanum)
@@ -3346,7 +3346,7 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
Com_Memset(&reach, 0, sizeof(aas_reachability_t));
} //end else
#ifdef DEBUG
- if (bot_developer)
+ if (botDeveloper)
{
if (result->failure)
{
@@ -3402,7 +3402,7 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
} //end else
} //end if
} //end for
- if (bot_developer)
+ if (botDeveloper)
{
//if a jumppad is found with the trace but no reachability is found
if (foundjumppad && !ms->lastreachnum)
@@ -3447,7 +3447,7 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
} //end switch
result->traveltype = reach.traveltype;
#ifdef DEBUG
- if (bot_developer)
+ if (botDeveloper)
{
if (result->failure)
{
diff --git a/code/botlib/be_ai_weight.c b/code/botlib/be_ai_weight.c
index 8d48ee6..72ef812 100644
--- a/code/botlib/be_ai_weight.c
+++ b/code/botlib/be_ai_weight.c
@@ -422,7 +422,7 @@ weightconfig_t *ReadWeightConfig(char *filename)
//if the file was located in a pak file
botimport.Print(PRT_MESSAGE, "loaded %s\n", filename);
#ifdef DEBUG
- if (bot_developer)
+ if (botDeveloper)
{
botimport.Print(PRT_MESSAGE, "weights loaded in %d msec\n", Sys_MilliSeconds() - starttime);
} //end if
diff --git a/code/botlib/be_interface.c b/code/botlib/be_interface.c
index 5418635..1e0e802 100644
--- a/code/botlib/be_interface.c
+++ b/code/botlib/be_interface.c
@@ -58,7 +58,7 @@ botlib_globals_t botlibglobals;
botlib_export_t be_botlib_export;
botlib_import_t botimport;
//
-int bot_developer;
+int botDeveloper;
//qtrue if the library is setup
int botlibsetup = qfalse;
@@ -139,7 +139,7 @@ int Export_BotLibSetup(void)
char logfilename[MAX_OSPATH];
char *homedir, *gamedir;
- bot_developer = LibVarGetValue("bot_developer");
+ botDeveloper = LibVarGetValue("bot_developer");
memset( &botlibglobals, 0, sizeof(botlibglobals) );
//initialize byte swapping (litte endian etc.)
// Swap_Init();
diff --git a/code/botlib/be_interface.h b/code/botlib/be_interface.h
index 956530b..c3cdf08 100644
--- a/code/botlib/be_interface.h
+++ b/code/botlib/be_interface.h
@@ -50,7 +50,7 @@ typedef struct botlib_globals_s
extern botlib_globals_t botlibglobals;
extern botlib_import_t botimport;
-extern int bot_developer; //true if developer is on
+extern int botDeveloper; //true if developer is on
//
int Sys_MilliSeconds(void);
diff --git a/code/botlib/botlib.h b/code/botlib/botlib.h
index a3f7516..5fb1855 100644
--- a/code/botlib/botlib.h
+++ b/code/botlib/botlib.h
@@ -443,7 +443,7 @@ name: default: module(s): description:
"log" "0" l_log.c enable/disable creating a log file
"maxclients" "4" be_interface.c maximum number of clients
"maxentities" "1024" be_interface.c maximum number of entities
-"bot_developer" "0" be_interface.c bot developer mode
+"bot_developer" "0" be_interface.c bot developer mode (it's "botDeveloper" in C to prevent symbol clash).
"phys_friction" "6" be_aas_move.c ground friction
"phys_stopspeed" "100" be_aas_move.c stop speed