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

fixes

Browse source
This commit is contained in:
Walter Julius Hennecke 2013-05-24 23:46:24 +02:00
parent a5696398a1
commit dc381580c1
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
code/game/g_active.c
View file

@ -496,8 +496,6 @@ currently in it....
==================
*/
/*@null@*/ list_iter_p iterTimedMessages;
/**
* \author Ubergames
*/
@ -509,14 +507,14 @@ static char *TimedMessage( void ){
return "^1RPG-X ERROR: No messages to display";
}
if(iterTimedMessages == NULL) {
iterTimedMessages = level.timedMessages->iterator(level.timedMessages, LIST_FRONT);
if(iterTimedMessages == NULL) { // something went wrong
if(level.iterTimedMessages == NULL) {
level.iterTimedMessages = level.timedMessages->iterator(level.timedMessages, LIST_FRONT);
if(level.iterTimedMessages == NULL) { // something went wrong
return "^1RPG-X ERROR: No messages to display";
}
}
c = level.timedMessages->cycl_next(iterTimedMessages);
c = level.timedMessages->cycl_next(level.iterTimedMessages);
message = c->data;
return message;

3
code/game/g_local.h
View file

@ -727,7 +727,8 @@ typedef struct {
/*@shared@*/ /*@null@*/ list_p safezones; /*!< self destruct safezones list */
/*@shared@*/ /*@null@*/ list_p locations; /*!< level locations list */
/*@shared@*/ /*@null@*/ list_p timedMessages; /*!< timed messages list */
/*@shared@*/ /*@null@*/ list_p timedMessages; /*!< timed messages list */
/*@shared@*/ /*@null@*/ list_iter_p iterTimedMessages;
// other stuff
srvChangeData_t srvChangeData; /*!< Server change data */

4
code/game/g_main.c
View file

@ -1953,8 +1953,6 @@ void G_InitGame( int levelTime, unsigned int randomSeed, int restart ) {
}
extern list_iter_p iterTimedMessages; /* list iterator for timed messages */
void G_ShutdownGame( int restart ) {
G_Printf ("==== ShutdownGame ====\n");
@ -1983,7 +1981,7 @@ void G_ShutdownGame( int restart ) {
destroy_list(level.timedMessages);
}
destroy_iterator(iterTimedMessages);
destroy_iterator(level.iterTimedMessages);
#ifdef SQL
G_Sql_Shutdown();