From f9a90e6f3387649dce5e70be71f85667680219c6 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Fri, 1 Dec 2017 06:19:15 +0000 Subject: [PATCH] Add anticipatory fields to ud; bump BYTEVERSION. git-svn-id: https://svn.eduke32.com/eduke32@6531 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/duke3d/src/duke3d.h | 4 ++-- source/duke3d/src/game.h | 3 +++ source/duke3d/src/savegame.cpp | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/source/duke3d/src/duke3d.h b/source/duke3d/src/duke3d.h index cf584a6f0..1201af6cb 100644 --- a/source/duke3d/src/duke3d.h +++ b/source/duke3d/src/duke3d.h @@ -66,10 +66,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // increase by 3, because atomic GRP adds 1, and Shareware adds 2 #ifdef LUNATIC // Lunatic -# define BYTEVERSION_EDUKE32 318 +# define BYTEVERSION_EDUKE32 321 #else // Non-Lua build -# define BYTEVERSION_EDUKE32 318 +# define BYTEVERSION_EDUKE32 321 #endif //#define BYTEVERSION_13 27 diff --git a/source/duke3d/src/game.h b/source/duke3d/src/game.h index 9a4883aff..3df7edd7a 100644 --- a/source/duke3d/src/game.h +++ b/source/duke3d/src/game.h @@ -158,6 +158,7 @@ typedef struct { int32_t m_respawn_items,m_respawn_monsters,m_respawn_inventory,m_recstat,m_monsters_off,detail; int32_t m_ffire,ffire,m_player_skill,m_level_number,m_volume_number,multimode; int32_t player_skill,level_number,volume_number,m_marker,marker,mouseflip; + int32_t music_episode, music_level; vec2_t m_origin; int32_t playerbest; @@ -240,6 +241,8 @@ typedef struct { char display_bonus_screen; char show_level_text; char wchoice[MAX_WEAPONS]; + + uint8_t user_map; } user_defs; extern user_defs ud; diff --git a/source/duke3d/src/savegame.cpp b/source/duke3d/src/savegame.cpp index da9196755..2f455095e 100644 --- a/source/duke3d/src/savegame.cpp +++ b/source/duke3d/src/savegame.cpp @@ -1005,7 +1005,10 @@ static const dataspec_t svgm_udnetw[] = { DS_NOCHK, &ud.volume_number, sizeof(ud.volume_number), 1 }, { DS_NOCHK, &ud.level_number, sizeof(ud.level_number), 1 }, + { DS_NOCHK, &ud.user_map, sizeof(ud.user_map), 1 }, { DS_NOCHK, &ud.player_skill, sizeof(ud.player_skill), 1 }, + { DS_NOCHK, &ud.music_episode, sizeof(ud.music_episode), 1 }, + { DS_NOCHK, &ud.music_level, sizeof(ud.music_level), 1 }, { DS_NOCHK, &ud.from_bonus, sizeof(ud.from_bonus), 1 }, { DS_NOCHK, &ud.secretlevel, sizeof(ud.secretlevel), 1 },