thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
35346 commits 35 branches 0 tags 1.4 GiB
Commit graph

75 commits

Author SHA1 Message Date
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
Filippos Karapetis
87e8f94fde - Moved all the files out of /sci/scicore and into /sci 
- Moved /scicore/sciconsole.h into /engine, and renamed /engine/scriptconsole.cpp to /engine/sciconsole.cpp

svn-id: r40608
 2009-05-15 14:07:45 +00:00
Filippos Karapetis
e940bcff23 - Simplified SCI version detection a bit and clarified the different version feature flags (not used yet) 
- Removed the version verification functions (they were only used for two specific cases, but the SCI executable reader is able to detect the exact SCI game version anyway, so there is no point in having these)
- Removed the empty GameFlags structure and replaced it with a 32-bit integer instead

svn-id: r40524
 2009-05-13 16:52:41 +00:00
Max Horn
0255cd0213 SCI: Removed sci_memory.h/.cpp 
svn-id: r40514
 2009-05-12 23:30:10 +00:00
Max Horn
6f60e0dd48 SCI: Turned GfxWidget::draw function pointer into virtual method 
svn-id: r40115
 2009-04-24 14:22:14 +00:00
Max Horn
dadae13545 SCI: Turned GfxWidget::print function pointer into virtual method 
svn-id: r40113
 2009-04-24 14:20:31 +00:00
Max Horn
ebcfd9b016 SCI: Got rid of GFXW() macro; turned GfxWidget::widfree into destructors 
svn-id: r40107
 2009-04-24 10:48:25 +00:00
Max Horn
80794a6b5a SCI: font_nr -> _font 
svn-id: r40106
 2009-04-24 10:47:38 +00:00
Max Horn
9445439c4f SCI: Renamed gfxw_widget_t and subtypes to GfxWidget etc. 
svn-id: r40104
 2009-04-24 10:46:20 +00:00
Max Horn
86b3657476 SCI: Started to C++ify the gfxw_widget_t codebase 
svn-id: r40103
 2009-04-24 10:45:09 +00:00
Filippos Karapetis
4723f80fe2 Merged sciw_select_item() and sciw_unselect_item() 
svn-id: r39689
 2009-03-25 16:37:50 +00:00
Filippos Karapetis
34d75e455b - Renamed gfx/sci_widgets.* to gfx/gfx_gui.*, as these files contain GUI elements mostly, like windows and status bars 
- Moved kWindowAutoRestore from gfx_widgets.h to gfx_gui.h

svn-id: r39687
 2009-03-25 12:52:03 +00:00
Max Horn
b76f7fea4e SCI: Changed some char* into Common::String 
svn-id: r39663
 2009-03-24 12:46:48 +00:00
Max Horn
33895c0220 SCI: Only pass the pointerpos to Menubar::mapPointer, not the full gfx_state_t 
svn-id: r39662
 2009-03-24 12:14:41 +00:00
Max Horn
9ea32d4aa1 SCI: C++ify menu code 
svn-id: r39659
 2009-03-24 11:31:16 +00:00