diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 1a1ad19a5..8f221f1ff 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,12 @@ +December 27, 2007 (Changes by Graf Zahl) +- Darkened the console background a little after finding out that on + very bright title pics it became quite hard to read the console's contents. +- Fixed: PROP_Translation needed to be changed for the new value format. +- Added GZDoom's MAPINFO fog parameters as no op dummies so I can use + WADs that contain them without constantly having to edit the MAPINFO. + It also allows using them to optimize hardware fog for WADs that should + run with ZDoom as well. + December 26, 2007 - Changed the way gamma works for D3DFB: In windowed mode, the display is drawn to a texture, then that texture is copied to the real back buffer diff --git a/src/c_console.cpp b/src/c_console.cpp index f260d4a20..97439a366 100644 --- a/src/c_console.cpp +++ b/src/c_console.cpp @@ -297,7 +297,7 @@ void C_InitConsole (int width, int height, bool ingame) if (conback <= 0) { conback = TexMan.GetTexture (gameinfo.titlePage, FTexture::TEX_MiscPatch); - conshade = MAKEARGB(80,0,0,0); + conshade = MAKEARGB(120,0,0,0); conline = true; } else diff --git a/src/g_level.cpp b/src/g_level.cpp index 5585d1601..d2e0fda4d 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -301,6 +301,9 @@ static const char *MapInfoMapLevel[] = "noinfiniteflightpowerup", "allowrespawn", "teamdamage", + "fogdensity", + "outsidefogdensity", + "skyfog", NULL }; @@ -443,6 +446,9 @@ MapHandlers[] = { MITYPE_CLRFLAG, LEVEL_INFINITE_FLIGHT, 0 }, { MITYPE_SETFLAG, LEVEL_ALLOWRESPAWN, 0 }, { MITYPE_FLOAT, lioffset(teamdamage), 0 }, + { MITYPE_INT, lioffset(fogdensity), 0 }, + { MITYPE_INT, lioffset(outsidefogdensity), 0 }, + { MITYPE_INT, lioffset(skyfog), 0 }, }; static const char *MapInfoClusterLevel[] = diff --git a/src/g_level.h b/src/g_level.h index 2efb0fa07..c055591ae 100644 --- a/src/g_level.h +++ b/src/g_level.h @@ -174,6 +174,10 @@ struct level_info_s char soundinfo[9]; char sndseq[9]; char bordertexture[9]; + + int fogdensity; + int outsidefogdensity; + int skyfog; FSpecialAction * specialactions; float teamdamage; diff --git a/src/infomacros.h b/src/infomacros.h index 2925fd5a5..c103e8f8c 100644 --- a/src/infomacros.h +++ b/src/infomacros.h @@ -258,7 +258,7 @@ public: #define PROP_Alpha(x) ADD_LONG_PROP(ADEF_Alpha,x) #define PROP_RenderStyle(x) ADD_BYTE_PROP(ADEF_RenderStyle,x) #define PROP_RenderFlags(x) ADD_WORD_PROP(ADEF_RenderFlags,x) -#define PROP_Translation(x,y) ADD_WORD_PROP(ADEF_Translation,((x)<<8)|(y)) +#define PROP_Translation(x,y) ADD_LONG_PROP(ADEF_Translation,((x)<<16)|(y)) #define PROP_MinMissileChance(x) ADD_BYTE_PROP(ADEF_MinMissileChance,x) #define PROP_MeleeRange(x) ADD_FIXD_PROP(ADEF_MeleeRange,x) #define PROP_MaxDropOffHeight(x) ADD_FIXD_PROP(ADEF_MaxDropOffHeight,x)