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

* Replaced ALIGN macro with PAD

Browse source 
* Moved ALIGN16 macro from tr_local.h to ALIGN in q_shared.h
This commit is contained in:
Tim Angus 2005-12-05 17:32:54 +00:00
parent cfdd586ef8
commit 1704eecc52
6 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
code/botlib/be_aas_route.c
View file

@ -521,7 +521,8 @@ void AAS_CalculateAreaTravelTimes(void)
//
size += settings->numreachableareas * sizeof(unsigned short *);
//
size += settings->numreachableareas * ALIGN(revreach->numlinks) * sizeof(unsigned short);
size += settings->numreachableareas *
PAD(revreach->numlinks, sizeof(long)) * sizeof(unsigned short);
} //end for
//allocate memory for the area travel times
ptr = (char *) GetClearedMemory(size);
@ -541,7 +542,7 @@ void AAS_CalculateAreaTravelTimes(void)
for (l = 0; l < settings->numreachableareas; l++)
{
aasworld.areatraveltimes[i][l] = (unsigned short *) ptr;
ptr += ALIGN(revreach->numlinks) * sizeof(unsigned short);
ptr += PAD(revreach->numlinks, sizeof(long)) * sizeof(unsigned short);
//reachability link
reach = &aasworld.reachability[settings->firstreachablearea + l];
//

8
code/botlib/be_ai_chat.c
View file

@ -690,7 +690,7 @@ bot_synonymlist_t *BotLoadSynonyms(char *filename)
return NULL;
} //end if
len = strlen(token.string) + 1;
len = ALIGN(len);
len = PAD(len, sizeof(long));
size += sizeof(bot_synonym_t) + len;
if (pass)
{
@ -989,7 +989,7 @@ bot_randomlist_t *BotLoadRandomStrings(char *filename)
return NULL;
} //end if
len = strlen(token.string) + 1;
len = ALIGN(len);
len = PAD(len, sizeof(long));
size += sizeof(bot_randomlist_t) + len;
if (pass)
{
@ -1020,7 +1020,7 @@ bot_randomlist_t *BotLoadRandomStrings(char *filename)
return NULL;
} //end if
len = strlen(chatmessagestring) + 1;
len = ALIGN(len);
len = PAD(len, sizeof(long));
size += sizeof(bot_randomstring_t) + len;
if (pass)
{
@ -2123,7 +2123,7 @@ bot_chat_t *BotLoadInitialChat(char *chatfile, char *chatname)
return NULL;
} //end if
len = strlen(chatmessagestring) + 1;
len = ALIGN(len);
len = PAD(len, sizeof(long));
if (pass)
{
chatmessage = (bot_chatmessage_t *) ptr;