diff options
| author | Eugene Sandulenko | 2005-08-07 14:54:11 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-08-07 14:54:11 +0000 |
| commit | df1076b97adb07333a66840dbe887864d6dc473c (patch) | |
| tree | 68c96c3bcbc8e1578ec83252c069ceea23489da5 /saga | |
| parent | d3b229b0517440017e7793197921f2086cf83f3b (diff) | |
| download | scummvm-rg350-df1076b97adb07333a66840dbe887864d6dc473c.tar.gz scummvm-rg350-df1076b97adb07333a66840dbe887864d6dc473c.tar.bz2 scummvm-rg350-df1076b97adb07333a66840dbe887864d6dc473c.zip | |
Fix bug #1252289 'ITE: Crash with "paws game"'. And now game pauze is
mapped to key 'z'.
svn-id: r18626
Diffstat (limited to 'saga')
| -rw-r--r-- | saga/font.h | 5 | ||||
| -rw-r--r-- | saga/input.cpp | 2 | ||||
| -rw-r--r-- | saga/render.cpp | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/saga/font.h b/saga/font.h index df0137ed04..9ef83bb50f 100644 --- a/saga/font.h +++ b/saga/font.h @@ -118,6 +118,11 @@ class Font { error("Font::validate: Invalid font id."); } } + + bool loaded(FontId fontId) { + return !((fontId < 0) || (fontId >= _loadedFonts)); + } + private: void loadFont(uint32 fontResourceId); diff --git a/saga/input.cpp b/saga/input.cpp index bba4973696..12a15a38c5 100644 --- a/saga/input.cpp +++ b/saga/input.cpp @@ -100,7 +100,7 @@ int SagaEngine::processInput() { _actor->abortSpeech(); break; case 19: // pause - case 'p': + case 'z': _render->toggleFlag(RF_RENDERPAUSE); break; default: diff --git a/saga/render.cpp b/saga/render.cpp index f23ae46ceb..c0f6287157 100644 --- a/saga/render.cpp +++ b/saga/render.cpp @@ -145,10 +145,12 @@ void Render::drawScene() { // Display "paused game" message, if applicable if (_flags & RF_RENDERPAUSE) { - textPoint.x = (backBufferSurface->w - _vm->_font->getStringWidth(kBigFont, pauseString, 0, kFontOutline)) / 2; + FontId fontId = _vm->_font->loaded(kBigFont) ? kBigFont : kMediumFont; + + textPoint.x = (backBufferSurface->w - _vm->_font->getStringWidth(fontId, pauseString, 0, kFontOutline)) / 2; textPoint.y = 90; - _vm->_font->textDraw(kBigFont, backBufferSurface, pauseString, textPoint, kITEColorBrightWhite, kITEColorBlack, kFontOutline); + _vm->_font->textDraw(fontId, backBufferSurface, pauseString, textPoint, kITEColorBrightWhite, kITEColorBlack, kFontOutline); } // Update user interface |