- SW: save the player and related data as JSON.

ZDoom · Apr 21, 2021 · 06b03f7 · 06b03f7
1 parent 9bae229
commit 06b03f7
Show file tree

Hide file tree

Showing 3 changed files with 395 additions and 280 deletions.
diff --git a/source/games/sw/src/cheats.cpp b/source/games/sw/src/cheats.cpp
@@ -196,7 +196,7 @@ static cheatseq_t swcheats[] = {
 static void WeaponCheat(int player)
 {
     auto p = &Player[player];
-    auto u = User[p->PlayerSprite];
+    auto u = User[p->PlayerSprite].Data();
 
     if (!TEST(p->Flags, PF_TWO_UZI))
     {
@@ -280,7 +280,7 @@ static void cmd_Give(int player, uint8_t** stream, bool skip)
     case GIVE_AMMO:
     {
         auto p = &Player[player];
-        auto u = User[p->PlayerSprite];
+        auto u = User[p->PlayerSprite].Data();
 
         p->WpnShotgunAuto = 50;
         p->WpnRocketHeat = 5;

diff --git a/source/games/sw/src/game.h b/source/games/sw/src/game.h
@@ -851,13 +851,6 @@ struct PLAYERstruct
     int slide_dec;
     float drive_avel;
 
-
-
-    // scroll 2D mode stuff
-    int scr_x, scr_y, oscr_x, oscr_y;
-    int scr_xvect, scr_yvect;
-    short scr_ang, oscr_ang, scr_sectnum;
-
     short view_outside_dang;  // outside view delta ang
     short circle_camera_ang;
     short camera_check_time_delay;
@@ -989,7 +982,7 @@ struct PLAYERstruct
     short Heads;                    // Number of Accursed Heads orbiting player
     int PlayerVersion;
 
-    char cookieQuote[256];          // Should be an FString but must be POD for now to be storable in a savegame.
+    char cookieQuote[256];          // Should be an FString but must be POD for now so that PLAYER remains POD.
     int cookieTime;
 
     char WpnReloadState;