zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Texture_Cleanup 

# Conflicts:
#	src/textures/texture.cpp
This commit is contained in:
Christoph Oelckers 2018-12-14 22:36:26 +01:00
parent a19f297ae0 013d3e2368
commit 656dbc9647
4 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sound/mididevices/music_win_mididevice.cpp
View File

@ -198,6 +198,10 @@ int WinMIDIDevice::Open(MidiCallback callback, void *userdata)
}
}
}
else
{
return 1;
}
}
return 0;
}

27
src/textures/texture.cpp
View File

@ -813,19 +813,9 @@ FWrapperTexture::FWrapperTexture(int w, int h, int bits)
float FTexCoordInfo::RowOffset(float rowoffset) const
{
float tscale = fabs(mTempScale.Y);
float scale = fabs(mScale.Y);
if (tscale == 1.f)
{
if (scale == 1.f || mWorldPanning) return rowoffset;
else return rowoffset / scale;
}
else
{
if (mWorldPanning) return rowoffset;
else return rowoffset / scale;
}
if (scale == 1.f || mWorldPanning) return rowoffset;
else return rowoffset / scale;
}
//===========================================================================
@ -836,18 +826,9 @@ float FTexCoordInfo::RowOffset(float rowoffset) const
float FTexCoordInfo::TextureOffset(float textureoffset) const
{
float tscale = fabs(mTempScale.X);
float scale = fabs(mScale.X);
if (tscale == 1.f)
{
if (scale == 1.f || mWorldPanning) return textureoffset;
else return textureoffset / scale;
}
else
{
if (mWorldPanning) return textureoffset;
else return textureoffset / scale;
}
if (scale == 1.f || mWorldPanning) return textureoffset;
else return textureoffset / scale;
}
//===========================================================================

2
src/v_video.cpp
View File

@ -924,7 +924,7 @@ void ScaleWithAspect (int &w, int &h, int Width, int Height)
CCMD(vid_setsize)
{
if (argv.argc() < 2)
if (argv.argc() < 3)
{
Printf("Usage: vid_setsize width height\n");
}

21
wadsrc/static/compatibility.txt
View File

@ -167,6 +167,26 @@ AF40D0E49BD1B76D4B1AADD8212ADC46 // MAP01 (the wad that shall not be named =P)
pointonline
}
920F8D876ECD96D8C2A978FF1AB2B401 // Darken2.wad map01 - Nodes go out of bounds/beyond normal sector boundaries
CFEDB7FA89885E24856CAC9A2FB3CE58 // Darken2.wad map03 - GZDoomBuilder crashes when displaying Nodes
8E961FA7029761D5FAB3932C40F10CD2 // Darken2.wad map04 - Nodes go out of bounds/beyond normal sector boundaries
DEA5E9C6253FFF8FDB2D5E5BADE13A9D // Darken2.wad map06 - Nodes go out of bounds/beyond normal sector boundaries
0E72254C0C26F721333A1C56E3648D68 // Darken2.wad map07 - Nodes go out of bounds/beyond normal sector boundaries
1437B40F2D56DF82346366814E9729D9 // Darken2.wad map08 - Nodes go out of bounds/beyond normal sector boundaries
8B15F89E47E422780FBF2D6CDE3AA050 // Darken2.wad map09 - GZDoomBuilder crashes when displaying Nodes
5A2FD43D23B45191229E5C74E9398D36 // Darken2.wad map10 - Nodes go out of bounds/beyond normal sector boundaries
FA25A78B3DFD7CC44E9B10C7B78EADAE // Darken2.wad map11 - Nodes go out beyond normal sector boundaries
01592ACF001C534076556D9E1B5D85E7 // Darken2.wad map12 - Nodes go out of bounds/beyond normal sector boundaries
16A2ED2917A68B2FD8D264BE4D64EA09 // Darken2.wad map13 - Nodes go out of bounds/beyond normal sector boundaries
F5DA2AA0C7112E090167A6B2F6D4A079 // Darken2.wad map15 - Nodes go out beyond normal sector boundaries
A40A4472AB0FDBE2D55ADADA7D9005C8 // Darken2.wad map16 - Nodes go out of bounds/beyond normal sector boundaries
244701904E6B754A02842415AB183EBE // Darken2.wad map17 - Nodes go out beyond normal sector boundaries
661D3C9221114A1CD16674CBFF239DDF // Darken2.wad map19 - Nodes go out of bounds/beyond normal sector boundaries
1FB559C4C37CCE8C3883057C963952A8 // Darken2.wad map20 - Nodes go out beyond normal sector boundaries
D36E7D121F28F77A3780A5BD88425FB4 // Darken2.wad map21 - Nodes go out beyond normal sector boundaries
3253B280FB7A4A04284FE08A6D9F222D // Darken2.wad map22 - Nodes go out beyond normal sector boundaries
E0E5517B7928E88B88F6A5B77AC449DF // Darken2.wad map23 - Nodes go out of bounds/beyond normal sector boundaries
6DD76422593381E3234FA703C155C493 // Darken2.wad map24 - Nodes go out of bounds/beyond normal sector boundaries
8B2AC8D4DB4A49A5DCCBB067E04434D6 // The Hell Factory Hub One, map04
65A1EB4C87386F290816660A52932FF1 // Master Levels, garrison.wad
3DEE4EFEFAF3260C800A30734F54CE75 // Hellbound, map14
@ -176,6 +196,7 @@ D5F64E02679A81B82006AF34A6A8EAC3 // plutonia.wad map32
BA4860C7A2F5D705DB32A1A38DB77EC4 // pl2.wad map10
EDA5CE7C462BD171BF8110AC56B67857 // pl2.wad map11
A9A9A728E689266939C1B71655F320CA // pl2.wad map25
62CA74092FC88C1E7FE2D0B1A8034E29 // pl2.wad map29
{
rebuildnodes
}