From 7f20dd80730c558d9cc73b473e01e0288f1b0ba4 Mon Sep 17 00:00:00 2001 From: wowzaman12 Date: Fri, 27 Mar 2015 21:06:10 +0000 Subject: [PATCH] intial fix for solarsensor that skid implemented. Will add functioning code after, for now it will allow users to compile at least the SDL interface. git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1254 a31d4220-a93d-0410-bf67-fe4944624d44 --- src/sdl/SDL.cpp | 56 ++++++++++++++++++++++++++++++-------------- src/sdl/inputSDL.cpp | 1 + 2 files changed, 39 insertions(+), 18 deletions(-) diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp index 436248cd..8c203472 100644 --- a/src/sdl/SDL.cpp +++ b/src/sdl/SDL.cpp @@ -2658,50 +2658,70 @@ bool systemCanChangeSoundQuality() bool systemPauseOnFrame() { - if(pauseNextFrame) { - paused = true; - pauseNextFrame = false; - return true; - } - return false; + if(pauseNextFrame) { + paused = true; + pauseNextFrame = false; + return true; + } + return false; } void systemGbBorderOn() { - srcWidth = 256; - srcHeight = 224; - gbBorderLineSkip = 256; - gbBorderColumnSkip = 48; - gbBorderRowSkip = 40; + srcWidth = 256; + srcHeight = 224; + gbBorderLineSkip = 256; + gbBorderColumnSkip = 48; + gbBorderRowSkip = 40; - sdlInitVideo(); + sdlInitVideo(); - filterFunction = initFilter(filter, systemColorDepth, srcWidth); + filterFunction = initFilter(filter, systemColorDepth, srcWidth); } bool systemReadJoypads() { - return true; + return true; } u32 systemReadJoypad(int which) { - return inputReadJoypad(which); + return inputReadJoypad(which); +} +//static u8 sensorDarkness = 0xE8; // total darkness (including daylight on rainy days) + +void systemUpdateSolarSensor() +{ +} + +void systemCartridgeRumble(bool) +{ } void systemUpdateMotionSensor() { - inputUpdateMotionSensor(); + inputUpdateMotionSensor(); + systemUpdateSolarSensor(); } int systemGetSensorX() { - return inputGetSensorX(); + return inputGetSensorX(); } int systemGetSensorY() { - return inputGetSensorY(); + return inputGetSensorY(); +} + +int systemGetSensorZ() +{ + return 0; +} + +u8 systemGetSensorDarkness() +{ + //return sensorDarkness; } SoundDriver * systemSoundInit() diff --git a/src/sdl/inputSDL.cpp b/src/sdl/inputSDL.cpp index 6c54e09c..28598e98 100644 --- a/src/sdl/inputSDL.cpp +++ b/src/sdl/inputSDL.cpp @@ -619,3 +619,4 @@ EPad inputGetDefaultJoypad() { return sdlDefaultJoypad; } +