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

Fix problems with pull request.

This commit is contained in:
Brandon Wright 2019-03-09 18:18:01 -06:00
parent b5270db944
commit 0d4ee55824
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controls.cpp
View File

@ -2442,7 +2442,8 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2)
S9xSetInfoString("Cannot swap pads: port 2 is not a joypad"); S9xSetInfoString("Cannot swap pads: port 2 is not a joypad");
break; break;
} }
#ifdef NETPLAY_SUPPORT
if (Settings.NetPlay && data2 != 1) { //data2 == 1 means it's sent by the netplay code if (Settings.NetPlay && data2 != 1) { //data2 == 1 means it's sent by the netplay code
if (Settings.NetPlayServer) { if (Settings.NetPlayServer) {
S9xNPSendJoypadSwap(); S9xNPSendJoypadSwap();
@ -2451,6 +2452,7 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2)
break; break;
} }
} }
#endif
newcontrollers[1] = curcontrollers[0]; newcontrollers[1] = curcontrollers[0];
newcontrollers[0] = curcontrollers[1]; newcontrollers[0] = curcontrollers[1];

3
win32/snes9xw.vcxproj
View File

@ -96,7 +96,6 @@
<IntDir>$(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\</IntDir> <IntDir>$(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\</IntDir>
<TargetName>$(ProjectName)</TargetName> <TargetName>$(ProjectName)</TargetName>
<IncludePath>$(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath)</IncludePath> <IncludePath>$(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath)</IncludePath>
<IncludePath>$(DXSDK_DIR)include;$(CG_INC_PATH);$(IncludePath);$(DXSDK_DIR)\include</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\$(PlatformTarget);$(CG_LIB_PATH);$(LibraryPath)</LibraryPath> <LibraryPath>$(DXSDK_DIR)Lib\$(PlatformTarget);$(CG_LIB_PATH);$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
@ -742,4 +741,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>