mirror of https://github.com/snes9xgit/snes9x.git
Fix problems with pull request.
This commit is contained in:
parent
b5270db944
commit
0d4ee55824
|
@ -2442,7 +2442,8 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2)
|
|||
S9xSetInfoString("Cannot swap pads: port 2 is not a joypad");
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
#ifdef NETPLAY_SUPPORT
|
||||
if (Settings.NetPlay && data2 != 1) { //data2 == 1 means it's sent by the netplay code
|
||||
if (Settings.NetPlayServer) {
|
||||
S9xNPSendJoypadSwap();
|
||||
|
@ -2451,6 +2452,7 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2)
|
|||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
newcontrollers[1] = curcontrollers[0];
|
||||
newcontrollers[0] = curcontrollers[1];
|
||||
|
|
|
@ -96,7 +96,6 @@
|
|||
<IntDir>$(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\</IntDir>
|
||||
<TargetName>$(ProjectName)</TargetName>
|
||||
<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>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">
|
||||
|
@ -742,4 +741,4 @@
|
|||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
Loading…
Reference in New Issue