ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2024-12-01 00:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

found the bug. alignment reenabled.

Browse source
This commit is contained in:
Ludwig Nussel 2005-11-03 22:32:39 +00:00
parent 2984b5bea2
commit b0dfb2579b
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
code/botlib/be_ai_chat.c
View file

@ -20,13 +20,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
=========================================================================== ===========================================================================
*/ */
#if 0 #if 1
#define ALIGN(x) \ #define ALIGN(x) \
do { \ do { \
size_t oldx = x; \
x = (x+sizeof(void*)-1) & ~(sizeof(void*)-1L); \ x = (x+sizeof(void*)-1) & ~(sizeof(void*)-1L); \
if(x != oldx) \
botimport.Print(PRT_MESSAGE, "size %zd -> %zd\n", oldx, x); \
} while(0) } while(0)
#else #else
#define ALIGN(x) #define ALIGN(x)
@ -2128,14 +2125,16 @@ bot_chat_t *BotLoadInitialChat(char *chatfile, char *chatname)
//read the chat messages //read the chat messages
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
len = strlen(chatmessagestring) + 1;
ALIGN(len);
if (pass) if (pass)
{ {
size_t len;
chatmessage = (bot_chatmessage_t *) ptr; chatmessage = (bot_chatmessage_t *) ptr;
chatmessage->time = -2*CHATMESSAGE_RECENTTIME; chatmessage->time = -2*CHATMESSAGE_RECENTTIME;
//put the chat message in the list //put the chat message in the list
@ -2145,13 +2144,11 @@ 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);
len = strlen(chatmessagestring) + 1;
ALIGN(len);
ptr += len; ptr += len;
//the number of chat messages increased //the number of chat messages increased
chattype->numchatmessages++; chattype->numchatmessages++;
} //end if } //end if
size += sizeof(bot_chatmessage_t) + strlen(chatmessagestring) + 1; size += sizeof(bot_chatmessage_t) + len;
} //end if } //end if
} //end while } //end while
} //end if } //end if