OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into floatcvt

Browse source 
# Conflicts:
#	src/p_lnspec.cpp
#	src/p_spec.cpp
#	src/p_spec.h
This commit is contained in:
Christoph Oelckers 2016-03-28 17:46:19 +02:00
commit a46a4c81b1
12 changed files with 836 additions and 707 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/g_level.cpp
View file

@ -2019,7 +2019,7 @@ void FLevelLocals::Tick ()
//
//==========================================================================
void FLevelLocals::AddScroller (DScroller *scroller, int secnum)
void FLevelLocals::AddScroller (int secnum)
{
if (secnum < 0)
{