* Replaced ALIGN macro with PAD
* Moved ALIGN16 macro from tr_local.h to ALIGN in q_shared.h
This commit is contained in:
parent
cfdd586ef8
commit
1704eecc52
6 changed files with 25 additions and 24 deletions
|
@ -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];
|
||||
//
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue