diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2010-05-29 10:09:24 +0000 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2010-05-29 10:09:24 +0000 |
| commit | 05ef8231b83a7a1014b23c9400a93725cabb10d0 (patch) | |
| tree | b47a14a7ded3b6b14ba44488589e105657ebd943 /Source/Core | |
| parent | 4f10ded2b6035beaa17b0824522fc9e8cee39ae3 (diff) | |
Changed both video plugins to save PNG screenshots. Made GCPad New default in trunk (it already is in stable). Fixed a hack in new wiimote plugin. Other minor changes.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5532 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/Src/CommonPaths.h | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Src/LogManager.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/Core/Src/Core.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputJoystick.cpp | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h index 9a65a3a4df..1a3b5168d1 100644 --- a/Source/Core/Common/Src/CommonPaths.h +++ b/Source/Core/Common/Src/CommonPaths.h @@ -132,7 +132,7 @@ // Plugin files #define DEFAULT_GFX_PLUGIN PLUGIN_PREFIX "Plugin_VideoOGL" PLUGIN_SUFFIX #define DEFAULT_DSP_PLUGIN PLUGIN_PREFIX "Plugin_DSP_HLE" PLUGIN_SUFFIX -#define DEFAULT_PAD_PLUGIN PLUGIN_PREFIX "Plugin_GCPad" PLUGIN_SUFFIX +#define DEFAULT_PAD_PLUGIN PLUGIN_PREFIX "Plugin_GCPadNew" PLUGIN_SUFFIX #define DEFAULT_WIIMOTE_PLUGIN PLUGIN_PREFIX "Plugin_Wiimote" PLUGIN_SUFFIX // Sys files diff --git a/Source/Core/Common/Src/LogManager.cpp b/Source/Core/Common/Src/LogManager.cpp index 559de0b7f5..d60dda56e4 100644 --- a/Source/Core/Common/Src/LogManager.cpp +++ b/Source/Core/Common/Src/LogManager.cpp @@ -168,8 +168,7 @@ void LogContainer::removeListener(LogListener *listener) { } bool LogContainer::isListener(LogListener *listener) const { - std::vector<LogListener *>::const_iterator i = std::find(listeners.begin(), listeners.end(), listener); - return listeners.end() != i; + return listeners.end() != std::find(listeners.begin(), listeners.end(), listener); } void LogContainer::trigger(LogTypes::LOG_LEVELS level, const char *msg) { diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index 1a4497db25..5713cb88d0 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -581,9 +581,9 @@ static inline std::string GenerateScreenshotName() //append gameId, tempname only contains the folder here. tempname += gameId; - name = StringFromFormat("%s-%d.bmp", tempname.c_str(), index); - while(File::Exists(name.c_str())) - name = StringFromFormat("%s-%d.bmp", tempname.c_str(), ++index); + do + name = StringFromFormat("%s-%d.png", tempname.c_str(), index++); + while (File::Exists(name.c_str())); return name; } diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputJoystick.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputJoystick.cpp index 2b6bf6bb76..7731577629 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputJoystick.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputJoystick.cpp @@ -6,7 +6,7 @@ inline bool operator<(const GUID & lhs, const GUID & rhs) { - return memcmp(&lhs, &rhs, sizeof(GUID)) < 0 ? true : false; + return memcmp(&lhs, &rhs, sizeof(GUID)) < 0; } namespace ciface |