Nicola Mettifogo
2fb22f2eea
Now clipping frame # to avoid crashes because of bad behavior of game scripts.
...
svn-id: r27683
2007-06-23 21:42:45 +00:00
Robin Watts
90c2210dae
Add a couple of casts from int to (Common:KeyCode) in the WinCE specific code.
...
2 of the 4 casts are lifted from the standard sdl/events.cpp file. The other
2 (casting the results of mapKeyCE before assigning to event.kbd.keycode look
correct to me too, but might bear double checking.
svn-id: r27680
2007-06-23 17:15:36 +00:00
Sven Hesse
8953674a2f
Fixed the FIXME (by making Util::_keyBuffer an array of Common::KeyState)
...
svn-id: r27679
2007-06-23 17:00:27 +00:00
Max Horn
1665d158f4
More cleanup
...
svn-id: r27678
2007-06-23 16:51:06 +00:00
Max Horn
24f080ab56
Cleanup; also fixed Alt-F5 (orig. saveload menu) in COMI
...
svn-id: r27677
2007-06-23 16:46:00 +00:00
Robin Watts
f0a25f7a9b
Tweaks to WinCE makefile.
...
The choice of which libraries to use (zlib, tremorce, mad, mpeg2 etc) is
now made by a single define per library towards the top of the makefile.
Given that developers tend to have different options selected on their local
builds, hopefully this will minimise the changes on aubsequent svn updates.
svn-id: r27676
2007-06-23 16:37:42 +00:00
Max Horn
1a07bfb221
Reworked the SCUMM input code even more: Merged various code paths and streamlined stuff; as a consequence, e.g. talkstop works in V0-V2 games, too; but also regressions may turn up. Also don't rely on Common::ASCII_F1 etc. values to compute SCUMM specific key codes
...
svn-id: r27675
2007-06-23 16:27:28 +00:00
Max Horn
558a28f69d
Removing WinCE specific code in ScummEngine_v7::processKeyboard -- it made no sense at all. If this breaks something, please contact me so that we can properly fix it together
...
svn-id: r27674
2007-06-23 16:07:38 +00:00
Max Horn
f18132f5b8
Simplify code: Since processInput() always overwrite the value of lastKeyHit if KEY_ALL_SKIP is seen, we can never encounter KEY_ALL_SKIP at this spot
...
svn-id: r27673
2007-06-23 16:05:38 +00:00
Max Horn
4297ccc964
Revised SCUMM's input code. We now fix the keys F5, '.', space, escape for mainmenu, talkstop, pause, cutsceneExit; this simplifies and clarifies the code, and ensures consistent game behavior
...
svn-id: r27672
2007-06-23 16:02:50 +00:00
Max Horn
ea5bce6a3c
Added GOB FIXME
...
svn-id: r27671
2007-06-23 15:59:00 +00:00
Max Horn
c99515be86
Changed BASS to use more KEYCODEs
...
svn-id: r27670
2007-06-23 15:40:28 +00:00
Sven Hesse
04afb9bc7d
Using KEYCODE_f and KEYCODE_g instead of 'f' and 'g' to check for fast-mode-keys
...
svn-id: r27669
2007-06-23 15:09:22 +00:00
Max Horn
6ef494ab28
Converted LURE code to use KEYCODEs
...
svn-id: r27668
2007-06-23 14:59:58 +00:00
Max Horn
9f1e47aa53
Compare Common::KEYCODE_ against KeyState::keycode, not KeyState::ascii
...
svn-id: r27666
2007-06-23 14:19:54 +00:00
Max Horn
dcae6d14a4
Changed the way VAR_VERSION_KEY is handled
...
svn-id: r27665
2007-06-23 14:16:04 +00:00
Nicola Mettifogo
83172bc8b0
Changed input routine to use KEYCODE.
...
svn-id: r27664
2007-06-23 14:10:44 +00:00
Max Horn
518cedec9d
Moved F1 key remapping in COMI to a more appropriate place
...
svn-id: r27663
2007-06-23 12:31:42 +00:00
Travis Howell
0a21b0c1f1
Correct typo.
...
svn-id: r27662
2007-06-23 12:24:49 +00:00
Max Horn
8345f679a5
cleanup
...
svn-id: r27661
2007-06-23 12:22:23 +00:00
Travis Howell
8151111ee8
Add missing semi-colon.
...
svn-id: r27660
2007-06-23 12:16:43 +00:00
Max Horn
302da0b855
SCUMM: Added three FIXME comments to the _keyDownMap code, and made it use KEYCODE_ constants for clarity
...
svn-id: r27659
2007-06-23 11:53:24 +00:00
Max Horn
3ce5f8abf3
Made use of full Common::KeyState in SCUMM (there is still lots of room for improvements, though)
...
svn-id: r27656
2007-06-23 10:46:32 +00:00
Max Horn
4e4358e8c3
Made SCUMM use Common::KeyState, too (but implemented almost no fixes/optimizations based on this)
...
svn-id: r27655
2007-06-23 10:38:03 +00:00
Max Horn
2bbe67afdf
Added more flexible KeyState constructor; updated comment in gui/Key.h
...
svn-id: r27654
2007-06-23 10:06:39 +00:00
Oystein Eftevaag
40e7a533ee
MacOS X bundle changes (copying in engine data files, pred.dic, and updated DS_Store
...
svn-id: r27652
2007-06-23 09:29:06 +00:00
Oystein Eftevaag
d4aeb680cf
Minor formatting fix
...
svn-id: r27651
2007-06-23 08:58:36 +00:00
Oystein Eftevaag
62a28d0864
Applying patch 1669536: Kyra2: Intro fixes
...
svn-id: r27650
2007-06-23 08:42:30 +00:00
Travis Howell
5505801533
Minor cleanup.
...
svn-id: r27649
2007-06-23 08:26:18 +00:00
Travis Howell
d36ca0f7a5
Ooops, adjust Elvira 2 specific offset too.
...
svn-id: r27648
2007-06-23 07:49:17 +00:00
Travis Howell
ee143c01ed
Minor cleanup.
...
svn-id: r27646
2007-06-23 07:40:25 +00:00
Travis Howell
f311ca82ce
Fix alignment issue in setWindowPalete video opcode.
...
svn-id: r27645
2007-06-23 07:25:50 +00:00
Filippos Karapetis
d8dc693578
Update MSVC8 ScummVM project file for commit #27640
...
svn-id: r27644
2007-06-23 00:42:26 +00:00
Max Horn
f97cbb8294
Update GUI::Key constructs
...
svn-id: r27643
2007-06-23 00:05:32 +00:00
Max Horn
05a70fc8e4
Produce 'correct' keycode/ascii values for function keys
...
svn-id: r27642
2007-06-22 23:43:17 +00:00
Max Horn
d9718b0684
Do not use SCUMMVM_USE_LONG_INT on _MSC_VER anymore (if it *is* needed after all, speak up -- that FIXME has been in there for far too long, however)
...
svn-id: r27641
2007-06-22 23:27:32 +00:00
Max Horn
e7a58d9369
Moved keyboard stuff to a separate header file
...
svn-id: r27640
2007-06-22 23:20:50 +00:00
Max Horn
86dffa1dc9
0xD -> Common::KEYCODE_RETURN
...
svn-id: r27639
2007-06-22 23:14:33 +00:00
Max Horn
8a721de91c
AGI: Properly handle backspace key on all systems, not just OS X
...
svn-id: r27638
2007-06-22 23:12:24 +00:00
Max Horn
a041ef2317
Slightly updated key handling in BS2, Kyra, and Touche
...
svn-id: r27637
2007-06-22 23:03:12 +00:00
Max Horn
d0ee1b3c8f
BS1: Make use of Common::KeySate::reset()
...
svn-id: r27636
2007-06-22 22:19:17 +00:00
Max Horn
05ca0d86ba
Converted BASS to use Common::KeyState
...
svn-id: r27635
2007-06-22 22:18:56 +00:00
Max Horn
c690cad67f
Added constructor & reset() method to Common::KeyState
...
svn-id: r27634
2007-06-22 22:18:15 +00:00
Filippos Karapetis
b85320fa69
Fix MSVC8 warning
...
svn-id: r27633
2007-06-22 22:14:35 +00:00
Joost Peters
cd8f5dc521
fix compilation by casting the %, {, }, | and ~ keycode "magic" numbers to Common::KeyCode
...
svn-id: r27632
2007-06-22 22:06:25 +00:00
Max Horn
1441f0d044
Converted rest of BS1 to use Common::KeyState (removing two more hacks)
...
svn-id: r27631
2007-06-22 22:00:46 +00:00
Max Horn
8cfb778bfa
Adding two missing #includes to fix compilation. *sigh* I am really bad at double checking my commits tonight. Sorry, folks
...
svn-id: r27630
2007-06-22 21:58:32 +00:00
Filippos Karapetis
f974a3c48e
Update MSVC8 lure project file for commits #27604 and #27608
...
svn-id: r27629
2007-06-22 21:42:00 +00:00
Max Horn
d21b8c43d0
Converted some more code to make use of Common::KEYCODE_ / Common::ASCII_
...
svn-id: r27628
2007-06-22 21:38:34 +00:00
Max Horn
c9030e4653
Made BS1 track the full KeyState upon KEYDOWN events (this makes it possible to remove to workaround for Mac keyboards)
...
svn-id: r27627
2007-06-22 21:34:03 +00:00