ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix vc8 to build, since lua was made optional. 

fix SF#2153843 (Lua ignores second joypad.set())
This commit is contained in:
zeromus 2008-10-09 03:24:28 +00:00
parent a5788bb6f4
commit 1bfca2e198
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lua-engine.cpp
View File

@ -1726,7 +1726,7 @@ int FCEU_LuaUsingJoypad(int which) {
* per frame (if FCEU_LuaUsingJoypad says it's safe to do so) * per frame (if FCEU_LuaUsingJoypad says it's safe to do so)
*/ */
uint8 FCEU_LuaReadJoypad(int which) { uint8 FCEU_LuaReadJoypad(int which) {
lua_joypads_used &= !(1 << which); lua_joypads_used &= ~(1 << which);
return lua_joypads[which]; return lua_joypads[which];
} }

2
vc8/fceux.vcproj
View File

@ -44,7 +44,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../src/drivers/win/zlib;../src/drivers/win/directx;../src;../src/drivers/win/lua/include" AdditionalIncludeDirectories="../src/drivers/win/zlib;../src/drivers/win/directx;../src;../src/drivers/win/lua/include"
PreprocessorDefinitions="WIN32;_DEBUG;MSVC;_CRT_SECURE_NO_DEPRECATE;_WIN32_WINDOWS=0x0410;WINVER=0x0410;NETWORK;LSB_FIRST;_USE_32BIT_TIME_T;FCEUDEF_DEBUGGER;_USE_SHARED_MEMORY_;NOMINMAX;LUA_BUILD_AS_DLL;HAS_vsnprintf" PreprocessorDefinitions="WIN32;_DEBUG;MSVC;_CRT_SECURE_NO_DEPRECATE;_WIN32_WINDOWS=0x0410;WINVER=0x0410;NETWORK;LSB_FIRST;_USE_32BIT_TIME_T;FCEUDEF_DEBUGGER;_USE_SHARED_MEMORY_;NOMINMAX;LUA_BUILD_AS_DLL;HAS_vsnprintf;_S9XLUA_H"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"