Merge branch 'master' into menu_for_real

source/sw/src/game.cpp

@@ -4807,23 +4807,20 @@ void G_Polymer_UnInit(void) { }
 
 #include "saveable.h"
 
+saveable_module saveable_build{};
+
+void Saveable_Init_Dynamic()
+{
     static saveable_data saveable_build_data[] =
     {
-    SAVE_DATA(sector),
+        {sector, MAXSECTORS*sizeof(sectortype)},
-    SAVE_DATA(sprite),
+        {sprite, MAXSPRITES*sizeof(spritetype)},
-    SAVE_DATA(wall)
+        {wall, MAXWALLS*sizeof(walltype)},
     };
 
-saveable_module saveable_build =
+    saveable_build.data = saveable_build_data;
-{
+    saveable_build.numdata = NUM_SAVEABLE_ITEMS(saveable_build_data);
-    // code
+}
-    NULL,
-    0,
-
-    // data
-    saveable_build_data,
-    NUM_SAVEABLE_ITEMS(saveable_build_data)
-};
 
 /*extern*/ bool GameInterface::validate_hud(int requested_size) { return requested_size; }
 /*extern*/ void GameInterface::set_hud_layout(int requested_size) { /* the relevant setting is gs.BorderNum */}

source/sw/src/menus.cpp

@@ -522,7 +522,7 @@ MenuGroup LoadGameGroup = {100, 5, "^Load Game", load_i, pic_loadgame, 0, m_defs
 #define MAIN_XSTART 55
 #define MAIN_LINE(line) (MAIN_YSTART + (MAIN_YOFF * line))
 
-#define MAIN_MENU_COOL_STUFF "^Cool Stuff"
+#define MAIN_MENU_COOL_STUFF "^Credits"
 #define MAIN_MENU_HOW_TO_ORDER "^How to Order"
 
 MenuItem main_i[] =
@@ -1259,29 +1259,24 @@ MNU_OrderCustom(UserCall call, MenuItem *item)
 
     static short RegOrderScreen[] =
     {
-        5262,
+        // 5262,
-        5261,
+        // 5261,
-        4979,
         5111,
         5118,
+        4979,
         5113,
-        //5111,
-        //5118,
-        //4979,
-        //5261,
-        //5262
 
         5120 // 5114    // JBF: for my credits
     };
     static short SWOrderScreen[] =
     {
-        5262,
         5110,
         5112,
-        5113,
+        // 5262,
         5111,
         5118,
         4979,
+        5113,
 
         5120 // 5114    // JBF: for my credits
     };

source/sw/src/saveable.cpp

@@ -38,6 +38,8 @@ void Saveable_Init(void)
 {
     if (nummodules > 0) return;
 
+    Saveable_Init_Dynamic();
+
 #define MODULE(x) { \
         extern saveable_module saveable_ ## x; \
         saveablemodules[nummodules++] = &saveable_ ## x; \

source/sw/src/saveable.h

@@ -24,6 +24,7 @@
 #ifndef SAVEABLE_H
 #define SAVEABLE_H
 
+#include "compat.h"
 
 typedef void *saveable_code;
 
@@ -42,10 +43,16 @@ typedef struct
     unsigned int numdata;
 } saveable_module;
 
-#define SAVE_CODE(s) (void*)s
+template <typename T>
-#define SAVE_DATA(s) { (void*)&s, sizeof(s) }
+static FORCE_INLINE constexpr enable_if_t<!std::is_pointer<T>::value, size_t> SAVE_SIZEOF(T const & obj) noexcept
+{
+    return sizeof(obj);
+}
 
-#define NUM_SAVEABLE_ITEMS(x) (sizeof(x)/sizeof(x[0]))
+#define SAVE_CODE(s) (void*)(s)
+#define SAVE_DATA(s) { (void*)&(s), SAVE_SIZEOF(s) }
+
+#define NUM_SAVEABLE_ITEMS(x) ARRAY_SIZE(x)
 
 typedef struct
 {
@@ -61,6 +68,7 @@ typedef struct
 } saveddatasym;
 
 void Saveable_Init(void);
+void Saveable_Init_Dynamic(void);
 
 int Saveable_FindCodeSym(void *ptr, savedcodesym *sym);
 int Saveable_FindDataSym(void *ptr, saveddatasym *sym);