dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r957) -Fix: vehicle.c compiler problems for MSVC6 only! (Tron)

Browse Source
This commit is contained in:
darkvater
2004-12-05 19:50:58 +00:00
parent 7c2448ecea
commit 78b651c2c9
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vehicle.c
View File

@@ -1593,7 +1593,11 @@ const byte _common_veh_desc[] = {
SLE_VAR(Vehicle,cur_order_index, SLE_UINT8),
SLE_VAR(Vehicle,num_orders, SLE_UINT8),
SLE_VAR(Vehicle,current_order, SLE_UINT8), /* XXX hack to avoid version bump */
#if _MSC_VER != 1200
SLE_VAR(Vehicle,current_order.station, SLE_UINT8),
#else /* XXX workaround for MSVC6 */
SLE_VAR2(Vehicle, current_order, Order, station, SLE_UINT8),
#endif
SLE_REF(Vehicle,schedule_ptr, REF_SCHEDULE),
SLE_VAR(Vehicle,age, SLE_UINT16),
@@ -1737,7 +1741,11 @@ static const byte _disaster_desc[] = {
SLE_VAR(Vehicle,z_height, SLE_UINT8),
SLE_VAR(Vehicle,owner, SLE_UINT8),
SLE_VAR(Vehicle,vehstatus, SLE_UINT8),
#if _MSC_VER != 1200
SLE_VAR(Vehicle,current_order.station, SLE_UINT8),
#else /* XXX workaround for MSVC6 */
SLE_VAR2(Vehicle, current_order, Order, station, SLE_UINT8),
#endif
SLE_VAR(Vehicle,cur_image, SLE_UINT16),
SLE_VAR(Vehicle,age, SLE_UINT16),