zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-14 08:30:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge http://github.com/rheit/zdoom

Browse source 
# Conflicts:
#	wadsrc/static/language.enu
This commit is contained in:
raa-eruanna 2016-10-21 13:37:12 -04:00
commit 9cf9cc1318
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_user.cpp
View file

@ -1893,7 +1893,7 @@ void P_CalcHeight (player_t *player)
{ {
bob = 0; bob = 0;
} }
player->viewz = player->mo->Z() + player->viewheight + bob; player->viewz = player->mo->Z() + player->viewheight + (bob * player->mo->ViewBob); // [SP] Allow DECORATE changes to view bobbing speed.
if (player->mo->Floorclip && player->playerstate != PST_DEAD if (player->mo->Floorclip && player->playerstate != PST_DEAD
&& player->mo->Z() <= player->mo->floorz) && player->mo->Z() <= player->mo->floorz)
{ {

2
src/textures/animations.cpp
View file

@ -1002,7 +1002,7 @@ void FTextureManager::UpdateAnimations (DWORD mstime)
template<> FSerializer &Serialize(FSerializer &arc, const char *key, FDoorAnimation *&p, FDoorAnimation **def) template<> FSerializer &Serialize(FSerializer &arc, const char *key, FDoorAnimation *&p, FDoorAnimation **def)
{ {
FTextureID tex = p->BaseTexture; FTextureID tex = p? p->BaseTexture : FNullTextureID();
Serialize(arc, key, tex, def ? &(*def)->BaseTexture : nullptr); Serialize(arc, key, tex, def ? &(*def)->BaseTexture : nullptr);
if (arc.isReading()) if (arc.isReading())
{ {

2
wadsrc/static/language.enu
View file

@ -1788,7 +1788,7 @@ DSPLYMNU_PALLETEHACK = "DirectDraw palette hack"; // Not used
DSPLYMNU_ATTACHEDSURFACES = "Use attached surfaces"; // Not used DSPLYMNU_ATTACHEDSURFACES = "Use attached surfaces"; // Not used
DSPLYMNU_SKYMODE = "Sky render mode"; DSPLYMNU_SKYMODE = "Sky render mode";
DSPLYMNU_LINEARSKY = "Linear skies"; DSPLYMNU_LINEARSKY = "Linear skies";
DSPLYMNU_GZDFULLBRIGHT = "Emulate GZDoom FullBright"; DSPLYMNU_GZDFULLBRIGHT = "Fullbright overrides sector color";
DSPLYMNU_DRAWFUZZ = "Use fuzz effect"; DSPLYMNU_DRAWFUZZ = "Use fuzz effect";
DSPLYMNU_TRANSSOUL = "Lost Soul translucency"; DSPLYMNU_TRANSSOUL = "Lost Soul translucency";
DSPLYMNU_FAKECONTRAST = "Use fake contrast"; DSPLYMNU_FAKECONTRAST = "Use fake contrast";