teambeef
/
ioq3quest
mirror of https://github.com/DrBeef/ioq3quest.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ryan C. Gordon 2009-09-15 01:44:58 +00:00
parent 592062c548
commit 6cea11c665
11 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/botlib/be_aas_main.c
View File

@ -247,7 +247,7 @@ int AAS_StartFrame(float time)
// //
aasworld.frameroutingupdates = 0; aasworld.frameroutingupdates = 0;
// //
if (bot_developer) if (botDeveloper)
{ {
if (LibVarGetValue("showcacheupdates")) if (LibVarGetValue("showcacheupdates"))
{ {

6
code/botlib/be_aas_route.c
View File

@ -311,7 +311,7 @@ int AAS_EnableRoutingArea(int areanum, int enable)
if (areanum <= 0 || areanum >= aasworld.numareas) if (areanum <= 0 || areanum >= aasworld.numareas)
{ {
if (bot_developer) if (botDeveloper)
{ {
botimport.Print(PRT_ERROR, "AAS_EnableRoutingArea: areanum %d out of range\n", areanum); botimport.Print(PRT_ERROR, "AAS_EnableRoutingArea: areanum %d out of range\n", areanum);
} //end if } //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 (areanum <= 0 || areanum >= aasworld.numareas)
{ {
if (bot_developer) if (botDeveloper)
{ {
botimport.Print(PRT_ERROR, "AAS_AreaTravelTimeToGoalArea: areanum %d out of range\n", areanum); botimport.Print(PRT_ERROR, "AAS_AreaTravelTimeToGoalArea: areanum %d out of range\n", areanum);
} //end if } //end if
@ -1611,7 +1611,7 @@ int AAS_AreaRouteToGoalArea(int areanum, vec3_t origin, int goalareanum, int tra
} //end if } //end if
if (goalareanum <= 0 || goalareanum >= aasworld.numareas) if (goalareanum <= 0 || goalareanum >= aasworld.numareas)
{ {
if (bot_developer) if (botDeveloper)
{ {
botimport.Print(PRT_ERROR, "AAS_AreaTravelTimeToGoalArea: goalareanum %d out of range\n", goalareanum); botimport.Print(PRT_ERROR, "AAS_AreaTravelTimeToGoalArea: goalareanum %d out of range\n", goalareanum);
} //end if } //end if

2
code/botlib/be_aas_sample.c
View File

@ -150,7 +150,7 @@ aas_link_t *AAS_AllocAASLink(void)
if (!link) if (!link)
{ {
#ifndef BSPC #ifndef BSPC
if (bot_developer) if (botDeveloper)
#endif #endif
{ {
botimport.Print(PRT_FATAL, "empty aas link heap\n"); botimport.Print(PRT_FATAL, "empty aas link heap\n");

2
code/botlib/be_ai_char.c
View File

@ -416,7 +416,7 @@ int BotLoadCachedCharacter(char *charfile, float skill, int reload)
// //
botimport.Print(PRT_MESSAGE, "loaded skill %d from %s\n", intskill, charfile); botimport.Print(PRT_MESSAGE, "loaded skill %d from %s\n", intskill, charfile);
#ifdef DEBUG #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); botimport.Print(PRT_MESSAGE, "skill %d loaded in %d msec from %s\n", intskill, Sys_MilliSeconds() - starttime, charfile);
} //end if } //end if

4
code/botlib/be_ai_chat.c
View File

@ -1992,7 +1992,7 @@ bot_replychat_t *BotLoadReplyChat(char *filename)
botimport.Print(PRT_MESSAGE, "loaded %s\n", filename); botimport.Print(PRT_MESSAGE, "loaded %s\n", filename);
// //
//BotDumpReplyChat(replychatlist); //BotDumpReplyChat(replychatlist);
if (bot_developer) if (botDeveloper)
{ {
BotCheckReplyChatIntegrety(replychatlist); BotCheckReplyChatIntegrety(replychatlist);
} //end if } //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); botimport.Print(PRT_MESSAGE, "loaded %s from %s\n", chatname, chatfile);
// //
//BotDumpInitialChat(chat); //BotDumpInitialChat(chat);
if (bot_developer) if (botDeveloper)
{ {
BotCheckInitialChatIntegrety(chat); BotCheckInitialChatIntegrety(chat);
} //end if } //end if

2
code/botlib/be_ai_goal.c
View File

@ -522,7 +522,7 @@ void BotInitInfoEntities(void)
numcampspots++; numcampspots++;
} //end else if } //end else if
} //end for } //end for
if (bot_developer) if (botDeveloper)
{ {
botimport.Print(PRT_MESSAGE, "%d map locations\n", numlocations); botimport.Print(PRT_MESSAGE, "%d map locations\n", numlocations);
botimport.Print(PRT_MESSAGE, "%d camp spots\n", numcampspots); botimport.Print(PRT_MESSAGE, "%d camp spots\n", numcampspots);

20
code/botlib/be_ai_move.c
View File

@ -772,7 +772,7 @@ int BotGetReachabilityToGoal(vec3_t origin, int areanum,
if (i != MAX_AVOIDREACH && avoidreachtries[i] > AVOIDREACH_TRIES) if (i != MAX_AVOIDREACH && avoidreachtries[i] > AVOIDREACH_TRIES)
{ {
#ifdef DEBUG #ifdef DEBUG
if (bot_developer) if (botDeveloper)
{ {
botimport.Print(PRT_MESSAGE, "avoiding reachability %d\n", avoidreach[i]); botimport.Print(PRT_MESSAGE, "avoiding reachability %d\n", avoidreach[i]);
} //end if } //end if
@ -3076,7 +3076,7 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
} //end if } //end if
else else
{ {
if (bot_developer) if (botDeveloper)
{ {
botimport.Print(PRT_MESSAGE, "client %d: on func_plat without reachability\n", ms->client); botimport.Print(PRT_MESSAGE, "client %d: on func_plat without reachability\n", ms->client);
} //end if } //end if
@ -3106,7 +3106,7 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
} //end if } //end if
else else
{ {
if (bot_developer) if (botDeveloper)
{ {
botimport.Print(PRT_MESSAGE, "client %d: on func_bobbing without reachability\n", ms->client); botimport.Print(PRT_MESSAGE, "client %d: on func_bobbing without reachability\n", ms->client);
} //end if } //end if
@ -3208,7 +3208,7 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
else else
{ {
#ifdef DEBUG #ifdef DEBUG
if (bot_developer) if (botDeveloper)
{ {
if (ms->reachability_time < AAS_Time()) 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)) if (!AAS_AreaReachability(ms->areanum))
{ {
#ifdef DEBUG #ifdef DEBUG
if (bot_developer) if (botDeveloper)
{ {
botimport.Print(PRT_MESSAGE, "area %d no reachability\n", ms->areanum); botimport.Print(PRT_MESSAGE, "area %d no reachability\n", ms->areanum);
} //end if } //end if
@ -3273,12 +3273,12 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
} //end if } //end if
#ifdef DEBUG #ifdef DEBUG
else if (bot_developer) else if (botDeveloper)
{ {
botimport.Print(PRT_MESSAGE, "goal not reachable\n"); botimport.Print(PRT_MESSAGE, "goal not reachable\n");
Com_Memset(&reach, 0, sizeof(aas_reachability_t)); //make compiler happy Com_Memset(&reach, 0, sizeof(aas_reachability_t)); //make compiler happy
} //end else } //end else
if (bot_developer) if (botDeveloper)
{ {
//if still going for the same goal //if still going for the same goal
if (ms->lastgoalareanum == goal->areanum) 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)); Com_Memset(&reach, 0, sizeof(aas_reachability_t));
} //end else } //end else
#ifdef DEBUG #ifdef DEBUG
if (bot_developer) if (botDeveloper)
{ {
if (result->failure) if (result->failure)
{ {
@ -3402,7 +3402,7 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
} //end else } //end else
} //end if } //end if
} //end for } //end for
if (bot_developer) if (botDeveloper)
{ {
//if a jumppad is found with the trace but no reachability is found //if a jumppad is found with the trace but no reachability is found
if (foundjumppad && !ms->lastreachnum) if (foundjumppad && !ms->lastreachnum)
@ -3447,7 +3447,7 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
} //end switch } //end switch
result->traveltype = reach.traveltype; result->traveltype = reach.traveltype;
#ifdef DEBUG #ifdef DEBUG
if (bot_developer) if (botDeveloper)
{ {
if (result->failure) if (result->failure)
{ {

2
code/botlib/be_ai_weight.c
View File

@ -422,7 +422,7 @@ weightconfig_t *ReadWeightConfig(char *filename)
//if the file was located in a pak file //if the file was located in a pak file
botimport.Print(PRT_MESSAGE, "loaded %s\n", filename); botimport.Print(PRT_MESSAGE, "loaded %s\n", filename);
#ifdef DEBUG #ifdef DEBUG
if (bot_developer) if (botDeveloper)
{ {
botimport.Print(PRT_MESSAGE, "weights loaded in %d msec\n", Sys_MilliSeconds() - starttime); botimport.Print(PRT_MESSAGE, "weights loaded in %d msec\n", Sys_MilliSeconds() - starttime);
} //end if } //end if

4
code/botlib/be_interface.c
View File

@ -58,7 +58,7 @@ botlib_globals_t botlibglobals;
botlib_export_t be_botlib_export; botlib_export_t be_botlib_export;
botlib_import_t botimport; botlib_import_t botimport;
// //
int bot_developer; int botDeveloper;
//qtrue if the library is setup //qtrue if the library is setup
int botlibsetup = qfalse; int botlibsetup = qfalse;
@ -139,7 +139,7 @@ int Export_BotLibSetup(void)
char logfilename[MAX_OSPATH]; char logfilename[MAX_OSPATH];
char *homedir, *gamedir; char *homedir, *gamedir;
bot_developer = LibVarGetValue("bot_developer"); botDeveloper = LibVarGetValue("bot_developer");
memset( &botlibglobals, 0, sizeof(botlibglobals) ); memset( &botlibglobals, 0, sizeof(botlibglobals) );
//initialize byte swapping (litte endian etc.) //initialize byte swapping (litte endian etc.)
// Swap_Init(); // Swap_Init();

2
code/botlib/be_interface.h
View File

@ -50,7 +50,7 @@ typedef struct botlib_globals_s
extern botlib_globals_t botlibglobals; extern botlib_globals_t botlibglobals;
extern botlib_import_t botimport; 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); int Sys_MilliSeconds(void);

2
code/botlib/botlib.h
View File

@ -443,7 +443,7 @@ name: default: module(s): description:
"log" "0" l_log.c enable/disable creating a log file "log" "0" l_log.c enable/disable creating a log file
"maxclients" "4" be_interface.c maximum number of clients "maxclients" "4" be_interface.c maximum number of clients
"maxentities" "1024" be_interface.c maximum number of entities "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_friction" "6" be_aas_move.c ground friction
"phys_stopspeed" "100" be_aas_move.c stop speed "phys_stopspeed" "100" be_aas_move.c stop speed