thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DINGUX: More compilation fixes

Browse source 
svn-id: r54541
This commit is contained in:
Max Horn 2010-11-28 18:10:12 +00:00
parent 1c3ba8bc40
commit 8399232a43
3 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
View file

@ -23,14 +23,15 @@
*
*/
#if defined (DINGUX)
#if defined(DINGUX)
// Disable symbol overrides so that we can use system headers.
#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
#include "backends/graphics/dinguxsdl/dinguxsdl-graphics.h"
#include "backends/events/dinguxsdl/dinguxsdl-events.h"
#include "graphics/scaler/aspect.h"
// Disable symbol overrides so that we can use system headers.
#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
#include "common/mutex.h"
static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
{"1x", "Standard", GFX_NORMAL},
@ -502,10 +503,6 @@ SdlGraphicsManager::VideoState* DINGUXSdlGraphicsManager::getVideoMode() {
return &_videoMode;
}
bool DINGUXSdlGraphicsManager::isOverlayVisible() {
return _overlayVisible;
}
void DINGUXSdlGraphicsManager::warpMouse(int x, int y) {
if (_mouseCurState.x != x || _mouseCurState.y != y) {
if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
@ -522,8 +519,8 @@ void DINGUXSdlGraphicsManager::adjustMouseEvent(const Common::Event &event) {
newEvent.synthetic = true;
if (!_overlayVisible) {
if (_videoMode.mode == GFX_HALF) {
event.mouse.x *= 2;
event.mouse.y *= 2;
newEvent.mouse.x *= 2;
newEvent.mouse.y *= 2;
}
newEvent.mouse.x /= _videoMode.scaleFactor;
newEvent.mouse.y /= _videoMode.scaleFactor;

2
backends/graphics/dinguxsdl/dinguxsdl-graphics.h
View file

@ -25,7 +25,6 @@
#ifndef BACKENDS_GRAPHICS_SDL_DINGUX_H
#define BACKENDS_GRAPHICS_SDL_DINGUX_H
#if defined (DINGUX)
#include "backends/graphics/sdl/sdl-graphics.h"
@ -67,5 +66,4 @@ protected:
SdlEventSource *_evSrc;
};
#endif /* DINGUX */
#endif /* BACKENDS_GRAPHICS_SDL_DINGUX_H */