OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code 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-08-21 08:42:06 +02:00
commit 5c267a2169
12 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/g_level.cpp
View file

@ -1280,7 +1280,7 @@ void G_FinishTravel ()
for (inv = pawn->Inventory; inv != NULL; inv = inv->Inventory)
{
inv->ChangeStatNum (STAT_INVENTORY);
inv->ChangeStatNum (STAT_DEFAULT);
inv->LinkToWorld ();
inv->Travelled ();
}