diff --git a/engine/src/core.c b/engine/src/core.c index 3526647..50e3a8e 100644 --- a/engine/src/core.c +++ b/engine/src/core.c @@ -15,8 +15,6 @@ void GSInit(void) { GSVersionGet(&version); GSLog(GSLogInfo, "GearSrc Engine %s", version.string); - - gload_init(); } int GSEngineRegisterResource(GSEngine engine, const char* name, const char* path) { @@ -45,6 +43,8 @@ GSEngine GSEngineCreate(GSEngineParam* param) { param->ready(engine->width, engine->height); } + gload_init(); + sh_new_strdup(engine->resource); GSEngineRegisterResource(engine, "base", "base.pak"); diff --git a/engine/src/log.c b/engine/src/log.c index 97e90dd..a978573 100644 --- a/engine/src/log.c +++ b/engine/src/log.c @@ -5,6 +5,15 @@ void GSLog(int level, const char* fmt, ...) { FILE* out = stdout; #ifdef _WIN32 + fprintf(out, "[GearSrc|"); + + if(level == GSLogInfo) { + fprintf(out, "INFO "); + } else if(level == GSLogWarn) { + fprintf(out, "WARN "); + } else if(level == GSLogError) { + fprintf(out, "ERROR"); + } #else fprintf(out, "[\x1b[mGearSrc\x1b[m|"); diff --git a/external/milsko b/external/milsko index debdaf9..c61e26f 160000 --- a/external/milsko +++ b/external/milsko @@ -1 +1 @@ -Subproject commit debdaf998e0b5edfe42214934d8fcf4dfea3e7bd +Subproject commit c61e26f0289153bb3f31b1359e83095a1338fbd4 diff --git a/wizard.sh b/wizard.sh index ab2146a..15ae4ee 100755 --- a/wizard.sh +++ b/wizard.sh @@ -8,12 +8,8 @@ if [ "x$USE_WINE" = "x" ]; then USE_WINE=false fi -if $USE_WINE; then - if [ "x$WINE" = "x" ]; then - W=wine - else - W=$WINE - fi +if [ ! "x$WINE" = "x" ]; then + W=$WINE E=.exe fi