TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix loading of older save files

Browse source 
struct player_rw offsets must not change within a savefile version
This commit is contained in:
Kp 2013-09-21 17:36:20 +00:00
parent 53c8c2f812
commit 83df42af8e
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/main/player.h
View file

@ -165,14 +165,15 @@ typedef struct player_rw {
#if defined(DXX_BUILD_DESCENT_I)
ubyte primary_weapon_flags; // bit set indicates the player has this weapon.
ubyte secondary_weapon_flags; // bit set indicates the player has this weapon.
ushort laser_ammo;
#elif defined(DXX_BUILD_DESCENT_II)
ushort primary_weapon_flags; // bit set indicates the player has this weapon.
ushort secondary_weapon_flags; // bit set indicates the player has this weapon.
#endif
ushort laser_ammo;
ushort vulcan_ammo;
#if defined(DXX_BUILD_DESCENT_I)
ushort spreadfire_ammo, plasma_ammo, fusion_ammo;
#if defined(DXX_BUILD_DESCENT_II)
ushort obsolete_primary_ammo[MAX_PRIMARY_WEAPONS - 5];
#endif
ushort secondary_ammo[MAX_SECONDARY_WEAPONS]; // How much ammo of each type.
@ -207,6 +208,11 @@ typedef struct player_rw {
sbyte hours_level; // Hours played (since time_total can only go up to 9 hours)
sbyte hours_total; // Hours played (since time_total can only go up to 9 hours)
} __pack__ player_rw;
#if defined(DXX_BUILD_DESCENT_I)
typedef char player_rw_padding_check[sizeof(player_rw) == 116 ? 1 : -1];
#elif defined(DXX_BUILD_DESCENT_II)
typedef char player_rw_padding_check[sizeof(player_rw) == 142 ? 1 : -1];
#endif
#endif
#define N_PLAYER_GUNS 8