diff --git a/changelog.txt b/changelog.txt index cd0f4764..6d0a6f98 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,5 @@ ---version 2.0.4 yet to be released--- +29-mar-2009 - adelikat - Win32 - reverted acmlm's /dll folder change 28-mar-2009 - shinydoofy - sdl - added hotkey Del to toggle mute avi capturing 28-mar-2009 - shinydoofy - sdl - fix fm2 playback and fcm->fm2 conversion crash at the cost of ugly 0x00 bytes behind the author's comment line 28-mar-2009 - adelikat - Lua - added FCEU.poweron() and FCEU.softreset() diff --git a/src/config.cpp b/src/config.cpp index 88fae87a..cc388117 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -18,7 +18,7 @@ char *FCEUI_GetAboutString() { Authors:\n\ zeromus, adelikat, CaH4e3\n\n\ Contributers:\n\ -DWEdit,QFox\n\ +Acmlm,DWEdit,QFox\n\ \n\ FCEUX 2.0\n\ mz, nitsujrehtona, Lukas Sabota,\n\ diff --git a/src/drivers/win/lua/include/luaconf.h b/src/drivers/win/lua/include/luaconf.h index fd24f392..eb2f5a1f 100644 --- a/src/drivers/win/lua/include/luaconf.h +++ b/src/drivers/win/lua/include/luaconf.h @@ -86,7 +86,7 @@ ** path of the directory of the executable file of the current process. */ #define LUA_LDIR "!\\lua\\" -#define LUA_CDIR "!\\dll\\" +#define LUA_CDIR "!\\" #define LUA_PATH_DEFAULT \ ".\\?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \ LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua" diff --git a/src/lua-engine.cpp b/src/lua-engine.cpp index c167d701..ee55dd42 100644 --- a/src/lua-engine.cpp +++ b/src/lua-engine.cpp @@ -2036,7 +2036,7 @@ int FCEU_LoadLuaCode(const char *filename) { if (!L) { #ifdef WIN32 - HMODULE test = LoadLibrary("dll\\lua5.1.dll"); + HMODULE test = LoadLibrary("lua5.1.dll"); if(!test) { FCEUD_PrintError("Couldn't initialize lua system due to failure loading lua5.1.dll");