Commit Graph

934 Commits

Author SHA1 Message Date
Filippos Karapetis
bcade54247 Started rewriting the check for the graphics functions type (still not finished)
svn-id: r44787
2009-10-08 14:37:55 +00:00
Filippos Karapetis
2d98b72858 Restore the engine state stored within SciGui during loading once more, since it gets replaced during loading. Fixes loading (a regression from #44730)
svn-id: r44771
2009-10-08 07:57:26 +00:00
Filippos Karapetis
ce75c9270a Removed the unused game_time variable, and fixed the incorrect calculation of start_game_time when restoring a game
svn-id: r44770
2009-10-08 07:25:18 +00:00
Max Horn
0988e273ec SCI: Turn lookup_node & lookup_list into SegManager::lookupNode & SegManager::lookupList
svn-id: r44769
2009-10-07 23:34:24 +00:00
Max Horn
623098c393 SCI: Fix warning, cleanup
svn-id: r44764
2009-10-07 22:45:50 +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
80d136a362 SCI: kDrawPic / had an error in previous revision
svn-id: r44759
2009-10-07 21:25:31 +00:00
Martin Kiewitz
54e69d6359 SCI: changed kDrawPic to use oldGfxFuncs()
svn-id: r44757
2009-10-07 21:10:42 +00:00
Martin Kiewitz
0b83993a64 SCI/newgui: kDrawPic cleanup, addToFlag inverse detection currently not working needs fixing
svn-id: r44756
2009-10-07 20:58:33 +00:00
Martin Kiewitz
0c413530ac SCI: set default EGA palette to 0, if no parameter is actually given us. Fixes lsl2, kq4, sq3, etc.
svn-id: r44743
2009-10-07 18:09:06 +00:00
Filippos Karapetis
9f5c52b410 Fixed a potential buffer overflow in kFormat, which occurs in the "About" screen in KQ4
svn-id: r44738
2009-10-07 16:47:06 +00:00
Martin Kiewitz
1dfe7578cb SCI/newgui: kSetCursor (show, hide, pos, shape) implemented
svn-id: r44734
2009-10-07 14:53:15 +00:00
Martin Kiewitz
77b549a0ad SCI: SciGuiCursor class added, cleanup, OSystem removed from SciGui constructor
svn-id: r44730
2009-10-07 12:47:53 +00:00
Martin Kiewitz
5cc21cedf6 SCI: removed r44595, sierra sci really does behave like Common::Rect, no need for +1
svn-id: r44725
2009-10-07 11:35:12 +00:00
Filippos Karapetis
c17495d895 - Fixed kGetTime() again
- Removed the odd way of calculating elapsed time in SciGui(). We got _system->getMillis() for that purpose
- Replaced the code in SciGui::wait() with the one in SciGui32::wait (which works fine, and is correct). The code in SciGui() was not polling for events while waiting, either

svn-id: r44712
2009-10-06 17:45:57 +00:00
Willem Jan Palenstijn
d1bca7ced6 SCI: Minor cleanup
svn-id: r44706
2009-10-06 17:16:27 +00:00
Martin Kiewitz
ca9f08c624 SCI/newgui: kHiLite support
svn-id: r44701
2009-10-06 16:36:28 +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
Filippos Karapetis
7596f535ac Fixed crash when starting games with the stable GUI
svn-id: r44671
2009-10-05 19:28:43 +00:00
Martin Kiewitz
3654cefe33 SVN/newgui: kDrawStatus implemented
svn-id: r44670
2009-10-05 19:20:52 +00:00
Filippos Karapetis
91a16e0c7d Moved the cursor movement code in the GUI
svn-id: r44664
2009-10-05 16:43:24 +00:00
Filippos Karapetis
4c35022f6b Lines are no longer treated as fake rectangles and are shown correctly again
svn-id: r44663
2009-10-05 13:33:26 +00:00
Martin Kiewitz
6e38de3905 SCI/newgui: kDrawControl on icon implemented
svn-id: r44658
2009-10-05 11:42:04 +00:00
Filippos Karapetis
8568892bf5 - Renamed GUI -> Gui and capitalized as appropriate (e.g. SciGUIwindowMgr -> SciGuiWindowMgr)
- Renamed "cell" -> "cel"

svn-id: r44649
2009-10-05 07:10:01 +00:00
Max Horn
db8c6e3f6c SCI: Really remove sci/gui/gui.h include from engine/state.h
svn-id: r44644
2009-10-04 22:43:30 +00:00
Max Horn
f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency
svn-id: r44634
2009-10-04 21:26:33 +00:00
Max Horn
43a9f9c2ef SCI: Add include guards for gui headers; don't include gui/gui.h from engine/state.h
svn-id: r44632
2009-10-04 20:01:21 +00:00
Martin Kiewitz
69af4ce9f4 SCI/newgui: implemented kPalette / set intensity
svn-id: r44631
2009-10-04 19:49:47 +00:00
Max Horn
6ad5840181 SCI: Rename EngineState::segMan to _segMan
svn-id: r44629
2009-10-04 18:38:18 +00:00
Max Horn
0da9ad5ff5 SCI: Add SegManager::findObjectByName() method, make parse_reg_t() local to console.cpp, and switch other code using it to use findObjectByName() instead.
svn-id: r44628
2009-10-04 18:36:58 +00:00
Martin Kiewitz
ec526ca461 SCI/gui: renaming...
svn-id: r44618
2009-10-04 16:35:02 +00:00
Martin Kiewitz
4957ec3505 SCI: kAddToPic, kAnimate and kSetNowSeen transferred to SciGUI32, not yet implemented in newgui
svn-id: r44606
2009-10-04 14:59:51 +00:00
Max Horn
a1e2ba1ba5 SCI: Fixing a bunch of warnings; change 'intencity' -> 'intensity';
properly init a sciPalette via memset

svn-id: r44604
2009-10-04 11:59:29 +00:00
Martin Kiewitz
a139ddd840 SCI: kReadNumber crash fix for lsl1
svn-id: r44597
2009-10-04 11:05:38 +00:00
Martin Kiewitz
e2cc953a9f SCI: removing unused variables from onControl
svn-id: r44596
2009-10-04 10:48:49 +00:00
Martin Kiewitz
3dbf54267b SCI: onControl now uses gui classes
svn-id: r44595
2009-10-04 10:47:10 +00:00
Martin Kiewitz
06f5393ed4 SCI: fixed crash in sq5/german (umlauts)
svn-id: r44587
2009-10-04 06:39:07 +00:00
Willem Jan Palenstijn
0ed87062ed SCI: Add hack to gui to fix loading
svn-id: r44581
2009-10-03 23:56:49 +00:00
Willem Jan Palenstijn
bce248cab6 SCI: Redraw edit controls when they change.
svn-id: r44576
2009-10-03 22:10:45 +00:00
Willem Jan Palenstijn
75de46e9ab SCI: Fix sign issue in stringfrags
svn-id: r44572
2009-10-03 21:27:01 +00:00
Willem Jan Palenstijn
b9cdb1abb7 SCI: Merge new GUI code written by m_kiewitz.
This is a major rewrite of the graphics code. A slightly adapted
version of the old code is still available and currently the default.
The new code is selectable in sci.cpp, but is not yet finished.

svn-id: r44565
2009-10-03 20:49:18 +00:00
Willem Jan Palenstijn
cbcd53f1f3 Fix cppcheck issue reported by salty-horse
svn-id: r44541
2009-10-02 15:02:57 +00:00
Max Horn
01176782ea Fix some cppcheck warnings reported by salty-horse
svn-id: r44538
2009-10-02 14:32:54 +00:00
Max Horn
908e13fa73 SCI: Remove PRINT_STK macro; cleanup
svn-id: r44533
2009-10-02 12:53:04 +00:00
Willem Jan Palenstijn
0fe40b5053 SCI: Use String::printf instead of temporary buffer
svn-id: r44532
2009-10-02 12:44:12 +00:00
Max Horn
292640b14e SCI: Make NULL_REG & SIGNAL_REG const; change validate_property so that its callers cannot modify NULL_REG accidentally anymore
svn-id: r44531
2009-10-02 11:04:36 +00:00
Max Horn
523f0b34fb SCI: Remove dead code
svn-id: r44530
2009-10-02 07:44:55 +00:00
Willem Jan Palenstijn
876a28d261 SCI: cleanup
svn-id: r44528
2009-10-01 17:30:10 +00:00