aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorOri Avtalion2016-10-18 19:24:51 +0300
committerOri Avtalion2016-10-18 19:24:51 +0300
commitfc85eb461d2baf78d339f456d4a91a174961ef12 (patch)
tree4e676748ff60e14b1e178884b5578404029972e2 /backends
parentd890f99c85c17186d6c3703cdad7dcfe29a7747c (diff)
downloadscummvm-rg350-fc85eb461d2baf78d339f456d4a91a174961ef12.tar.gz
scummvm-rg350-fc85eb461d2baf78d339f456d4a91a174961ef12.tar.bz2
scummvm-rg350-fc85eb461d2baf78d339f456d4a91a174961ef12.zip
SDL: Fix typo in function name
Diffstat (limited to 'backends')
-rw-r--r--backends/events/sdl/sdl-events.cpp2
-rw-r--r--backends/events/sdl/sdl-events.h2
-rw-r--r--backends/graphics/openglsdl/openglsdl-graphics.cpp6
-rw-r--r--backends/graphics/surfacesdl/surfacesdl-graphics.cpp4
-rw-r--r--backends/graphics/wincesdl/wincesdl-graphics.cpp2
5 files changed, 8 insertions, 8 deletions
diff --git a/backends/events/sdl/sdl-events.cpp b/backends/events/sdl/sdl-events.cpp
index acc1ff5dce..7caa177819 100644
--- a/backends/events/sdl/sdl-events.cpp
+++ b/backends/events/sdl/sdl-events.cpp
@@ -848,7 +848,7 @@ bool SdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
return false;
}
-void SdlEventSource::resetKeyboadEmulation(int16 x_max, int16 y_max) {
+void SdlEventSource::resetKeyboardEmulation(int16 x_max, int16 y_max) {
_km.x_max = x_max;
_km.y_max = y_max;
_km.delay_time = 25;
diff --git a/backends/events/sdl/sdl-events.h b/backends/events/sdl/sdl-events.h
index 4526065d9b..c43699420b 100644
--- a/backends/events/sdl/sdl-events.h
+++ b/backends/events/sdl/sdl-events.h
@@ -47,7 +47,7 @@ public:
/**
* Resets keyboard emulation after a video screen change
*/
- virtual void resetKeyboadEmulation(int16 x_max, int16 y_max);
+ virtual void resetKeyboardEmulation(int16 x_max, int16 y_max);
protected:
/** @name Keyboard mouse emulation
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index 042cd49099..8f2ff1b9fa 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -360,7 +360,7 @@ void OpenGLSdlGraphicsManager::notifyResize(const uint width, const uint height)
if (width != currentWidth || height != currentHeight)
return;
setActualScreenSize(width, height);
- _eventSource->resetKeyboadEmulation(width - 1, height - 1);
+ _eventSource->resetKeyboardEmulation(width - 1, height - 1);
#else
if (!_ignoreResizeEvents && _hwScreen && !(_hwScreen->flags & SDL_FULLSCREEN)) {
// We save that we handled a resize event here. We need to know this
@@ -523,7 +523,7 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
int actualWidth, actualHeight;
getWindowDimensions(&actualWidth, &actualHeight);
setActualScreenSize(actualWidth, actualHeight);
- _eventSource->resetKeyboadEmulation(actualWidth - 1, actualHeight - 1);
+ _eventSource->resetKeyboardEmulation(actualWidth - 1, actualHeight - 1);
return true;
#else
// WORKAROUND: Working around infamous SDL bugs when switching
@@ -569,7 +569,7 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
if (_hwScreen) {
notifyContextCreate(rgba8888, rgba8888);
setActualScreenSize(_hwScreen->w, _hwScreen->h);
- _eventSource->resetKeyboadEmulation(_hwScreen->w - 1, _hwScreen->h - 1);
+ _eventSource->resetKeyboardEmulation(_hwScreen->w - 1, _hwScreen->h - 1);
}
// Ignore resize events (from SDL) for a few frames, if this isn't
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 90d079d151..21e334d242 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -918,7 +918,7 @@ bool SurfaceSdlGraphicsManager::loadGFXMode() {
// For SDL2 the output resolution might differ from the requested
// resolution. We handle resetting the keyboard emulation properly inside
// our SDL_SetVideoMode wrapper for SDL2.
- _eventSource->resetKeyboadEmulation(
+ _eventSource->resetKeyboardEmulation(
_videoMode.screenWidth * _videoMode.scaleFactor - 1,
effectiveScreenHeight() - 1);
#endif
@@ -2562,7 +2562,7 @@ void SurfaceSdlGraphicsManager::setWindowResolution(int width, int height) {
_windowHeight = height;
// We expect full screen resolution as inputs coming from the event system.
- _eventSource->resetKeyboadEmulation(_windowWidth - 1, _windowHeight - 1);
+ _eventSource->resetKeyboardEmulation(_windowWidth - 1, _windowHeight - 1);
// Calculate the "viewport" for the actual area we draw in. In fullscreen
// we can easily get a different resolution than what we requested. In
diff --git a/backends/graphics/wincesdl/wincesdl-graphics.cpp b/backends/graphics/wincesdl/wincesdl-graphics.cpp
index 07f7d47262..44a1214a44 100644
--- a/backends/graphics/wincesdl/wincesdl-graphics.cpp
+++ b/backends/graphics/wincesdl/wincesdl-graphics.cpp
@@ -934,7 +934,7 @@ bool WINCESdlGraphicsManager::loadGFXMode() {
_toolbarHigh = NULL;
// keyboard cursor control, some other better place for it?
- _eventSource->resetKeyboadEmulation(_videoMode.screenWidth * _scaleFactorXm / _scaleFactorXd - 1, _videoMode.screenHeight * _scaleFactorXm / _scaleFactorXd - 1);
+ _eventSource->resetKeyboardEmulation(_videoMode.screenWidth * _scaleFactorXm / _scaleFactorXd - 1, _videoMode.screenHeight * _scaleFactorXm / _scaleFactorXd - 1);
return true;
}