aboutsummaryrefslogtreecommitdiff
path: root/gui/newgui.cpp
diff options
context:
space:
mode:
authorMatt Hargett2002-09-22 03:53:53 +0000
committerMatt Hargett2002-09-22 03:53:53 +0000
commit8390b0cc53b2025108eee9a8ea9ee7f411edd55e (patch)
tree5ca2452114d38060824e0edee01ce7955132ad37 /gui/newgui.cpp
parentfbe9c544de19cc4a7f28e2dbf1fdebaf351b83ee (diff)
downloadscummvm-rg350-8390b0cc53b2025108eee9a8ea9ee7f411edd55e.tar.gz
scummvm-rg350-8390b0cc53b2025108eee9a8ea9ee7f411edd55e.tar.bz2
scummvm-rg350-8390b0cc53b2025108eee9a8ea9ee7f411edd55e.zip
2002-09-21 Matt Hargett <matt@use.net>
* scumm.dsp, scummvm.dsp, simon.dsp: Turn on warning as errors. Generate PDBs on all builds. * gameDetector.cpp, newgui.cpp, widget.cpp, actor.cpp, dialogs.cpp, resource.cpp, saveload.cpp, scumm_renderer.cpp: Fix warnings where possible. One pragma added to eliminate warning of unknown pragmas. * string.cpp: If unknown escape sequence, print warning. svn-id: r4998
Diffstat (limited to 'gui/newgui.cpp')
-rw-r--r--gui/newgui.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index e2c3dfb639..f8dff32c90 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -26,6 +26,10 @@
#include "dialog.h"
#include "scumm/dialogs.h"
+#ifdef _MSC_VER
+# pragma warning( disable : 4068 ) // unknown pragma
+#endif
+
/*
* TODO list
* - get a nicer font which contains diacrits (ŠšŸ§Žˆ etc.)
@@ -126,7 +130,7 @@ void NewGui::loop()
switch(t.event_code) {
case OSystem::EVENT_KEYDOWN:
- activeDialog->handleKeyDown(t.kbd.ascii, t.kbd.flags);
+ activeDialog->handleKeyDown((byte)t.kbd.ascii, t.kbd.flags);
// init continuous event stream
_currentKeyDown = t.kbd.ascii;
@@ -135,7 +139,7 @@ void NewGui::loop()
_keyRepeatLoopCount = 0;
break;
case OSystem::EVENT_KEYUP:
- activeDialog->handleKeyUp(t.kbd.ascii, t.kbd.flags);
+ activeDialog->handleKeyUp((byte)t.kbd.ascii, t.kbd.flags);
if (t.kbd.ascii == _currentKeyDown)
// only stop firing events if it's the current key
_currentKeyDown = 0;