OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

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

Browse source 
# Conflicts:
#	src/r_plane.cpp
#	src/r_segs.cpp
This commit is contained in:
Magnus Norddahl 2016-12-10 00:08:56 +01:00
commit 012565228d
10 changed files with 1197 additions and 783 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/r_main.cpp
View file

@ -1081,8 +1081,8 @@ CCMD (clearwallcycles)
bestwallcycles = HUGE_VAL;
}
#if 1
// To use these, also uncomment the clock/unclock in wallscan
#if 0
// The replacement code for Build's wallscan doesn't have any timing calls so this does not work anymore.
static double bestscancycles = HUGE_VAL;
ADD_STAT (scancycles)