OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge commit '2234d36c7a'

Browse source 
# Conflicts:
#	src/r_main.cpp
#	src/r_plane.cpp
#	src/r_things.cpp
This commit is contained in:
Rachael Alexanderson 2017-02-15 05:42:57 -05:00
commit 2b8db72cef
37 changed files with 1967 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/c_console.cpp
View file

@ -69,6 +69,8 @@
#include "c_consolebuffer.h"
#include "g_levellocals.h"
FString FStringFormat(VM_ARGS); // extern from thingdef_data.cpp
#include "gi.h"
#define LEFTMARGIN 8