zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-27 06:12:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source 
# Conflicts:
#	wadsrc/static/language.eng
This commit is contained in:
Christoph Oelckers 2016-06-29 14:58:32 +02:00
commit 57667c2e0b
5 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cmdlib.h
View file

@ -16,7 +16,7 @@
#include <stdarg.h>
// the dec offsetof macro doesnt work very well...
#define myoffsetof(type,identifier) ((size_t)&((type *)1)->identifier - 1)
#define myoffsetof(type,identifier) ((size_t)&((type *)alignof(type))->identifier - alignof(type))
int Q_filelength (FILE *f);
bool FileExists (const char *filename);

9
src/p_pspr.cpp
View file

@ -1169,8 +1169,17 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_ClearOverlays)
int count = 0;
DPSprite *pspr = player->psprites;
int startID = (pspr != nullptr) ? pspr->GetID() : start;
bool first = true;
while (pspr != nullptr)
{
if (pspr->GetID() == startID)
{
if (first)
first = false;
else
break;
}
int id = pspr->GetID();
//Do not wipe out layer 0. Ever.

2
src/portal.cpp
View file

@ -288,7 +288,7 @@ static void SetRotation(FLinePortal *port)
}
else
{
port->mFlags &= PORTF_POLYOBJ;
port->mFlags &= ~PORTF_POLYOBJ;
}
}
else

2
wadsrc/static/language.eng
View file

@ -108,5 +108,7 @@ CMPTMNU_SECTORSOUNDS = "Sector sounds use centre as source";
OPTVAL_MAPDEFINEDCOLORSONLY = "Map defined colours only";
C_GRAY = "\ccgrey";
C_DARKGRAY = "\cudark grey";
DSPLYMNU_MOVEBOB = "View bob amount while moving";
DSPLYMNU_STILLBOB = "View bob amount while not moving";
OPTVAL_ANYFIXEDCOLORMAP = "Any fixed colourmap";

2
wadsrc/static/menudef.txt
View file

@ -700,6 +700,8 @@ OptionMenu "VideoOptions"
Option "$DSPLYMNU_NOMONSTERINTERPOLATION", "nomonsterinterpolation", "NoYes"
Slider "$DSPLYMNU_MENUDIM", "dimamount", 0, 1.0, 0.05, 2
ColorPicker "$DSPLYMNU_DIMCOLOR", "dimcolor"
Slider "$DSPLYMNU_MOVEBOB", "movebob", 0, 1.0, 0.05, 2
Slider "$DSPLYMNU_STILLBOB", "stillbob", 0, 1.0, 0.05, 2
}
//-------------------------------------------------------------------------------------------