zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-27 22:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Exhumed's map.

Browse source
This commit is contained in:
Christoph Oelckers 2021-04-16 20:10:46 +02:00
parent fed15a79e4
commit a43259c40c
1 changed files with 75 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

155
source/games/exhumed/src/2d.cpp
View file

@ -629,10 +629,8 @@ class DMapScreen : public DScreenJob
{ {
int i; int i;
int x = 0; int x = 0;
int var_2C = 0; int delta = 0;
int nIdleSeconds = 0; int nIdleSeconds = 0;
int startTime = 0;
int runtimer = 0;
int curYPos, destYPos; int curYPos, destYPos;
int nLevel, nLevelNew, nLevelBest; int nLevel, nLevelNew, nLevelBest;
@ -644,11 +642,11 @@ public:
destYPos = MapLevelOffsets[nLevelNew] + (200 * (nLevelNew / 2)); destYPos = MapLevelOffsets[nLevelNew] + (200 * (nLevelNew / 2));
if (curYPos < destYPos) { if (curYPos < destYPos) {
var_2C = 2; delta = 2;
} }
if (curYPos > destYPos) { if (curYPos > destYPos) {
var_2C = -2; delta = -2;
} }
// Trim smoke in widescreen // Trim smoke in widescreen
@ -663,19 +661,12 @@ public:
#endif #endif
} }
int Frame(uint64_t clock, bool skiprequest) override void Draw(double smoothratio)
{ {
int currentclock = int(clock * 120 / 1'000'000'000); int currentclock = int((ticks + smoothratio) * 120 / GameTicRate);
twod->ClearScreen(); twod->ClearScreen();
if ((currentclock - startTime) / kTimerTicks)
{
nIdleSeconds++;
startTime = currentclock;
}
int tileY = curYPos; int tileY = curYPos;
// Draw the background screens // Draw the background screens
@ -739,84 +730,82 @@ public:
DrawAbs(nTile, textX, textY, shade); DrawAbs(nTile, textX, textY, shade);
} }
if (curYPos != destYPos)
{
// scroll the map every couple of ms
if (currentclock - runtimer >= (kTimerTicks / 32)) {
curYPos += var_2C;
runtimer = currentclock;
}
if (inputState.CheckAllInput())
{
if (var_2C < 8) {
var_2C *= 2;
}
}
if (curYPos > destYPos&& var_2C > 0) {
curYPos = destYPos;
}
if (curYPos < destYPos && var_2C < 0) {
curYPos = destYPos;
}
nIdleSeconds = 0;
}
selectedlevelnew = nLevelNew + 1; selectedlevelnew = nLevelNew + 1;
return skiprequest? -1 : nIdleSeconds < 12? 1 : 0;
} }
bool ProcessInput() override void OnTick() override
{
if (curYPos != destYPos)
{
// scroll the map every couple of ms
curYPos += delta;
if (curYPos > destYPos && delta > 0) {
curYPos = destYPos;
}
if (curYPos < destYPos && delta < 0) {
curYPos = destYPos;
}
nIdleSeconds = 0;
}
else nIdleSeconds++;
if (nIdleSeconds > 300) state = finished;
}
bool OnEvent(event_t* ev) override
{ {
if (buttonMap.ButtonDown(gamefunc_Move_Forward)) int key = ev->data1;
{ if (ev->type == EV_KeyDown)
buttonMap.ClearButton(gamefunc_Move_Forward); {
auto binding = Bindings.GetBinding(ev->data1);
if (!binding.CompareNoCase("+move_forward")) key = KEY_UPARROW;
if (!binding.CompareNoCase("+move_backward")) key = KEY_DOWNARROW;
if (curYPos == destYPos && nLevelNew <= nLevelBest) if (key == KEY_UPARROW || key == KEY_PAD_DPAD_UP || key == sc_kpad_8)
{ {
nLevelNew++; if (curYPos == destYPos && nLevelNew <= nLevelBest)
assert(nLevelNew < 20); {
nLevelNew++;
assert(nLevelNew < 20);
destYPos = MapLevelOffsets[nLevelNew] + (200 * (nLevelNew / 2)); destYPos = MapLevelOffsets[nLevelNew] + (200 * (nLevelNew / 2));
if (curYPos <= destYPos) { if (curYPos <= destYPos) {
var_2C = 2; delta = 2;
} }
else { else {
var_2C = -2; delta = -2;
} }
nIdleSeconds = 0; nIdleSeconds = 0;
} }
return true; return true;
}
if (key == KEY_DOWNARROW || key == KEY_PAD_DPAD_DOWN || key == sc_kpad_2)
{
if (curYPos == destYPos && nLevelNew > 0)
{
nLevelNew--;
assert(nLevelNew >= 0);
destYPos = MapLevelOffsets[nLevelNew] + (200 * (nLevelNew / 2));
if (curYPos <= destYPos) {
delta = 2;
}
else {
delta = -2;
}
nIdleSeconds = 0;
}
return true;
}
state = skipped;
return true;
} }
if (buttonMap.ButtonDown(gamefunc_Move_Backward))
{
buttonMap.ClearButton(gamefunc_Move_Backward);
if (curYPos == destYPos && nLevelNew > 0)
{
nLevelNew--;
assert(nLevelNew >= 0);
destYPos = MapLevelOffsets[nLevelNew] + (200 * (nLevelNew / 2));
if (curYPos <= destYPos) {
var_2C = 2;
}
else {
var_2C = -2;
}
nIdleSeconds = 0;
}
return true;
}
return false; return false;
} }
}; };