Commit Graph

89 Commits

Author SHA1 Message Date
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
Martin Kiewitz
2d5dabee30 SCI: implemented pauseSound inside kMenuSelect
svn-id: r50721
2010-07-06 11:16:11 +00:00
Max Horn
bb528d894c SCI: Rewrap some overlong comments
svn-id: r50012
2010-06-18 09:37:06 +00:00
Martin Kiewitz
b25aba1d1e SCI: SciGui/SciGui32 gone for good...
svn-id: r49860
2010-06-15 15:44:24 +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
b9a11ddb0b SCI: Move language related code from EngineState to SciEngine
svn-id: r48052
2010-02-13 17:46:44 +00:00
Max Horn
a82939c9be SCI: Get rid of EngineState::resMan
svn-id: r48048
2010-02-13 17:44:19 +00:00
Max Horn
721a57a661 SCI: Move Gui/Gfx related permanent objects from EngineState to SciEngine
svn-id: r48047
2010-02-13 17:43:31 +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
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
Filippos Karapetis
d99aa0f126 More renaming
svn-id: r47009
2010-01-05 01:37:57 +00:00
Filippos Karapetis
84cd8d2dc7 Renamed /gui to /graphics and /sfx to /sound, to better illustrate their purpose
svn-id: r47007
2010-01-05 01:22:16 +00:00
Filippos Karapetis
f66d5a7f53 SCI: Removed the old graphics code
svn-id: r47005
2010-01-05 00:54:53 +00:00
Filippos Karapetis
e86a16a641 Fixed menus in multilingual SCI01 games
svn-id: r46460
2009-12-21 14:05:36 +00:00
Filippos Karapetis
226f0bd23d The menu bar code is no longer used in the new graphics code, and the menu state is no longer stored in saved games
svn-id: r45854
2009-11-12 09:24:46 +00:00
Martin Kiewitz
d758538eaa SCI/newgui: SciGuiMenu partially implemented
svn-id: r45634
2009-11-03 19:33:31 +00:00
Max Horn
3a2833867f SCI: Fix warning about unused variable
svn-id: r45614
2009-11-02 20:33:34 +00:00
Martin Kiewitz
10a902735a SCI: SciGuiMenu created, kMenu-related stuff now using SciGui
svn-id: r45612
2009-11-02 17:59:19 +00:00
Filippos Karapetis
57266a7cba - Removed status_bar_foreground and status_bar_background variables from the engine state
- Implemented clearMenuBar() in the new graphics code
- Removed the "status_bar" command, which was used to set custom colors for the status bar

svn-id: r45538
2009-10-30 14:39:26 +00:00
Filippos Karapetis
ff284c9f5b Remove unused includes when INCLUDE_OLDGFX is not set. Implemented the full screen updates that the current menu code is doing using new graphics functions (still unfinished). Some cleanup.
svn-id: r45536
2009-10-30 12:33:05 +00:00
Filippos Karapetis
fa3305ee01 Moved some menu code outside the INCLUDE_OLDGFX safeguards
svn-id: r45496
2009-10-29 01:10:10 +00:00
Filippos Karapetis
2d9d9bca13 Changed some of the menu code to use new graphics functions
svn-id: r45493
2009-10-28 23:04:56 +00:00
Filippos Karapetis
d62342b32b Wording. Added warnings for unimplemented menu-related functions in the new GUI code
svn-id: r45489
2009-10-28 21:49:16 +00:00
Filippos Karapetis
04ab6bc9fc Enclose all of the old graphics code within the INCLUDE_OLDGFX safeguard (defined in sci.h)
svn-id: r45459
2009-10-28 13:20:30 +00:00
Filippos Karapetis
512c9cae11 Fixed a crash when selecting menu items
svn-id: r45334
2009-10-22 09:36:46 +00:00
Filippos Karapetis
a4704352e4 Changed mapPointer() to accept a Common::Rect, thus removing the reference to gfx_widgets.h
svn-id: r45242
2009-10-19 09:56:11 +00:00
Max Horn
f3ab3051d8 SCI: Make the implicit segMan param to GET_SEL32(V) and PUT_SEL32(V) explicit
svn-id: r45234
2009-10-18 19:42:56 +00:00
Martin Kiewitz
01dc7545d2 SCI: drawMenuBar/clearMenuBar now using gui class, currently unimplemented in newgui, but so wont get affected by oldgui switching to visualScreen anymore (e.g. qfg2)
svn-id: r44837
2009-10-09 17:47:33 +00:00
Filippos Karapetis
1562add631 - Cleaned up the cursor code
- Renamed gui -> _gui in EngineState, for consistency
- Added a reference to SciGuiCursor in EngineState, to be used by current code
- Renamed setCursorHide -> hideCursor, setCursorShow -> showCursor
- Moved the cursor zone limiting code inside SciGuiCursor. This code is currently not functioning, as we need to call refreshPosition() before each updateScreen() call to limit the cursor position.

svn-id: r44760
2009-10-07 21:29:47 +00:00
Martin Kiewitz
64d73415ca SCI/newgui: changed the way dithering works on ega games, also default value change for kDrawStatus
svn-id: r44679
2009-10-05 21:38:51 +00:00
Martin Kiewitz
16580e53bf SCI: kDrawStatus changed, dont call gui if no text received
svn-id: r44674
2009-10-05 19:46:38 +00:00
Martin Kiewitz
e6b1a0cb4b SCI: kDrawStatus now calls s->gui->drawStatus with NULL if no text given
svn-id: r44673
2009-10-05 19:39:47 +00:00
Martin Kiewitz
3654cefe33 SVN/newgui: kDrawStatus implemented
svn-id: r44670
2009-10-05 19:20:52 +00:00
Max Horn
6ad5840181 SCI: Rename EngineState::segMan to _segMan
svn-id: r44629
2009-10-04 18:38:18 +00:00
Willem Jan Palenstijn
876a28d261 SCI: cleanup
svn-id: r44528
2009-10-01 17:30:10 +00:00
Filippos Karapetis
6697f46922 Rewrote weird-looking code, which might lead to undefined behavior, according to GNU
svn-id: r44523
2009-10-01 15:33:38 +00:00
Filippos Karapetis
f9296a6445 - Changed the unimplemented debug SCI kernel functions (InspectObj, ShowSends, ShowObjs, ShowFree, StackUsage and Profiler) to be dummy functions - we have our own debugger, and don't use these functions for debugging
- Removed the function number parameter from all kernel functions, as it's no longer needed, and removed the FAKE_FUNCT_NR hack
- Removed kUnknown() and kStub()
- Dummy/unknown kernel functions are no longer invoked, and a warning is shown instead, with the paremeters passed to them

Note: there is an evil hack used for debugging scripts in invoke_selector(), which probably no longer works now

svn-id: r44461
2009-09-29 14:24:07 +00:00
Willem Jan Palenstijn
d3c1916384 SCI: Major string handling update.
All string access to segments should now work with both raw and non-raw
(reg_t) segments, using the new utility functions in segMan.

There will likely be regressions.

svn-id: r44388
2009-09-27 01:50:26 +00:00
Max Horn
78d2ea9fcf SCI: Fix a memory leak
svn-id: r44357
2009-09-25 13:01:50 +00:00
Max Horn
8ac3db0801 SCI: Rename SegManager::kernelDeref*() methods to SegManager::deref*()
svn-id: r44083
2009-09-14 13:27:09 +00:00
Max Horn
0e834d0b87 SCI: kernelDeref*() functions are now seSegmentManager methods
svn-id: r44082
2009-09-14 13:13:20 +00:00
Max Horn
d04b5d2c9b SCI: Rename resManager -> resMan; segManager -> segMan
svn-id: r43980
2009-09-06 12:57:42 +00:00
Filippos Karapetis
1bbab8f191 Some renaming:
getresourceManager -> getResourceManger
resourceManager -> resMan
segmentManager ->segMan

svn-id: r43908
2009-09-02 12:02:37 +00:00
Max Horn
b391f08b46 SCI: Renamed kernel_dereference_* to kernelDeref*, and added kernelDerefString
svn-id: r43907
2009-09-02 11:38:16 +00:00
Max Horn
6c44eafa97 SCI: funct_nr is not used in 99% of all opcodes -- hide it in those (to be removed eventually)
svn-id: r43905
2009-09-02 11:33:25 +00:00
Filippos Karapetis
ac025f4294 - Replaced more cases of EngineState parameters
- Made some version comparisons for old SCI0 versions easier to read
- Removed the GET_SEL32SV macro

svn-id: r43729
2009-08-25 15:14:29 +00:00
Filippos Karapetis
3b687a7a04 Replaced KP_ALT, SKPV_OR_ALT and UKPV_OR_ALT
svn-id: r41340
2009-06-07 16:50:34 +00:00
Filippos Karapetis
744323ca33 Replaced/removed KP_UINT, KP_SINT, SKPV and UKPV as well as the VIEW_PRIORITY and PRIORITY_BAND_FIRST wrappers
svn-id: r41338
2009-06-07 15:53:30 +00:00
Filippos Karapetis
3490819a66 - Removed debug_mode from the engine state
- Turned all SCIkwarn and SCIkdebug functions to ScummVM's debugC function
- Placed some debug code in appropriate defines: DEBUG_PARSER, DEBUG_AVOIDPATH and DEBUG_SOUND
- Removed the "debuglog" command and the "script_checkloads_flag" and "sci_debug_flags" variables

svn-id: r41033
2009-05-30 15:40:49 +00:00
Filippos Karapetis
69582f0179 Moved 3 more debug commands to console.cpp ("simkey", "segment_table" and "show_map") and removed the GFXWC macro. Some cleanup
svn-id: r41032
2009-05-30 14:30:39 +00:00