zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-svn-id: https://svn.eduke32.com/eduke32@947 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-08-09 06:08:24 +00:00
parent 1e2678b892
commit c366d0e9a5
3 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/build/src/build.c
View file

@ -7105,7 +7105,7 @@ int menuselect(void)
if ((currentlist == 0 && findfiles) || (currentlist == 1 && finddirs))
currentlist = 1-currentlist;
}
else if ((ch == 75) || (ch == 72))
else if (keystatus[0xc8] /*(ch == 75) || (ch == 72)*/)
{
if (currentlist == 0)
{
@ -7116,7 +7116,7 @@ int menuselect(void)
if (findfileshigh && findfileshigh->prev) findfileshigh = findfileshigh->prev;
}
}
else if ((ch == 77) || (ch == 80))
else if (keystatus[0xd0] /*(ch == 77) || (ch == 80)*/)
{
if (currentlist == 0)
{

21
polymer/eduke32/source/astub.c
View file

@ -4412,25 +4412,22 @@ static void Keys3d(void)
// DoWater(horiz);
i = totalclock;
if (i != clockval[clockcnt])
if (totalclock != clockval[clockcnt])
{
rate=(120<<4)/(i-clockval[clockcnt])-1;
rate=(120*AVERAGEFRAMES)/(totalclock-clockval[clockcnt]);
clockval[clockcnt] = totalclock;
if (framerateon)
{
int p = 8*4;
int x = (xdimgame <= 640);
int p = 32>>x;
Bsprintf(tempbuf,"%4d",rate);
if (xdimgame <= 640) p >>= 1;
begindrawing();
printext256(xdimgame-p-1,2,0,-1,tempbuf,!(xdimgame > 640));
printext256(xdimgame-p-2,1,rate < 40?248:whitecol,-1,tempbuf,!(xdimgame > 640));
Bsprintf(tempbuf,"%4d",max(rate,0));
printext256(xdimgame-p-1+1,0+2,0,-1,tempbuf,x);
printext256(xdimgame-p-1,0+1,(rate < 40) ? COLOR_RED : COLOR_WHITE,-1,tempbuf,x);
enddrawing();
}
}
clockval[clockcnt] = i;
clockcnt = ((clockcnt+1)&15);
clockcnt = ((clockcnt+1)&(AVERAGEFRAMES-1));
tempbuf[0] = 0;
if (bstatus&4 && !(bstatus&(1|2)) && !unrealedlook) //PK

6
polymer/eduke32/source/mapster32.h
View file

@ -47,7 +47,11 @@ extern short temppicnum, tempcstat, templotag, temphitag, tempextra;
extern unsigned char temppal, tempvis, tempxrepeat, tempyrepeat, somethingintab;
extern signed char tempshade;
static int ototalclock = 0, clockval[16], clockcnt = 0;
#define AVERAGEFRAMES 128
#define COLOR_RED 248
#define COLOR_WHITE 31
static int ototalclock = 0, clockval[AVERAGEFRAMES], clockcnt = 0;
#define NUMOPTIONS 9
#define NUMKEYS 19