OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master' into qzdoom

Browse source 
# Conflicts:
#	src/r_things.cpp
This commit is contained in:
Magnus Norddahl 2017-01-18 04:09:16 +01:00
commit 53a79ca215
49 changed files with 1336 additions and 1275 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/p_user.cpp
View file

@ -638,6 +638,14 @@ void player_t::SendPitchLimits() const
}
}
DEFINE_ACTION_FUNCTION(_PlayerInfo, GetUserName)
{
PARAM_SELF_STRUCT_PROLOGUE(player_t);
ACTION_RETURN_STRING(self->userinfo.GetName());
}
//===========================================================================
//
// APlayerPawn
@ -1158,7 +1166,7 @@ void APlayerPawn::FilterCoopRespawnInventory (APlayerPawn *oldplayer)
}
else if ((dmflags & DF_COOP_LOSE_POWERUPS) &&
defitem == NULL &&
item->IsKindOf(RUNTIME_CLASS(APowerupGiver)))
item->IsKindOf(PClass::FindActor(NAME_PowerupGiver)))
{
item->Destroy();
}