mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
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
This commit is contained in:
@ -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
|
||||
|
@ -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) {
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user