OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into texture_rework

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-19 18:07:16 +02:00
commit 0eb68177ca
13 changed files with 41 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/common/2d/v_draw.cpp
View file

@ -390,7 +390,9 @@ bool SetTextureParms(F2DDrawer * drawer, DrawParms *parms, FGameTexture *img, do
double srcwidth = img->GetDisplayWidth();
double srcheight = img->GetDisplayHeight();
int autoaspect = parms->fsscalemode;
aspect = autoaspect == 0 || (srcwidth == 320 && srcheight == 200) || (srcwidth == 640 && srcheight == 400)? 1.333 : srcwidth / srcheight;
if (srcheight == 200) aspect = srcwidth / 240.;
else if (srcheight == 400) aspect = srcwidth / 480;
else aspect = srcwidth / srcheight;
parms->x = parms->y = 0;
parms->keepratio = true;
auto screenratio = ActiveRatio(GetWidth(), GetHeight());

1
src/common/console/c_bind.cpp
View file

@ -720,6 +720,7 @@ void C_SetDefaultKeys(const char* baseconfig)
ReadBindings(lump, true);
}
lastlump = 0;
while ((lump = fileSystem.FindLump("DEFBINDS", &lastlump)) != -1)
{
ReadBindings(lump, false);

2
src/common/utility/cmdlib.cpp
View file

@ -73,7 +73,7 @@ static inline bool IsSeperator (int c)
if (c == '/')
return true;
#ifdef _WIN32
if (c == '\\' || c == ':')
if (c == '\\')
return true;
#endif
return false;