diff --git a/source/duke3d/src/menus.cpp b/source/duke3d/src/menus.cpp index 7cfbe9b34..19002071e 100644 --- a/source/duke3d/src/menus.cpp +++ b/source/duke3d/src/menus.cpp @@ -2214,7 +2214,7 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin) #ifndef EDUKE32_SIMPLE_MENU Bsprintf(tempbuf,"Saved: %d.%d.%d %d-bit", savehead.majorver, savehead.minorver, - savehead.bytever, 8*savehead.ptrsize); + savehead.bytever, 8*savehead.getPtrSize()); mgametext(origin.x + (31<<16), origin.y + (104<<16), tempbuf); Bsprintf(tempbuf,"Our: %d.%d.%d %d-bit", SV_MAJOR_VER, SV_MINOR_VER, BYTEVERSION, (int32_t)(8*sizeof(intptr_t))); @@ -2274,7 +2274,7 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin) #ifndef EDUKE32_SIMPLE_MENU Bsprintf(tempbuf,"Saved: %d.%d.%d %d-bit", savehead.majorver, savehead.minorver, - savehead.bytever, 8*savehead.ptrsize); + savehead.bytever, 8*savehead.getPtrSize()); mgametext(origin.x + (31<<16), origin.y + (104<<16), tempbuf); Bsprintf(tempbuf,"Our: %d.%d.%d %d-bit", SV_MAJOR_VER, SV_MINOR_VER, BYTEVERSION, (int32_t)(8*sizeof(intptr_t))); diff --git a/source/duke3d/src/savegame.cpp b/source/duke3d/src/savegame.cpp index 7fe9fe61d..6631b51af 100644 --- a/source/duke3d/src/savegame.cpp +++ b/source/duke3d/src/savegame.cpp @@ -1483,11 +1483,11 @@ int32_t sv_loadheader(int32_t fil, int32_t spot, savehead_t *h) } } - if (h->ptrsize != sizeof(intptr_t)) + if (h->getPtrSize() != sizeof(intptr_t)) { if (havedemo) OSD_Printf("Demo incompatible. Expected pointer size %d, found %d\n", - (int32_t)sizeof(intptr_t), h->ptrsize); + (int32_t)sizeof(intptr_t), h->getPtrSize()); Bmemset(h->headerstr, 0, sizeof(h->headerstr)); return -4; diff --git a/source/duke3d/src/savegame.h b/source/duke3d/src/savegame.h index b98d08c25..17454b575 100644 --- a/source/duke3d/src/savegame.h +++ b/source/duke3d/src/savegame.h @@ -58,6 +58,9 @@ typedef struct #ifdef __ANDROID__ char skillname[32], volname[32]; #endif + + uint8_t getPtrSize() const { return ptrsize & 0x7Fu; } + bool isAutoSave() const { return !!(ptrsize & (1u<<7u)); } } savehead_t; #pragma pack(pop)