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

ALL: Merge from ScummVM rev 3a933138ce

Browse source
This commit is contained in:
Bastien Bouclet 2017-12-03 18:33:19 +01:00
parent 5dad979952
commit 3ec01653c3
134 changed files with 9868 additions and 9034 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backends/graphics/sdl/sdl-graphics.cpp
View file

@ -41,7 +41,7 @@ void SdlGraphicsManager::deactivateManager() {
_eventSource->setGraphicsManager(0);
}
SdlGraphicsManager::State SdlGraphicsManager::getState() {
SdlGraphicsManager::State SdlGraphicsManager::getState() const {
State state;
state.screenWidth = getWidth();
@ -60,7 +60,7 @@ bool SdlGraphicsManager::setState(const State &state) {
#ifdef USE_RGB_COLOR
initSize(state.screenWidth, state.screenHeight, &state.pixelFormat);
#else
initSize(state.screenWidth, state.screenHeight, 0);
initSize(state.screenWidth, state.screenHeight, nullptr);
#endif
setFeatureState(OSystem::kFeatureAspectRatioCorrection, state.aspectRatio);
setFeatureState(OSystem::kFeatureFullscreenMode, state.fullscreen);