diff --git a/include/common.h b/include/common.h index f21a013..63880d0 100644 --- a/include/common.h +++ b/include/common.h @@ -23,7 +23,7 @@ #define VERSION_X 2 #define VERSION_Y 0 #define VERSION_A 1 -#define VERSION_Z 4 +#define VERSION_Z 5 // Remember to bump "Z" basically every time you change the engine! // Remember to bump the version in Lua too! // Remember to document API changes in a new version! diff --git a/pkg/base/version.lua b/pkg/base/version.lua index a0a50f9..ee09353 100644 --- a/pkg/base/version.lua +++ b/pkg/base/version.lua @@ -20,9 +20,9 @@ -- Thanks. --GM VERSION_ENGINE = { - cmp={0,2,0,1,4}, - num=8389632+4, - str="0.2a-4", + cmp={0,2,0,1,5}, + num=8389632+5, + str="0.2a-5", } --error(""..common.version.num) @@ -145,7 +145,6 @@ VERSION_BUGS = { {intro=8389632+1, fix=8389632+2, msg="Memory leak when reusing a VA in va_make"}, {intro=8389632+1, fix=8389632+2, msg="VA API lacks support for textures"}, {intro=8389632+2, fix=8389632+3, msg="Compat breakage with va_render_global and textures"}, ---{intro=4259840+11, fix=8389632+4, msg="[Win32] Needs a workaround for a bug in MinGW's execv function"}, -{intro=4259840+11, fix=nil, msg="[Win32] Needs a better workaround for a bug in MSVCRT's execv function"}, +{intro=4259840+11, fix=8389632+5, msg="[Win32] Needs a workaround for a bug in MSVCRT's execv function"}, } diff --git a/src/lua.c b/src/lua.c index 7662fde..43c4125 100644 --- a/src/lua.c +++ b/src/lua.c @@ -98,19 +98,11 @@ int icelua_fn_client_mk_sys_execv(lua_State *L) SDL_Quit(); #ifdef WIN32 - const char *follow = main_argv0; - while(*follow != '\x00') - { - if(*follow == '\\' || *follow == '/') - main_argv0 = follow+1; - - follow++; - } - //if(main_oldcwd != NULL) _chdir(main_oldcwd); + main_argv0 = "iceball.exe"; // fuck it #endif printf("argv0: [%s]\n", main_argv0); fflush(stdout); - execv(main_argv[0], arglist); + execv(main_argv0, arglist); printf("WORK YOU FUCKASS: %s\n", strerror(errno)); fflush(stdout); diff --git a/zipdist.sh b/zipdist.sh index 6928b17..c2aae41 100755 --- a/zipdist.sh +++ b/zipdist.sh @@ -1,6 +1,6 @@ #!/bin/sh -export ZIPNAME=nubdist/iceball-indev-0.2a-3.zip +export ZIPNAME=nubdist/iceball-indev-0.2a-5.zip zip -r $ZIPNAME *.dll *.exe *.txt opencmd.bat docs/ \ clsave/config.json \