diff options
| author | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-13 03:57:44 +0000 |
| commit | 75e8452b6e6a2bf4fb2f588aa00b428a60d873b5 (patch) | |
| tree | f29541d55309487a94bd1d38e8b53bb3dde9aec6 /backends/platform/n64/osys_n64.h | |
| parent | 48ee83b88957dab86bc763e9ef21a70179fa8679 (diff) | |
| parent | e9f50882ea5b6beeefa994040be9d3bab6a1f107 (diff) | |
| download | scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.gz scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.tar.bz2 scummvm-rg350-75e8452b6e6a2bf4fb2f588aa00b428a60d873b5.zip | |
OPENGL: Merged from trunk, from rev 52105 to 53396.
This includes an rather hacky attempt to merge all the recent gp2x backend
changes into the branch. I suppose the gp2x backend and probably all new
backends, i.e. gph, dingux etc., might not compile anymore.
Since I have no way of testing those it would be nice if porters could look
into getting those up to speed in this branch.
svn-id: r53399
Diffstat (limited to 'backends/platform/n64/osys_n64.h')
| -rw-r--r-- | backends/platform/n64/osys_n64.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h index f7560eb4d3..707bb1b7ae 100644 --- a/backends/platform/n64/osys_n64.h +++ b/backends/platform/n64/osys_n64.h @@ -98,7 +98,7 @@ protected: uint16 _gameWidth, _gameHeight; uint16 _frameBufferWidth; // Width of framebuffer in N64 memory uint8 _offscrPixels; // Pixels to skip on each line before start drawing, used to center image - uint8 _maxFps; + uint8 _maxFps; // Max frames-per-second which can be shown on screen int _shakeOffset; @@ -123,7 +123,7 @@ protected: uint8 _controllerPort; int8 _mousePort; - bool _controllerHasRumble; + bool _controllerHasRumble; // Gets enabled if rumble-pak is detected bool _dirtyOffscreen; @@ -133,8 +133,8 @@ public: uint16 _audioBufferSize; uint32 _viClockRate; // Clock rate of video system, depending on VI mode - int _timerCallbackNext; - int _timerCallbackTimer; + uint32 _timerCallbackNext; + uint32 _timerCallbackTimer; TimerProc _timerCallback; /* *** */ |