ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2024-11-10 07:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reduced scope of varoius variables in ai_cmd.c

Browse source
This commit is contained in:
Walter Julius Hennecke 2013-08-12 19:37:26 +02:00
parent 74f6adbfbb
commit 1a4235bf02
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/game/ai_cmd.c
View file

@ -167,7 +167,6 @@ BotGetTime
float BotGetTime(bot_match_t *match) { float BotGetTime(bot_match_t *match) {
bot_match_t timematch; bot_match_t timematch;
char timestring[MAX_MESSAGE_SIZE]; char timestring[MAX_MESSAGE_SIZE];
float t;
//if the matched string has a time //if the matched string has a time
if (match->subtype & ST_TIME) { if (match->subtype & ST_TIME) {
@ -175,10 +174,11 @@ float BotGetTime(bot_match_t *match) {
trap_BotMatchVariable(match, TIME, timestring, MAX_MESSAGE_SIZE); trap_BotMatchVariable(match, TIME, timestring, MAX_MESSAGE_SIZE);
//match it to find out if the time is in seconds or minutes //match it to find out if the time is in seconds or minutes
if (trap_BotFindMatch(timestring, &timematch, MTCONTEXT_TIME)) { if (trap_BotFindMatch(timestring, &timematch, MTCONTEXT_TIME)) {
float t;
if (timematch.type == MSG_FOREVER) { if (timematch.type == MSG_FOREVER) {
t = 99999999; t = 99999999;
} } else {
else {
trap_BotMatchVariable(&timematch, TIME, timestring, MAX_MESSAGE_SIZE); trap_BotMatchVariable(&timematch, TIME, timestring, MAX_MESSAGE_SIZE);
if (timematch.type == MSG_MINUTES) t = atof(timestring) * 60; if (timematch.type == MSG_MINUTES) t = atof(timestring) * 60;
else if (timematch.type == MSG_SECONDS) t = atof(timestring); else if (timematch.type == MSG_SECONDS) t = atof(timestring);
@ -436,7 +436,7 @@ BotMatch_HelpAccompany
================== ==================
*/ */
void BotMatch_HelpAccompany(bot_state_t *bs, bot_match_t *match) { void BotMatch_HelpAccompany(bot_state_t *bs, bot_match_t *match) {
int client, other, areanum; int client, other;
char teammate[MAX_MESSAGE_SIZE], netname[MAX_MESSAGE_SIZE]; char teammate[MAX_MESSAGE_SIZE], netname[MAX_MESSAGE_SIZE];
char itemname[MAX_MESSAGE_SIZE]; char itemname[MAX_MESSAGE_SIZE];
bot_match_t teammatematch; bot_match_t teammatematch;
@ -487,7 +487,7 @@ void BotMatch_HelpAccompany(bot_state_t *bs, bot_match_t *match) {
BotEntityInfo(client, &entinfo); BotEntityInfo(client, &entinfo);
//if info is valid (in PVS) //if info is valid (in PVS)
if (entinfo.valid) { if (entinfo.valid) {
areanum = BotPointAreaNum(entinfo.origin); int areanum = BotPointAreaNum(entinfo.origin);
if (areanum && trap_AAS_AreaReachability(areanum)) { if (areanum && trap_AAS_AreaReachability(areanum)) {
bs->teamgoal.entitynum = client; bs->teamgoal.entitynum = client;
bs->teamgoal.areanum = areanum; bs->teamgoal.areanum = areanum;
@ -981,7 +981,6 @@ BotMatch_StartTeamLeaderShip
================== ==================
*/ */
void BotMatch_StartTeamLeaderShip(bot_state_t *bs, bot_match_t *match) { void BotMatch_StartTeamLeaderShip(bot_state_t *bs, bot_match_t *match) {
int client;
char teammate[MAX_MESSAGE_SIZE]; char teammate[MAX_MESSAGE_SIZE];
if (!TeamPlayIsOn()) return; if (!TeamPlayIsOn()) return;
@ -994,6 +993,8 @@ void BotMatch_StartTeamLeaderShip(bot_state_t *bs, bot_match_t *match) {
} }
//chats for someone else //chats for someone else
else { else {
int client;
//get the team mate that will be the team leader //get the team mate that will be the team leader
trap_BotMatchVariable(match, TEAMMATE, teammate, sizeof(teammate)); trap_BotMatchVariable(match, TEAMMATE, teammate, sizeof(teammate));
client = FindClientByName(teammate); client = FindClientByName(teammate);
@ -1245,7 +1246,7 @@ BotMatch_LeadTheWay
void BotMatch_LeadTheWay(bot_state_t *bs, bot_match_t *match) { void BotMatch_LeadTheWay(bot_state_t *bs, bot_match_t *match) {
aas_entityinfo_t entinfo; aas_entityinfo_t entinfo;
char netname[MAX_MESSAGE_SIZE], teammate[MAX_MESSAGE_SIZE]; char netname[MAX_MESSAGE_SIZE], teammate[MAX_MESSAGE_SIZE];
int client, areanum, other; int client, other;
if (!TeamPlayIsOn()) return; if (!TeamPlayIsOn()) return;
//if not addressed to this bot //if not addressed to this bot
@ -1284,7 +1285,7 @@ void BotMatch_LeadTheWay(bot_state_t *bs, bot_match_t *match) {
BotEntityInfo(client, &entinfo); BotEntityInfo(client, &entinfo);
//if info is valid (in PVS) //if info is valid (in PVS)
if (entinfo.valid) { if (entinfo.valid) {
areanum = BotPointAreaNum(entinfo.origin); int areanum = BotPointAreaNum(entinfo.origin);
if (areanum && trap_AAS_AreaReachability(areanum)) { if (areanum && trap_AAS_AreaReachability(areanum)) {
bs->lead_teamgoal.entitynum = client; bs->lead_teamgoal.entitynum = client;
bs->lead_teamgoal.areanum = areanum; bs->lead_teamgoal.areanum = areanum;