ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2025-04-22 08:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixes

Browse source
This commit is contained in:
Walter Julius Hennecke 2013-06-07 23:54:28 +02:00
parent 29385ff04b
commit 38ca9cc6c5
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/game/g_local.h
View file

@ -3396,10 +3396,10 @@ luaAlertState_t* luaAlertState;
/* alert shaders */
typedef struct {
char* greenShaders[10];
char* redShaders[10];
char* yellowShaders[10];
char* blueShaders[10];
/*@null@*/ char* greenShaders[10];
/*@null@*/ char* redShaders[10];
/*@null@*/ char* yellowShaders[10];
/*@null@*/ char* blueShaders[10];
int numShaders;
} target_alert_Shaders_s;

21
code/game/g_target.c
View file

@ -2024,7 +2024,7 @@ void target_alert_remapShaders(int target_condition) {
}
void target_alert_use(/*@shared@*/ gentity_t *ent, /*@shared@*/ gentity_t *other, /*@shared@*/ gentity_t *activator) {
void target_alert_use(/*@shared@*/ gentity_t *ent, /*@shared@*/ /*@unused@*/ gentity_t *other, /*@shared@*/ gentity_t *activator) {
gentity_t *healthEnt;
@ -2303,8 +2303,8 @@ void target_alert_parseShaders(/*@shared@*/ gentity_t *ent) {
Q_strncpyz(buffer, ent->message, strlen(ent->message));
txtPtr = buffer;
token = COM_Parse(&txtPtr);
while(1) {
if(token[0] == 0) {
while(qtrue) {
if(token == NULL || token[0] == 0) {
break;
}
alertShaders.greenShaders[alertShaders.numShaders] = G_NewString(token);
@ -2321,7 +2321,7 @@ void target_alert_parseShaders(/*@shared@*/ gentity_t *ent) {
txtPtr = buffer;
token = COM_Parse(&txtPtr);
while(1) {
if(token[0] == 0) {
if(token == NULL || token[0] == 0) {
break;
}
alertShaders.redShaders[currentNum] = G_NewString(token);
@ -2344,8 +2344,8 @@ void target_alert_parseShaders(/*@shared@*/ gentity_t *ent) {
Q_strncpyz(buffer, ent->model2, strlen(ent->model2));
txtPtr = buffer;
token = COM_Parse(&txtPtr);
while(1) {
if(token[0] == 0) {
while(qtrue) {
if(token == NULL || token[0] == 0) {
break;
}
alertShaders.blueShaders[currentNum] = G_NewString(token);
@ -2368,8 +2368,8 @@ void target_alert_parseShaders(/*@shared@*/ gentity_t *ent) {
Q_strncpyz(buffer, ent->team, strlen(ent->team));
txtPtr = buffer;
token = COM_Parse(&txtPtr);
while(1) {
if(token[0] == 0) {
while(qtrue) {
if(token == NULL || token[0] == 0) {
break;
}
alertShaders.yellowShaders[currentNum] = G_NewString(token);
@ -2421,10 +2421,11 @@ void SP_target_alert(gentity_t *ent) {
return;
}
if(!ent->wait)
if(ent->wait <= 0.0f) {
ent->wait = 1000;
else
} else {
ent->wait *= 1000;
}
ent->use = target_alert_use;