Commit Graph

67 Commits

Author SHA1 Message Date
Max Horn
88913c0139 ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
2011-06-20 00:59:48 +02:00
md5
60943efafd SCI: Fixed bug #3295931 - "SCI: JONES: Disabled commands are available using shortcuts" 2011-06-12 17:58:25 +03:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
md5
fd2c39591f SCI: Fixed the flashing icon bar in the Mac version of Castle of Dr. Brain
Thanks to waltervn for his work and help on this
2011-03-13 23:34:08 +02:00
Johannes Schickel
463e475bd6 SCI: Save mouse position in SciEvent.
Instead of querying the event manager for the current mouse cursor coordinates
kGetEvent now uses the saved mouse positions, which will assure every event
will be processed with the correct coordinates instead of the current ones.
Various other functions using SciEvent directly were adapted too.

This fixes cursor click positions for the WinCE backend.

Thanks to wjp and waltervn for helping me with this.
2011-03-09 01:19:12 +01:00
Willem Jan Palenstijn
eece58df7f SCI: Remove unused argument to said 2011-03-08 22:50:32 +01:00
Filippos Karapetis
0309f36552 SCI: Plugged 2 memory leaks, reported by digitall
- Plugged 2 memory leaks in the SCI0 menu code (the lists of menu and submenu entries)
- Got rid of the _listCount variable

svn-id: r55254
2011-01-15 23:55:35 +00:00
Filippos Karapetis
505e1888e5 SCI: Some function renaming
Draw_Status -> DrawStatus
Draw_String -> DrawString

svn-id: r55178
2011-01-08 23:16:44 +00:00
Filippos Karapetis
32d7e687ee SCI: debugC calls no longer require a debug level of 2 to show output
svn-id: r55086
2011-01-01 12:48:12 +00:00
Max Horn
ba3e826872 SCI: Remove any use of printf
svn-id: r54037
2010-11-02 09:49:47 +00:00
Martin Kiewitz
cd6aa62702 SCI: adding separate status drawing code
now also draws "IV" in KQ4 correctly. This wasn't the case before because we reused the regular drawing code, which would see the 0xA ("IV") as linebreak

save for backport

svn-id: r52913
2010-09-26 18:23:53 +00:00
Matthew Hoops
bc54fde8e1 SCI: Ignore setAttribute() on any non-existent menu items
This fixes two fan games: Al Pond 2 and Aquarius. The original interpreter did this as well.

svn-id: r51477
2010-07-29 19:08:07 +00:00
Matthew Hoops
07b67fe44b SCI: Fix using the parser in SCI Fan Games
Get a pointer to the said spec instead of copying to a buffer. The fan games use a said spec with size < 64. Also, make said() take a const pointer as the spec cannot change. Thanks to waltervn and wjp.

svn-id: r51432
2010-07-28 19:03:49 +00:00
Filippos Karapetis
3c8a606e71 SCI: Added bug report numbers for all the recently fixed bugs
svn-id: r51407
2010-07-28 07:51:49 +00:00
Filippos Karapetis
27ce375a95 SCI: Fixed bug #3034507, "PQ2 Demo: Non-existant menu item"
svn-id: r51294
2010-07-26 05:49:00 +00:00
Martin Kiewitz
c2577da7e0 SCI: fixed jones/ega/vga port issue
getPortById() error was caused by us remembering port when going interactive, restoring it and restoring it all the time afterwards as well

svn-id: r51071
2010-07-20 19:42:48 +00:00
Martin Kiewitz
28d07c7e0a SCI: calculate widths for menu after switching to menuport, i guess this was the reason why we sometimes had issues drawing parts of the menu (random issue)
svn-id: r50784
2010-07-10 16:22:08 +00:00
Martin Kiewitz
a7cd1534c6 SCI: fix regression of r50721 - pausing/resuming only on actual menu usage
svn-id: r50724
2010-07-06 14:10:09 +00:00
Max Horn
8db0f726c0 SCI: Rewrap more comments
svn-id: r50500
2010-06-29 14:55:32 +00:00
Filippos Karapetis
0a102981f0 Moved the SelectorCache struct inside selector.h, where it belongs, and fixed some header dependencies in the process
svn-id: r50183
2010-06-23 15:23:37 +00:00
Max Horn
a2bcf9ac31 SCI: Rename sciEvent to SciEvent
svn-id: r49960
2010-06-17 23:11:12 +00:00
Max Horn
8e07a1e167 SCI: Moved the event code a little bit around.
* Move sleep() from EventManager to SciEngine
* Rename EventManager methods: get -> getSciEvent, and
  getFromScummVM -> getScummVMEvent
* Make scancode_rows static const
* Turn altify & numlockify from EventManager methods into static
  functions (and comment out the currently unused numlockify)

svn-id: r49959
2010-06-17 23:10:37 +00:00
Martin Kiewitz
b25aba1d1e SCI: SciGui/SciGui32 gone for good...
svn-id: r49860
2010-06-15 15:44:24 +00:00
Filippos Karapetis
5cb311ee2c Renamed the SciEvent class to EventManager, to separate it from the sciEvent structure, and removed it from the engine state
svn-id: r49534
2010-06-09 07:59:42 +00:00
Filippos Karapetis
67de5b1bd3 Mass renaming of selector-related functions, and removed some defines which were just cloaking functions with a different name
- GET_SEL32 -> readSelector
- GET_SEL32V -> readSelectorValue
- PUT_SEL32 -> writeSelector
- PUT_SEL32V -> writeSelectorValue
Also, changed some selector-related function names and variables to CamelCase

svn-id: r49317
2010-05-29 23:37:15 +00:00
Martin Kiewitz
5e4868fb00 SCI: handle TAB like Ctrl-I on menu key checking, sci0 also did it that way - makes TAB work for inventory in iceman/qfg1ega
svn-id: r49044
2010-05-15 21:28:26 +00:00
Martin Kiewitz
59a255226f SCI: SCI_SCREEN_MASK_* now GFX_SCREEN_MASK_*, using enum - added new enum GFX_SCREEN_UPSCALED_*
svn-id: r49039
2010-05-15 08:57:13 +00:00
Martin Kiewitz
aaaab9ec34 SCI: fix regression of r48659 - now calculating menu width and splitting text on kernelDrawMenuBar() as well - fixes menu not displaying all the time in hoyle 1&2
svn-id: r48791
2010-04-25 09:35:34 +00:00
Martin Kiewitz
ad24968f56 SCI: menu - handle right aligned "=" as actual text not as tag marker, also handle "=" as being a supported shortcut key
svn-id: r48747
2010-04-20 15:28:19 +00:00
Martin Kiewitz
e70a484415 SCI: remove lone spaces at the end of right aligned menu items. fixes "wrongly" aligned menu items in some games
svn-id: r48746
2010-04-20 15:10:27 +00:00
Martin Kiewitz
f68dfd61de SCI: fix regression from r48685 - english got always used for menu entries
svn-id: r48698
2010-04-18 10:15:56 +00:00
Martin Kiewitz
2ac3e93dab SCI: move menu window inside the screen, if parts of it are outside (happens in multilingual sq3 and lsl3)
svn-id: r48686
2010-04-17 13:42:19 +00:00
Martin Kiewitz
08ad84d556 SCI: implement ability to handle multilingual menu separators (is actually 2 separators with a language separator inbetween)
svn-id: r48685
2010-04-17 13:34:16 +00:00
Walter van Niftrik
20c461e541 SCI: Remove subtitles in menu.
svn-id: r48683
2010-04-17 03:11:54 +00:00
Martin Kiewitz
20392ebee8 SCI: split menu/item strings when displaying instead of when initializing - makes on-the-fly menu language changes possible (used by multilingual SCI01 games)
svn-id: r48659
2010-04-15 16:40:37 +00:00
Max Horn
2e68de1e5a SCI: Turn kernel_sleep() into SciEvent::sleep()
svn-id: r48119
2010-02-23 22:47:53 +00:00
Max Horn
b9a11ddb0b SCI: Move language related code from EngineState to SciEngine
svn-id: r48052
2010-02-13 17:46:44 +00:00
Max Horn
ac4d325e0d SCI: Add global g_sci pointer to the active SciEngine instance
svn-id: r48046
2010-02-13 17:42:49 +00:00
Martin Kiewitz
a4039182ce SCI: also reset some variables inside reset(), so we dont error() out in lsl2 and other games that reset game engine inbetween
svn-id: r48015
2010-02-09 18:24:54 +00:00
Max Horn
f86618f92b SCI: Add a 'SELECTOR' macro
svn-id: r47918
2010-02-05 22:55:18 +00:00
Martin Kiewitz
16efee3c0d SCI: drawMenuBar, drawStatus now called directly and w/o SciGui
svn-id: r47913
2010-02-05 20:48:06 +00:00
Martin Kiewitz
f3ea96d168 SCI: GfxCoordAdjuster class added, local2Global and global2Local use that class directly, kGraph / RedrawBox is now using GfxPaint16 directly
svn-id: r47908
2010-02-05 18:56:13 +00:00
Martin Kiewitz
f8f490c565 SCI: calling most of the cursor functions directly via _gfxCursor instead of SciGui/32
svn-id: r47903
2010-02-05 14:48:51 +00:00
Martin Kiewitz
6c204cc890 SCI: renamed class Cursor to GfxCursor
svn-id: r47902
2010-02-05 13:05:26 +00:00
Martin Kiewitz
a20f4ef1fc SCI: implemented reset for GfxMenu, not recreating object anymore
svn-id: r47793
2010-02-01 10:16:45 +00:00
Martin Kiewitz
845c245ff3 SCI: class menu renamed to GfxMenu - now getting called directly, also fix for loading savedgames
svn-id: r47792
2010-02-01 09:53:42 +00:00
Martin Kiewitz
19bca95905 SCI: renamed Text class to GfxText16
svn-id: r47780
2010-01-31 21:54:43 +00:00
Martin Kiewitz
72c2d360f7 SCI: renamed SciPalette to GfxPalette, Screen to GfxScreen, GfxPalette is now called directly w/o SciGui
svn-id: r47752
2010-01-31 16:21:11 +00:00
Martin Kiewitz
7929255cd9 SCI: cleaned up graphics classes, removed gfx&windowmgr, added gfxports, gfxcompare, gfxpaint16, gfxcache. kernel uses gfxports directly w/o going through SciGui
svn-id: r47745
2010-01-31 12:35:15 +00:00
Max Horn
4ffec28103 SCI: Move selector stuff to new header; reorder k_argc & k_argp param of invoke_selector
svn-id: r47665
2010-01-29 11:03:54 +00:00