diff options
| author | Paul Gilbert | 2014-03-01 17:28:24 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-03-01 17:28:24 -0500 |
| commit | 7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e (patch) | |
| tree | 96de4f3470bd9bcc81bbae82a3e1c59f523a8edf /engines/tsage/converse.cpp | |
| parent | badb8d97444767b7d8fea0f877ac044249696a5f (diff) | |
| parent | 2218d14fb5276724c757406d5ac1ec581160721b (diff) | |
| download | scummvm-rg350-7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e.tar.gz scummvm-rg350-7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e.tar.bz2 scummvm-rg350-7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e.zip | |
Merge branch 'master' into mads
Diffstat (limited to 'engines/tsage/converse.cpp')
| -rw-r--r-- | engines/tsage/converse.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/engines/tsage/converse.cpp b/engines/tsage/converse.cpp index ba8cfb82a9..d1faca5dac 100644 --- a/engines/tsage/converse.cpp +++ b/engines/tsage/converse.cpp @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -449,8 +449,13 @@ int ConversationChoiceDialog::execute(const Common::StringArray &choiceList) { // Draw the dialog draw(); + g_globals->_events.showCursor(); + // Force the display of an arrow cursor during discussions in R2R + if (g_vm->getGameID() == GType_Ringworld2) + R2_GLOBALS._events.setCursor(CURSOR_ARROW); + // WORKAROUND: On-screen dialogs are really meant to use a GfxManager instance // for their lifetime, which prevents saving or loading. Since I don't want to spend a lot // of time refactoring this already working dialog, fake it by putting a dummy gfxmanager at |