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

(svn r1429) Change: bumped savegame to revision 5.

Browse Source 
- Now orders are bigger
   - Now _map2 is official 16 bits
This commit is contained in:
truelight
2005-01-08 12:47:26 +00:00
parent 3be9515d84
commit 788f543bc3
3 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
vehicle.h
View File

@@ -4,27 +4,31 @@
#include "vehicle_gui.h"
typedef struct Order {
#ifdef TTD_LITTLE_ENDIAN /* XXX hack to avoid savegame revision bump */
uint8 type:4;
uint8 flags:4;
#else
uint8 flags:4;
uint8 type:4;
#endif
uint8 type;
uint8 flags;
uint16 station;
} Order;
static inline uint16 PackOrder(const Order *order)
static inline uint32 PackOrder(const Order *order)
{
return order->station << 8 | order->flags << 4 | order->type;
return order->station << 16 | order->flags << 8 | order->type;
}
static inline Order UnpackOrder(uint16 packed)
static inline Order UnpackOrder(uint32 packed)
{
Order order;
order.type = (packed & 0x000f);
order.flags = (packed & 0x00f0) >> 4,
order.station = (packed & 0xff00) >> 8;
order.type = (packed & 0x000000FF);
order.flags = (packed & 0x0000FF00) >> 8;
order.station = (packed & 0xFFFF0000) >> 16;
return order;
}
static inline Order UnpackVersion4Order(uint16 packed)
{
Order order;
order.type = (packed & 0x000F);
order.flags = (packed & 0x00F0) >> 4;
order.station = (packed & 0xFF00) >> 8;
return order;
}