summaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorJapa Illo2012-03-27 08:52:44 +0200
committerJapa Illo2012-03-27 08:52:44 +0200
commitb884b575ed5a331714314748ce7ea2d6bc02bda3 (patch)
tree8a36082d09f32bd5ae0e7b8fcd7b65be4e35d768 /main.cpp
parent07ddc8c13e0bb38cde77937803e9320e2b26f2d9 (diff)
parent86566374fc8fa339602f7e9a240696d2b0dd7290 (diff)
downloadstonesense-b884b575ed5a331714314748ce7ea2d6bc02bda3.tar.gz
stonesense-b884b575ed5a331714314748ce7ea2d6bc02bda3.tar.bz2
stonesense-b884b575ed5a331714314748ce7ea2d6bc02bda3.tar.xz
Merge branch 'master' of https://github.com/Caldfir/stonesense
Conflicts: BlockCondition.cpp ContentLoader.cpp GUI.cpp MapLoading.cpp SpriteObjects.cpp
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/main.cpp b/main.cpp
index f3d6e9d..4908a18 100644
--- a/main.cpp
+++ b/main.cpp
@@ -87,6 +87,7 @@ void LogError(const char* msg, ...){
FILE* fp = fopen( "Stonesense.log", "a");
if(fp)
vfprintf( fp, msg, arglist );
+// Core::printerr(msg, arglist);
va_end(arglist);
fclose(fp);
}