okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more alignment fixes

Browse source
This commit is contained in:
Ludwig Nussel 2005-11-02 21:46:05 +00:00
parent e3e3d8b9aa
commit 1c94cfbcbd
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
code/botlib/be_ai_chat.c
View file

@ -980,19 +980,21 @@ bot_randomlist_t *BotLoadRandomStrings(char *filename)
// //
while(PC_ReadToken(source, &token)) while(PC_ReadToken(source, &token))
{ {
size_t len;
if (token.type != TT_NAME) if (token.type != TT_NAME)
{ {
SourceError(source, "unknown random %s", token.string); SourceError(source, "unknown random %s", token.string);
FreeSource(source); FreeSource(source);
return NULL; return NULL;
} //end if } //end if
size += sizeof(bot_randomlist_t) + strlen(token.string) + 1; len = (strlen(token.string) + 1 +sizeof(void*)-1) & ~(sizeof(void*)-1);
size += sizeof(bot_randomlist_t) + len;
if (pass) if (pass)
{ {
random = (bot_randomlist_t *) ptr; random = (bot_randomlist_t *) ptr;
ptr += sizeof(bot_randomlist_t); ptr += sizeof(bot_randomlist_t);
random->string = ptr; random->string = ptr;
ptr += strlen(token.string) + 1; ptr += len;
strcpy(random->string, token.string); strcpy(random->string, token.string);
random->firstrandomstring = NULL; random->firstrandomstring = NULL;
random->numstrings = 0; random->numstrings = 0;
@ -1009,18 +1011,20 @@ bot_randomlist_t *BotLoadRandomStrings(char *filename)
} //end if } //end if
while(!PC_CheckTokenString(source, "}")) while(!PC_CheckTokenString(source, "}"))
{ {
size_t len;
if (!BotLoadChatMessage(source, chatmessagestring)) if (!BotLoadChatMessage(source, chatmessagestring))
{ {
FreeSource(source); FreeSource(source);
return NULL; return NULL;
} //end if } //end if
size += sizeof(bot_randomstring_t) + strlen(chatmessagestring) + 1; len = (strlen(chatmessagestring) + 1 +sizeof(void*)-1) & ~(sizeof(void*)-1);
size += sizeof(bot_randomstring_t) + len;
if (pass) if (pass)
{ {
randomstring = (bot_randomstring_t *) ptr; randomstring = (bot_randomstring_t *) ptr;
ptr += sizeof(bot_randomstring_t); ptr += sizeof(bot_randomstring_t);
randomstring->string = ptr; randomstring->string = ptr;
ptr += strlen(chatmessagestring) + 1; ptr += len;
strcpy(randomstring->string, chatmessagestring); strcpy(randomstring->string, chatmessagestring);
// //
random->numstrings++; random->numstrings++;
@ -2125,7 +2129,7 @@ bot_chat_t *BotLoadInitialChat(char *chatfile, char *chatname)
ptr += sizeof(bot_chatmessage_t); ptr += sizeof(bot_chatmessage_t);
chatmessage->chatmessage = ptr; chatmessage->chatmessage = ptr;
strcpy(chatmessage->chatmessage, chatmessagestring); strcpy(chatmessage->chatmessage, chatmessagestring);
ptr += strlen(chatmessagestring) + 1; ptr += (strlen(chatmessagestring) + 1 +sizeof(void*)-1) & ~(sizeof(void*)-1);
//the number of chat messages increased //the number of chat messages increased
chattype->numchatmessages++; chattype->numchatmessages++;
} //end if } //end if