From d947cc4765a1071e0168d2e8425d61f869fd9bcc Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 6 Sep 2020 10:22:05 +0200 Subject: [PATCH] - also took out the zoom variable so that no automap data remains in the playsim code. --- source/games/duke/src/gameloop.cpp | 1 - source/games/duke/src/premap.cpp | 1 - source/games/duke/src/savegame.cpp | 1 - source/games/duke/src/types.h | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/source/games/duke/src/gameloop.cpp b/source/games/duke/src/gameloop.cpp index 8ca735402..dc7c23e56 100644 --- a/source/games/duke/src/gameloop.cpp +++ b/source/games/duke/src/gameloop.cpp @@ -147,7 +147,6 @@ void GameInterface::Startup() void GameInterface::Render() { - ps[myconnectindex].zoom = GetAutomapZoom(ps[myconnectindex].zoom); drawtime.Reset(); drawtime.Clock(); videoSetBrightness(thunder_brightness); diff --git a/source/games/duke/src/premap.cpp b/source/games/duke/src/premap.cpp index 83f4f9bdb..740321101 100644 --- a/source/games/duke/src/premap.cpp +++ b/source/games/duke/src/premap.cpp @@ -775,7 +775,6 @@ void donewgame(MapRecord* map, int sk) ud.last_level = -1; - p->zoom = 768; M_ClearMenus(); ResetGameVars(); diff --git a/source/games/duke/src/savegame.cpp b/source/games/duke/src/savegame.cpp index 46f84ab6e..9f83148ac 100644 --- a/source/games/duke/src/savegame.cpp +++ b/source/games/duke/src/savegame.cpp @@ -124,7 +124,6 @@ FSerializer& Serialize(FSerializer& arc, const char* keyname, player_struct& w, ("pals", w.pals) ("fricx", w.fric.x) ("fricy", w.fric.y) - ("zoom", w.zoom) ("exitx", w.exitx) ("exity", w.exity) ("numloogs", w.numloogs) diff --git a/source/games/duke/src/types.h b/source/games/duke/src/types.h index 76734e834..5aaabaf4f 100644 --- a/source/games/duke/src/types.h +++ b/source/games/duke/src/types.h @@ -123,7 +123,7 @@ struct player_struct short psectlotag; // From here on it is unaltered from JFDuke with the exception of a few fields that are no longer needed and were removed. - int zoom, exitx, exity, loogiex[64], loogiey[64], numloogs, loogcnt; + int exitx, exity, loogiex[64], loogiey[64], numloogs, loogcnt; int invdisptime; int bobposx, bobposy, oposx, oposy, oposz, pyoff, opyoff; int posxv, posyv, poszv, last_pissed_time, truefz, truecz;