OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into scripting

Browse source 
Conflicts:
	src/actor.h
	src/g_hexen/a_clericstaff.cpp
	src/p_enemy.cpp
	src/p_interaction.cpp
	src/p_local.h
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
This commit is contained in:
Christoph Oelckers 2016-01-17 20:57:55 +01:00
commit bf747075e8
179 changed files with 10280 additions and 4787 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/intermission/intermission.cpp
View file

@ -329,6 +329,7 @@ void DIntermissionScreenText::Drawer ()
int c;
const FRemapTable *range;
const char *ch = mText;
const int kerning = SmallFont->GetDefaultKerning();
// Count number of rows in this text. Since it does not word-wrap, we just count
// line feed characters.
@ -380,6 +381,7 @@ void DIntermissionScreenText::Drawer ()
}
pic = SmallFont->GetChar (c, &w);
w += kerning;
w *= CleanXfac;
if (cx + w > SCREENWIDTH)
continue;