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

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

This commit is contained in:
Christoph Oelckers 2016-04-19 00:28:00 +02:00
parent 573d80f144 d2735d7632
commit b13c265ff4
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/g_shared/a_morph.cpp
View File

@ -91,6 +91,8 @@ bool P_MorphPlayer (player_t *activator, player_t *p, PClassPlayerPawn *spawntyp
morphed->Angles.Yaw = actor->Angles.Yaw;
morphed->target = actor->target;
morphed->tracer = actor;
morphed->FriendPlayer = actor->FriendPlayer;
morphed->DesignatedTeam = actor->DesignatedTeam;
morphed->Score = actor->Score;
p->PremorphWeapon = p->ReadyWeapon;
morphed->special2 = actor->flags & ~MF_JUSTHIT;

15
src/menu/optionmenuitems.h
View File

@ -122,7 +122,20 @@ public:
bool Activate()
{
const char *msg = GStrings("SAFEMESSAGE");
if (msg) M_StartMessage(msg, 0);
const char *actionLabel = mLabel;
if (actionLabel != NULL)
{
if (*actionLabel == '$')
{
actionLabel = GStrings(actionLabel + 1);
}
}
FString FullString;
FullString.Format(TEXTCOLOR_WHITE "%s" TEXTCOLOR_NORMAL "\n\n" "%s", actionLabel != NULL ? actionLabel : "", msg);
if (msg && FullString) M_StartMessage(FullString, 0);
return true;
}
};

2
src/p_sight.cpp
View File

@ -114,7 +114,7 @@ public:
{
sightstart = t1->PosRelative(task->portalgroup);
sightend = t2->PosRelative(task->portalgroup);
sightstart.Z += t1->Height / 2;
sightstart.Z += t1->Height * 0.75;
Startfrac = task->Frac;
Trace = { sightstart.X, sightstart.Y, sightend.X - sightstart.X, sightend.Y - sightstart.Y };