OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into new_level_refactor

Browse source 
# Conflicts:
#	src/p_user.cpp
This commit is contained in:
Christoph Oelckers 2019-02-02 16:58:30 +01:00
commit 1dbbb56a1b
10 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gamedata/a_keys.cpp
View file

@ -555,7 +555,7 @@ int P_GetMapColorForKey (AActor * key)
foundlock = pair->Key;
}
}
return 0;
return rgb;
}