zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 13:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed the title screen

Browse source
This commit is contained in:
Christoph Oelckers 2020-08-21 00:30:46 +02:00
parent 98c064dcbc
commit 80055b97e8
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/exhumed/src/2d.cpp
View file

@ -161,13 +161,18 @@ void InitFonts()
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void DrawRel(int tile, double x, double y)
{
DrawTexture(twod, tileGetTexture(tile), x, y, DTA_FullscreenScale, FSMode_ScaleToFit43, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DTA_CenterOffsetRel, true, TAG_DONE);
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// //
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static const short skullDurations[] = { 6, 25, 43, 50, 68, 78, 101, 111, 134, 158, 173, 230, 6000 }; static const short skullDurations[] = { 6, 25, 43, 50, 68, 78, 101, 111, 134, 158, 173, 230, 600 };
class DMainTitle : public DScreenJob class DMainTitle : public DScreenJob
{ {
@ -179,6 +184,7 @@ class DMainTitle : public DScreenJob
int var_4 = 0; int var_4 = 0;
int esi = 130; int esi = 130;
int nCount = 0; int nCount = 0;
int start;
public: public:
@ -192,6 +198,7 @@ public:
int Frame(uint64_t clock, bool skiprequest) override int Frame(uint64_t clock, bool skiprequest) override
{ {
int ticker = clock * 120 / 1'000'000'000;
if (clock == 0) if (clock == 0)
{ {
PlayLocalSound(StaticSound[59], 0, true, CHANF_UI); PlayLocalSound(StaticSound[59], 0, true, CHANF_UI);
@ -204,16 +211,16 @@ public:
else else
PlayLocalSound(StaticSound[61], 0, false, CHANF_UI); PlayLocalSound(StaticSound[61], 0, false, CHANF_UI);
state = 1; state = 1;
start = ticker;
} }
int ticker = clock * 120 / 1'000'000'000;
menu_DoPlasma(); menu_DoPlasma();
overwritesprite(160, 100, kSkullHead, 0, 3, kPalNormal); DrawRel(kSkullHead, 160, 100);
switch (state) switch (state)
{ {
case 0: case 0:
overwritesprite(161, 130, kSkullJaw, 0, 3, kPalNormal); DrawRel(kSkullJaw, 161, 130);
break; break;
case 1: case 1:
@ -227,7 +234,7 @@ public:
{ {
nCount++; nCount++;
if (nCount > 12) return 0; if (nCount > 12) return 0;
var_18 = skullDurations[nCount]; var_18 = start + skullDurations[nCount];
var_4 = var_4 == 0; var_4 = var_4 == 0;
} }
@ -253,11 +260,11 @@ public:
if (y > 135) y = 135; if (y > 135) y = 135;
} }
overwritesprite(161, y, nTile, 0, 3, kPalNormal); DrawRel(nTile, 161, y);
break; break;
} }
} }
return 1; return skiprequest? -1 : 1;
} }
}; };

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

@ -717,7 +717,7 @@ private:
dword_9AD64[i] = (int)totalclock + 30; dword_9AD64[i] = (int)totalclock + 30;
} }
DrawGraphic(tileGetTexture(nTile), x, 7, DI_ITEM_TOP|DI_MIRROR|DI_MIRRORY, 1, -1, -1, 1, 1); DrawGraphic(tileGetTexture(nTile), x, 7, DI_ITEM_CENTER, 1, -1, -1, 1, 1);
if (i != nLocalPlayer) { if (i != nLocalPlayer) {
shade = -100; shade = -100;