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

lilypad: minor c++ fixes 

Must be checked on windows
This commit is contained in:
Gregory Hainaut 2015-01-24 23:10:01 +01:00
parent 147353a177
commit 3661f51bcb
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/LilyPad/Config.h
View File

@ -84,8 +84,6 @@ extern GeneralConfig config;
void UnloadConfigs(); void UnloadConfigs();
void AddIgnore(LPARAM k);
void SetVolume(int volume); void SetVolume(int volume);
int LoadSettings(int force = 0, wchar_t *file = 0); int LoadSettings(int force = 0, wchar_t *file = 0);

1
plugins/LilyPad/Global.h
View File

@ -106,6 +106,7 @@ EXPORT_C_(void) PADconfigure();
EXPORT_C_(s32) PADfreeze(int mode, freezeData *data); EXPORT_C_(s32) PADfreeze(int mode, freezeData *data);
EXPORT_C_(s32) PADsetSlot(u8 port, u8 slot); EXPORT_C_(s32) PADsetSlot(u8 port, u8 slot);
EXPORT_C_(s32) PADqueryMtap(u8 port); EXPORT_C_(s32) PADqueryMtap(u8 port);
EXPORT_C_(void) PADsetSettingsDir(const char *dir);
#ifdef NO_CRT #ifdef NO_CRT

2
plugins/LilyPad/InputManager.cpp
View File

@ -221,7 +221,7 @@ void Device::CalcVirtualState() {
double East = sin(angle); double East = sin(angle);
double South = -cos(angle); double South = -cos(angle);
// Normalize so greatest direction is 1. // Normalize so greatest direction is 1.
double mul = FULLY_DOWN / max(fabs(South), fabs(East)); double mul = FULLY_DOWN / std::max(fabs(South), fabs(East));
iEast = (int) floor(East * mul + 0.5); iEast = (int) floor(East * mul + 0.5);
iSouth = (int) floor(South * mul + 0.5); iSouth = (int) floor(South * mul + 0.5);
} }