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

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
Thomas Jentzsch 2019-08-08 11:47:07 +02:00
parent 18d5045d8e a7c138c13d
commit 8c332f3bd6
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/PJoystickHandler.cxx
View File

@ -490,7 +490,7 @@ void PhysicalJoystickHandler::eraseMapping(Event::Type event, EventMode mode)
stick.second->eraseMap(kCommonMode);
stick.second->eraseMap(kJoystickMode);
stick.second->eraseMap(kPaddlesMode);
stick.second->eraseMap(kKeypadMode);
stick.second->eraseMap(kKeypadMode);
}
}
}
@ -729,8 +729,8 @@ void PhysicalJoystickHandler::handleHatEvent(int stick, int hat, int value)
myHandler.overlay().handleJoyHatEvent(stick, hat, JoyHat::LEFT, button);
}
}
}
#endif
}
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

9
src/emucore/FBSurface.cxx
View File

@ -312,9 +312,7 @@ void FBSurface::frameRect(uInt32 x, uInt32 y, uInt32 w, uInt32 h,
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void FBSurface::wrapString(const string inStr, int pos, string& leftStr, string& rightStr) const
{
int i;
for(i = pos; i > 0; --i)
for(int i = pos; i > 0; --i)
{
if(isWhiteSpace(inStr[i]))
{
@ -333,9 +331,8 @@ void FBSurface::wrapString(const string inStr, int pos, string& leftStr, string&
bool FBSurface::isWhiteSpace(const char s) const
{
const string WHITESPACES = " ,.;:+-";
int i;
for(i = 0; i < WHITESPACES.length(); ++i)
for(size_t i = 0; i < WHITESPACES.length(); ++i)
if(s == WHITESPACES[i])
return true;
@ -348,6 +345,7 @@ void FBSurface::drawString(const GUI::Font& font, const string& s,
ColorId color, TextAlign align,
int deltax, bool useEllipsis, ColorId shadowColor)
{
#ifdef GUI_SUPPORT
string inStr = s;
// draw multiline string
@ -375,6 +373,7 @@ void FBSurface::drawString(const GUI::Font& font, const string& s,
inStr = rightStr;
}
drawString(font, inStr, x, y, w, color, align, deltax, useEllipsis, shadowColor);
#endif
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

1
src/libretro/Makefile.common
View File

@ -19,6 +19,7 @@ SOURCES_CXX := \
$(CORE_DIR)/common/Base.cxx \
$(CORE_DIR)/common/FpsMeter.cxx \
$(CORE_DIR)/common/FSNodeZIP.cxx \
$(CORE_DIR)/common/JoyMap.cxx \
$(CORE_DIR)/common/KeyMap.cxx \
$(CORE_DIR)/common/Logger.cxx \
$(CORE_DIR)/common/MouseControl.cxx \