zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-29 02:10:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

- … and for Exhumed

Browse source 
This game does not implement follow mode.
Note: Follow mode needs to be simplified across games!
This commit is contained in:
Christoph Oelckers 2020-08-24 19:54:26 +02:00
parent 0ee042fb60
commit e158775e67
7 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/exhumed/src/exhumed.cpp
View file

@ -167,9 +167,6 @@ short nCurBodyNum = 0;
short nBodyTotal = 0; short nBodyTotal = 0;
short lastfps; short lastfps;
short nMapMode = 0;
short nTotalPlayers = 1; short nTotalPlayers = 1;
// TODO: Rename this (or make it static) so it doesn't conflict with library function // TODO: Rename this (or make it static) so it doesn't conflict with library function
//short socket = 0; //short socket = 0;

5
source/exhumed/src/exhumed.h
View file

@ -188,11 +188,6 @@ extern short nBodyTotal;
extern short bSnakeCam; extern short bSnakeCam;
extern uint8_t nCinemaSeen; extern uint8_t nCinemaSeen;
//extern short nScreenWidth;
//extern short nScreenHeight;
extern short nMapMode;
extern short nButtonColor; extern short nButtonColor;
extern short nHeadStage; extern short nHeadStage;

2
source/exhumed/src/gameloop.cpp
View file

@ -74,7 +74,7 @@ static int FinishLevel(TArray<JobDesc> &jobs)
StopAllSounds(); StopAllSounds();
bCamera = false; bCamera = false;
nMapMode = 0; automapMode = am_off;
STAT_Update(lnum == kMap20); STAT_Update(lnum == kMap20);
if (lnum != kMap20) if (lnum != kMap20)

2
source/exhumed/src/gun.cpp
View file

@ -958,7 +958,7 @@ void DrawWeapons(double smooth)
nPal = RemapPLU(nPal); nPal = RemapPLU(nPal);
double xOffset, yOffset; double xOffset = 0, yOffset = 0;
if (cl_weaponsway) if (cl_weaponsway)
{ {

6
source/exhumed/src/input.cpp
View file

@ -128,7 +128,7 @@ void UpdateInputs()
void CheckKeys() void CheckKeys()
{ {
if (!nMapMode) if (automapMode == am_off)
{ {
if (buttonMap.ButtonDown(gamefunc_Enlarge_Screen)) if (buttonMap.ButtonDown(gamefunc_Enlarge_Screen))
{ {
@ -191,11 +191,11 @@ void CheckKeys2()
buttonMap.ClearButton(gamefunc_Map); buttonMap.ClearButton(gamefunc_Map);
if (!nFreeze) { if (!nFreeze) {
nMapMode = (nMapMode + 1) % 3; automapMode = (automapMode + 1) % 3;
} }
} }
if (nMapMode != 0) if (automapMode != am_off)
{ {
int const timerOffset = ((int)totalclock - nonsharedtimer); int const timerOffset = ((int)totalclock - nonsharedtimer);
nonsharedtimer += timerOffset; nonsharedtimer += timerOffset;

8
source/exhumed/src/map.cpp
View file

@ -335,7 +335,7 @@ static void G_DrawOverheadMap(int32_t cposx, int32_t cposy, int32_t czoom, int16
if (sector[wal->nextsector].ceilingz == z1 && sector[wal->nextsector].floorz == z2) if (sector[wal->nextsector].ceilingz == z1 && sector[wal->nextsector].floorz == z2)
if (((wal->cstat|wall[wal->nextwall].cstat)&(16+32)) == 0) continue; if (((wal->cstat|wall[wal->nextwall].cstat)&(16+32)) == 0) continue;
if (nMapMode == 2) if (automapMode == am_full)
col = 111; col = 111;
else else
col = 111 - min(klabs(z2 - nPlayerZ) >> 13, 12); col = 111 - min(klabs(z2 - nPlayerZ) >> 13, 12);
@ -364,7 +364,7 @@ static void G_DrawOverheadMap(int32_t cposx, int32_t cposy, int32_t czoom, int16
endwall = sector[i].wallptr + sector[i].wallnum; endwall = sector[i].wallptr + sector[i].wallnum;
z2 = sector[i].floorz; z2 = sector[i].floorz;
if (nMapMode == 2) if (automapMode == am_full)
{ {
col = 111; col = 111;
} }
@ -465,9 +465,9 @@ void UpdateMap()
void DrawMap() void DrawMap()
{ {
if (!nFreeze && nMapMode) { if (!nFreeze && automapMode != am_off) {
//drawoverheadmap(initx, inity, lMapZoom, inita); //drawoverheadmap(initx, inity, lMapZoom, inita);
if (nMapMode == 2) if (automapMode == am_full)
{ {
twod->ClearScreen(); twod->ClearScreen();
renderDrawMapView(initx, inity, lMapZoom, inita); renderDrawMapView(initx, inity, lMapZoom, inita);

2
source/exhumed/src/player.cpp
View file

@ -453,7 +453,7 @@ void InitPlayerInventory(short nPlayer)
PlayerList[nPlayer].nCurrentWeapon = 0; PlayerList[nPlayer].nCurrentWeapon = 0;
if (nPlayer == nLocalPlayer) { if (nPlayer == nLocalPlayer) {
nMapMode = 0; automapMode = am_off;
} }
nPlayerScore[nPlayer] = 0; nPlayerScore[nPlayer] = 0;