petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r8276) -Fix

Browse Source 
Change the signature of Swap() to be less error prone, i.e. pass the variables to be swapped by reference instead of passing pointers to the variables.
Just do Swap(x, y) instead of Swap(&x, &y). This prevents accidents when the variables are pointers.
This commit is contained in:
tron
2007-01-19 11:47:48 +00:00
parent 7af3094bc3
commit b2def96248
6 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/train_cmd.cpp
View File

@@ -1594,19 +1594,17 @@ static void ReverseTrainSwapVeh(Vehicle *v, int l, int r)
a->vehstatus = tmp;
}
/* swap variables */
SwapT(&a->u.rail.track, &b->u.rail.track);
SwapT(&a->direction, &b->direction);
Swap(a->u.rail.track, b->u.rail.track);
Swap(a->direction, b->direction);
/* toggle direction */
if (!(a->u.rail.track & 0x80)) a->direction = ReverseDir(a->direction);
if (!(b->u.rail.track & 0x80)) b->direction = ReverseDir(b->direction);
/* swap more variables */
SwapT(&a->x_pos, &b->x_pos);
SwapT(&a->y_pos, &b->y_pos);
SwapT(&a->tile, &b->tile);
SwapT(&a->z_pos, &b->z_pos);
Swap(a->x_pos, b->x_pos);
Swap(a->y_pos, b->y_pos);
Swap(a->tile, b->tile);
Swap(a->z_pos, b->z_pos);
SwapTrainFlags(&a->u.rail.flags, &b->u.rail.flags);