Commit Graph

783 Commits

Author SHA1 Message Date
Walter van Niftrik
88ec6f407c SCI: AvoidPath cleanup.
svn-id: r39798
2009-04-02 15:28:34 +00:00
Walter van Niftrik
3dc820796d SCI: Avoidpath cleanup.
svn-id: r39797
2009-04-02 00:04:20 +00:00
Filippos Karapetis
09d5508b01 - Updated the details of 2 versions of Freddy Pharkas and of 2 versions of SQ5 (to distinguish the English from the German versions)
- Enabled the Italian version of KQ5 and added the Polish version of KQ5

svn-id: r39796
2009-04-01 21:48:42 +00:00
Filippos Karapetis
1e8bd16c1e - Wrapped all the code for custom graphics options around a CUSTOM_GRAPHICS_OPTIONS define. Most of these options don't work in 256-color mode, plus there is currently no way to actually set/change them somehow (other than modifying the code)
- Added a FIXME for the abuse of the pic_port_bounds graphics option - it's actually set by the game itself in kSetPort()
- Added some test code for setting palette intensity in KPalette() (currently disabled)

svn-id: r39794
2009-04-01 20:32:45 +00:00
Filippos Karapetis
a518301e66 Enabled 2 versions of Freddy Pharkas, and added the German version of QFG1
svn-id: r39784
2009-03-31 22:48:25 +00:00
Filippos Karapetis
6ef8534e9a Added 2 more versions of GK1 (apparently, all versions of GK1 used the same interpreter) and enabled GK2 (again, only one interpreter version was used for it)
svn-id: r39783
2009-03-31 22:35:21 +00:00
Filippos Karapetis
162e9b15f4 Added 2 versions of Mixed-up Mother Goose and enabled RAMA and Shivers (apparently, there was only one version of them)
svn-id: r39782
2009-03-31 21:57:18 +00:00
Filippos Karapetis
4d64856687 Added 2 versions of QFG4 and updated the information of the German version of SQ5
svn-id: r39781
2009-03-31 21:39:59 +00:00
Filippos Karapetis
feef5d0e22 Added the German version of QFG3. Also, enabled Phantasmagoria 1 and 2, as apparently there was only one version of each one
svn-id: r39780
2009-03-31 21:27:54 +00:00
Filippos Karapetis
64fa2b1ed6 Added Mixed-Up Fairy tales, and corrected information on some versions of SQ4
svn-id: r39779
2009-03-31 21:04:48 +00:00
Filippos Karapetis
adf7b3a2a4 Added another English version of SQ4 floppy and German versions of SQ3, SQ4 and SQ6
svn-id: r39778
2009-03-31 20:57:13 +00:00
Filippos Karapetis
71d9eafd02 Added the German versions of PQ3 and PQ4
svn-id: r39777
2009-03-31 20:35:14 +00:00
Filippos Karapetis
2fafa720d2 Fixed a typo in the German version of Eco Quest 1 and enabled the German versions of Laura Bow 2 and Larry 3 which had incomplete info
svn-id: r39776
2009-03-31 20:25:47 +00:00
Filippos Karapetis
7e3af1e0e4 Added the German version of EcoQuest 1, and enabled a version of EcoQuest 2 which had incomplete details
svn-id: r39775
2009-03-31 20:11:56 +00:00
Filippos Karapetis
66de3bb905 Got rid of the gfx_res_mod_t struct
svn-id: r39771
2009-03-31 07:48:44 +00:00
Filippos Karapetis
6b499ebf4b Initialize _staticPalette when creating the graphics resource manager. This allows KQ6 to start (and then sit idly doing nothing in the main menu :) )
svn-id: r39769
2009-03-30 21:52:46 +00:00
Filippos Karapetis
936482f03c This should really fix the issues with vobab.999/999.voc in SCI1 games (e.g. KQ5)
svn-id: r39768
2009-03-30 21:41:29 +00:00
Filippos Karapetis
5f0083e996 Ignore the unreliable resource vocab.999 in SCI1 games. This allows us to use the hardcoded table in vocabulary_get_knames1() instead (also check commit #39694). KQ5 floppy works now without FreeSCI's custom vocabulary file
svn-id: r39766
2009-03-30 20:51:09 +00:00
Filippos Karapetis
f7748cfefc Disabled some unused code
svn-id: r39765
2009-03-30 14:06:07 +00:00
Filippos Karapetis
252dc30293 Added another version of Quest for Glory, from bug report #2718784
svn-id: r39758
2009-03-30 11:35:12 +00:00
Filippos Karapetis
37ddffc1d2 Added another version of Hoyle 1, from bug report #2719227
svn-id: r39756
2009-03-30 09:02:03 +00:00
Filippos Karapetis
627c3d8f89 Verified the SCI version of a version of Laura Bow 1 - The Colonel's Bequest, from bug report #2720682
svn-id: r39755
2009-03-30 08:43:34 +00:00
Filippos Karapetis
bfeded3b98 Changed the SCI version of the French version of LSL3 to match the other ones. Hopefully, this fixes the crash described in bug #2719017
svn-id: r39754
2009-03-30 08:37:49 +00:00
Filippos Karapetis
6e075e8a34 Fixed compilation
svn-id: r39751
2009-03-30 07:57:10 +00:00
Filippos Karapetis
e130aecc4f Wrapped all the still WIP SCI32-specific code around appropriate ifdef blocks. SCI32 has fundamental differences from previous SCI versions (e.g. direct point addressing is no longer possible), most of SCI32 games use SVGA resolutions and currently a lot of SCI32 specific code is missing (like, for example, the newer string and array handling functions, the widget system etc). This has been done in the same manner as in the SCUMM and SAGA engines.
svn-id: r39750
2009-03-30 07:53:32 +00:00
Willem Jan Palenstijn
6c6f95afe9 SCI: don't delete static palette twice
svn-id: r39748
2009-03-29 21:47:09 +00:00
Willem Jan Palenstijn
968856780b SCI: Merge static palette into global palette at startup
svn-id: r39747
2009-03-29 21:46:49 +00:00
Willem Jan Palenstijn
b524e3d285 SCI: remove some debugging printfs
svn-id: r39746
2009-03-29 21:46:26 +00:00
Filippos Karapetis
661644f3c1 Added stubs for the missing palette effects in kPalette()
svn-id: r39744
2009-03-29 15:08:50 +00:00
Filippos Karapetis
fbc76a89e1 Added a stub for the palette fadeout/fadein effect, so that we remember it's currently missing
svn-id: r39743
2009-03-29 14:47:57 +00:00
Filippos Karapetis
d883cb209e Fixed the colors of the widgets in KQ5's options menu
svn-id: r39737
2009-03-29 12:28:24 +00:00
Filippos Karapetis
09d96e24f9 Fixed the colors of the window frames in KQ5
svn-id: r39734
2009-03-29 11:56:32 +00:00
Filippos Karapetis
cda1bf5ca9 Eco Quest 1 continues after the intro now
svn-id: r39731
2009-03-29 01:56:03 +00:00
Walter van Niftrik
e860473d80 SCI: AvoidPath workaround for intersecting polygons in Longbow, room 210.
svn-id: r39714
2009-03-27 23:01:13 +00:00
Filippos Karapetis
d75959c354 Added a note about the potential invalid rectangles created when drawing lines
svn-id: r39704
2009-03-26 21:52:04 +00:00
Max Horn
c21110f36e SCI: Match signature of readResourceMapSCI0 and readResourceMapSCI1 (helpful if we ever want to turn this into overloaded methods of ResourceManager subclasses, one subclass for each SCI version)
svn-id: r39701
2009-03-26 13:11:30 +00:00
Max Horn
c592bf3300 SCI: Cleaned up the decompressor comments and code a little bit
svn-id: r39698
2009-03-25 23:47:16 +00:00
Filippos Karapetis
b4b0e35841 Remove a workaround in the line drawing function - it shouldn't be necessary anymore
svn-id: r39697
2009-03-25 23:26:24 +00:00
Filippos Karapetis
2b1ad19b7f Added another version of Eco Quest 1
svn-id: r39696
2009-03-25 23:14:31 +00:00
Filippos Karapetis
831d3d542e Changed the primitive equality check to not use Common::Rect, as the two primitives being compared might not actually be rectangles (e.g. they may be lines, in which case the "width" and "height" might be negative)
svn-id: r39695
2009-03-25 23:14:08 +00:00
Filippos Karapetis
58a66cb3cd Use the default kernel vocabulary names for SCI1 games, instead of reading the unreliable (in SCI1 games) 999.voc resource. KQ5 and EcoQuest 1 now work properly, and all other SCI1 games seem to be unaffected and working with this change. If there's any SCI1 game with different kernel vocabulary names, we can add special flags to it to our detector, so this change fixes more than it breaks :)
svn-id: r39694
2009-03-25 22:37:08 +00:00
Filippos Karapetis
a3a7893f16 Changed the font flag defines to an enumeration
svn-id: r39690
2009-03-25 17:51:22 +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
0501542b79 Fixed compilation
svn-id: r39688
2009-03-25 12:58:22 +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
Filippos Karapetis
df5239e89e Remove superfluous comma
svn-id: r39686
2009-03-25 12:11:49 +00:00
Filippos Karapetis
006b2d62af Changed some flags to enums
svn-id: r39685
2009-03-25 12:07:10 +00:00
Joost Peters
67201f6a71 revert yesterday's change -- apparently this different behavior was intentional.
svn-id: r39683
2009-03-25 10:04:45 +00:00
Walter van Niftrik
42d67b4a3a SCI: AvoidPath cleanup.
svn-id: r39680
2009-03-25 00:33:31 +00:00
Walter van Niftrik
b85b6929bd SCI: build fix.
svn-id: r39675
2009-03-24 21:18:06 +00:00
Walter van Niftrik
e8b38af014 SCI: Added workaround for broken polygon in LSL1 room 350.
svn-id: r39674
2009-03-24 21:03:50 +00:00
Joost Peters
fc9e5b6beb Fix smaller error introduced in r39671 refactoring (this check used to be "res == 0").
Thanks to syke for spotting it.

svn-id: r39673
2009-03-24 19:56:41 +00:00
Max Horn
1e94b9cd3c SCI: Rewrote vocabulary code to use a Common::HashMap<String,ResultWord>
svn-id: r39671
2009-03-24 17:42:12 +00:00
Max Horn
65b96f6a1b SCI: Changed vocab_tokenize_string to not 'return' the list it generates, but rather pass a reference to an existing list to it (this is a bit more efficient, and allows us to return an error value)
svn-id: r39670
2009-03-24 17:41:46 +00:00
Max Horn
d38590e6d4 SCI: Turned synonyms list into a Common::List
svn-id: r39669
2009-03-24 17:41:26 +00:00
Walter van Niftrik
3e2c1a39e2 SCI: Added workaround for duplicate polygons being passed to kAvoidPath.
svn-id: r39668
2009-03-24 15:17:25 +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
608b839720 SCI: moved sci_strndup to menubar.cpp
svn-id: r39661
2009-03-24 12:14:22 +00:00
Max Horn
c1be6e1ed6 SCI: Fixed some leaks introduced by my previous changes
svn-id: r39660
2009-03-24 12:01:54 +00:00
Max Horn
9ea32d4aa1 SCI: C++ify menu code
svn-id: r39659
2009-03-24 11:31:16 +00:00
Filippos Karapetis
3b5a14916d Cleanup
svn-id: r39633
2009-03-23 14:24:10 +00:00
Walter van Niftrik
ca993d8b00 SCI: some avoidpath cleanup
svn-id: r39630
2009-03-23 11:10:16 +00:00
Filippos Karapetis
a6f49a636b - Moved palette initialization inside the graphics resource manager
- The static palette is no longer needlessly referenced directly outside the graphics resource manager
- Moved the SCI interpreter version inside the graphics resource manager, instead of gfx_state_t

svn-id: r39626
2009-03-23 08:43:53 +00:00
Filippos Karapetis
e3f9acc3e6 Further objectification of the graphics resource manager
svn-id: r39621
2009-03-22 23:11:43 +00:00
Max Horn
277b8e6190 SCI: Fixed nasty bug in simulate_stippled_line_draw, caught only thanks to warnings by the Wii compiler.
svn-id: r39616
2009-03-22 22:02:25 +00:00
Max Horn
2463b148a9 SCI: Renamed Vertex::entries::cle_next -> Vertex::_next, analog for cle_prev. Replace code for reversing a circular list by a new method CircularVertexList::reverse()
svn-id: r39613
2009-03-22 18:27:39 +00:00
Max Horn
09ecda7ca4 SCI: Some cleanup; avoid taking square root unnecessarily
svn-id: r39612
2009-03-22 18:27:08 +00:00
Max Horn
734e9dd377 SCI: Fix warnings
svn-id: r39606
2009-03-22 13:50:37 +00:00
Filippos Karapetis
2ea883adb2 Cleanup
svn-id: r39593
2009-03-21 16:42:45 +00:00
Max Horn
7245fce099 SCI: cleanup
svn-id: r39578
2009-03-20 23:02:20 +00:00
Max Horn
ed292fb498 silenced some warnings
svn-id: r39566
2009-03-20 13:30:10 +00:00
Johannes Schickel
b9656ae391 Fix warning.
svn-id: r39547
2009-03-19 22:51:42 +00:00
Walter van Niftrik
f81e5747bd SCI: removed aatree.o from module
svn-id: r39546
2009-03-19 22:49:54 +00:00
Walter van Niftrik
a45ed16fc4 SCI: converted aatree into a class
svn-id: r39544
2009-03-19 22:47:30 +00:00
Filippos Karapetis
348d48abe5 Hopefully, this fixes the warnings thrown when attempting to print the "size" variable (which is of type type_t)
svn-id: r39543
2009-03-19 22:06:46 +00:00
Filippos Karapetis
3d5ad1e6a3 Cleaned up gfxop_draw_rectangle(). Also, removed a check insode BASIC_CHECKS() which is impossible to occur
svn-id: r39540
2009-03-19 21:27:01 +00:00
Filippos Karapetis
11601f88e1 Fixed issues with commit #39449, fixing some graphical glitches with the GUI widgets
svn-id: r39534
2009-03-19 19:52:05 +00:00
Filippos Karapetis
8dc12da206 Added another version of SQ4
svn-id: r39525
2009-03-19 09:09:31 +00:00
Filippos Karapetis
723bc879f8 Changed abs_rect_t to Common::Rect
svn-id: r39518
2009-03-18 16:43:12 +00:00
Travis Howell
ab4812b734 Fix compile of SCI engine.
svn-id: r39517
2009-03-18 14:04:57 +00:00
Filippos Karapetis
bc37ec4ce1 Renamed resmgr.cpp -> gfx_resmgr.cpp
Moved all files from gfx/resource/* to gfx/*

svn-id: r39515
2009-03-18 13:24:47 +00:00
Filippos Karapetis
abc842b677 Slight cleanup
svn-id: r39514
2009-03-18 11:25:23 +00:00
Filippos Karapetis
c9eff6e1f8 Cleaned up graphics initialization a bit
svn-id: r39513
2009-03-18 11:07:29 +00:00
Filippos Karapetis
b670070c6c Cleanup
svn-id: r39506
2009-03-18 07:59:46 +00:00
Filippos Karapetis
5a77b89f92 Cleanup
svn-id: r39501
2009-03-17 23:43:32 +00:00
Filippos Karapetis
e546c60948 Further objectification of the graphics resource manager
svn-id: r39499
2009-03-17 23:30:57 +00:00
Johannes Schickel
4edee56b3f Fix warning.
svn-id: r39498
2009-03-17 22:56:20 +00:00
Filippos Karapetis
063ce3938d Started objectifying the graphics resource manager (refer to patch #2689887)
svn-id: r39492
2009-03-17 21:08:33 +00:00
Max Horn
95c58e76d6 SCI: Added TODO: Merge SegInterface and MemObject? And some cleanup
svn-id: r39485
2009-03-17 16:08:25 +00:00
Max Horn
3c23ba7d73 SCI: Got rid of various SegManager::free_* methods
svn-id: r39484
2009-03-17 16:07:58 +00:00
Max Horn
3c0d117dd8 SCI: fix warning
svn-id: r39483
2009-03-17 16:07:18 +00:00
Filippos Karapetis
80c243e5ca Renamed some defines:
- FREESCI_CURRENT_SAVEGAME_VERSION, FREESCI_MINIMUM_SAVEGAME_VERSION -> CURRENT_SAVEGAME_VERSION, MINIMUM_SAVEGAME_VERSION (saved games are not compatible with FreeSCI's ones anymore)
- _K_VIEW_SIG_FLAG_FREESCI_STOPUPD -> _K_VIEW_SIG_FLAG_STOPUPD (like the rest of the flags)
- Removed FREESCI_KFUNCT_GLUTTON (unused)

svn-id: r39478
2009-03-17 08:03:42 +00:00
Filippos Karapetis
ebfdd92727 Removed the "About FreeSCI" menu as discussed in -devel, now that the FreeSCI contributors have been moved to the AUTHORS file
svn-id: r39476
2009-03-17 07:57:02 +00:00
Filippos Karapetis
9ec640633d It seems that the SCI GUI code tries to show rectangles with negative height. Added some sanity checks for this, but the *real* problem lies elsewhere
svn-id: r39451
2009-03-16 19:19:59 +00:00
Filippos Karapetis
7cd1ac5231 Changed the temporary helper functions to defines
svn-id: r39450
2009-03-16 17:25:13 +00:00
Filippos Karapetis
0e8dfe09c9 Replaced some rect_t operations with our common ones. For now, two helper functions are used to easily change types between Common::Rect and rect_t, until rect_t is removed
svn-id: r39449
2009-03-16 15:36:09 +00:00
Max Horn
c5e8c48c5e SCI: Removed sbtree code by Common::Hashmap
svn-id: r39439
2009-03-16 05:44:20 +00:00
Filippos Karapetis
4bd84b7311 Replaced "xl" with "width" and "y1" with "height" in places where rectangles are used
svn-id: r39435
2009-03-16 00:07:12 +00:00
Max Horn
466ba4bbfe SCI: Rewrote the save/load code, see also patch #2687400.
The new format is incompatible with the old one, and is still subject to
some further changes. Also, regressions are quite possible, so watch out.
Finally, the new code still contains some TODOs and FIXMEs. Several of
these will be more or less automatically resolved once other code gets
C++ified.

svn-id: r39430
2009-03-15 20:31:29 +00:00