Merge https://github.com/coelckers/gzdoom

2017-01-19 11:58:53 -05:00 · 2017-01-19 11:58:53 -05:00 · 8a198591f4
commit 8a198591f4
parent 8af97cbbd3 19b1c10ba8
30 changed files with 749 additions and 776 deletions
--- a/src/c_console.cpp
+++ b/src/c_console.cpp
@ -1753,7 +1753,7 @@ void C_MidPrintBold (FFont *font, const char *msg)
 	}
 }

-DEFINE_ACTION_FUNCTION(DObject, C_MidPrint)
+DEFINE_ACTION_FUNCTION(_Console, MidPrint)
 {
 	PARAM_PROLOGUE;
 	PARAM_STRING(font);