libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-05 17:20:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
34,342 Commits 5 Branches 5 Tags 1.8 GiB
2e964baeef
Commit Graph

13032 Commits

Author SHA1 Message Date
Martin Kiewitz
03ee8c00be SCI/newgui: remarks about _menuPort, uninitialized usage in SciGuiPalette removed, _menuPort and _mainPort get deleted in destructor 
svn-id: r44790
 2009-10-08 18:34:49 +00:00
Martin Kiewitz
aab278974a SCI/newgui: kAnimate changes 
svn-id: r44789
 2009-10-08 18:07:49 +00:00
Martin Kiewitz
61952c3ac1 SCI/newgui: implemented more of kAnimate, currently crashes on windowMgr update. 
svn-id: r44788
 2009-10-08 16:23:46 +00:00
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
Arnaud Boutonné
caaba2ae95 Add a hack that fixes bug #2858887 and #2859606 
svn-id: r44785
 2009-10-08 12:04:34 +00:00
Martin Kiewitz
43a60d965a SCI/newgui: change to nsRect, scripts expect that. Fixes mouse clicking on several games 
svn-id: r44784
 2009-10-08 11:57:17 +00:00
Martin Kiewitz
8f8b84f774 SCI/newgui: kAnimate - coordinates fixed 
svn-id: r44783
 2009-10-08 11:49:11 +00:00
Martin Kiewitz
120b6b9392 SCI/newgui: kAnimate - _delete invoking implemented 
svn-id: r44782
 2009-10-08 11:23:53 +00:00
Martin Kiewitz
cce8d2e279 SCI/newgui: kAnimate - more implemented, cels are now drawn but isnt working correctly currently 
svn-id: r44781
 2009-10-08 10:35:12 +00:00
Martin Kiewitz
d1dcd82ac0 SCI/newgui: kAnimate SciGuiGfx::AnimateFill implemented 
svn-id: r44780
 2009-10-08 10:02:26 +00:00
Travis Howell
982950941c The layout of global object data is different in the PCE version of Loom. 
svn-id: r44779
 2009-10-08 09:33:20 +00:00
Martin Kiewitz
bac0c76947 SCI/newgui: kAnimate - resolved previously unknown code functionality 
svn-id: r44777
 2009-10-08 09:29:14 +00:00
Filippos Karapetis
633463b1dd Updated comment to indicate that QFG1VGA is one of the newer SCI1.1 games that has word-aligned resources 
svn-id: r44775
 2009-10-08 08:22:19 +00:00
Arnaud Boutonné
f1cb78673a gob - Fix a Valgrind warning occuring in CD games 
svn-id: r44774
 2009-10-08 08:10:57 +00:00
Filippos Karapetis
498d80a510 Don't store the engine state in the SciGuiPalette class. The palette timestamps are now calculated from Epoch time, instead of game start time (the functionality is exactly the same, though) 
svn-id: r44773
 2009-10-08 08:00:30 +00:00
Martin Kiewitz
0120111416 SCI/newgui: removed EGAmapping 
svn-id: r44772
 2009-10-08 07:58:31 +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
a4fa78743d SCI: Change more stuff to be CFG compliant 
svn-id: r44768
 2009-10-07 23:21:18 +00:00
Max Horn
8498d769be SCI: Reduce header interdepencies once again. Rule of thumb: Never include a header file from another header file unless you absolutely *must* do it; if possible, try to use class forwards instead, and include the headers from source files only 
svn-id: r44767
 2009-10-07 23:04:13 +00:00
Max Horn
5d07a657f0 SCI: Get rid of SciGuiScreen::initScreen, also known as 'calloc' elsewhere ;) 
svn-id: r44766
 2009-10-07 22:53:32 +00:00
Max Horn
e8a13197e3 SCI: Replace SciGuiGfx::mallocPort by 'new GuiPort'; also add FIXMES about ports which are not freed, have no valid ID and are not known to the window mgr 
svn-id: r44765
 2009-10-07 22:50:11 +00:00
Max Horn
623098c393 SCI: Fix warning, cleanup 
svn-id: r44764
 2009-10-07 22:45:50 +00:00
Max Horn
db86e00c93 SCI: Make local tables 'static', rename them according to our CFG 
svn-id: r44763
 2009-10-07 22:44:44 +00:00
Martin Kiewitz
e6fc06344d SCI/newgui: changed dithering logic, otherwise colors combined with black wouldnt get undithered correctly 
svn-id: r44762
 2009-10-07 22:03:17 +00:00
Martin Kiewitz
a61076a645 SCI: debug command undither implemented 
svn-id: r44761
 2009-10-07 21:47:34 +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
c0c2d4f484 SCI/newgui: SciGuiPicture now errors out on mirrored VGA pictures (added fixme) 
svn-id: r44758
 2009-10-07 21:15:50 +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
Florian Kagerer
35f8e6ec05 LOL/PC-98: fixed freeze spell 
svn-id: r44753
 2009-10-07 20:25:49 +00:00
Martin Kiewitz
5a86544581 SCI/newgui: SciGuiView - paletteoffset in EGA games documented and finally not used 
svn-id: r44751
 2009-10-07 20:04:48 +00:00
Arnaud Boutonné
be84af2603 Fix an assert in activeWin(). 
svn-id: r44746
 2009-10-07 19:44:10 +00:00
Martin Kiewitz
971f495103 SCI/newgui: hopefully the final fix for drawpicture - set priority and control to "not draw" state, also added remark for fillroutine 
svn-id: r44745
 2009-10-07 19:36:47 +00:00
Martin Kiewitz
51784e9580 SCI/newgui: it seems that this fixes floodfill finally 
svn-id: r44744
 2009-10-07 19:02:11 +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
Martin Kiewitz
7f78a7c6be SCI/newgui: undithering of picture now possible (just follow instructions in gui_screen.cpp) 
svn-id: r44742
 2009-10-07 18:00:49 +00:00
Johannes Schickel
0e3b634ecb Fix mismatching new[]/delete use, by replacing delete with delete[]. 
svn-id: r44741
 2009-10-07 17:46:17 +00:00
Filippos Karapetis
6e17b025a5 Implemented the SciGuiView destructor and plugged a memory leak in the current GUI 
svn-id: r44740
 2009-10-07 17:29:37 +00:00
Filippos Karapetis
94a9616d90 Hopefully fixed a mismatching free() call in gfx_free_pixmap(), originating from getView() 
svn-id: r44739
 2009-10-07 17:01:19 +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
Filippos Karapetis
ec421984a9 Replaced the view loading code with the new view loading functions. EGA view color translation has been disabled, as it caused palette problems in Codename:Iceman 
svn-id: r44737
 2009-10-07 16:26:16 +00:00
Martin Kiewitz
de3d1cfdaf SCI/newgui: fix that caused floodfill to fail 
svn-id: r44736
 2009-10-07 16:16:34 +00:00
Martin Kiewitz
cb31d302b9 SCI/newgui: implemented debug command show_map 
svn-id: r44735
 2009-10-07 15:53:34 +00:00
Martin Kiewitz
1dfe7578cb SCI/newgui: kSetCursor (show, hide, pos, shape) implemented 
svn-id: r44734
 2009-10-07 14:53:15 +00:00
Filippos Karapetis
ece4f55db9 Updated the MSVC project files and module.mk for commit #r44730 
svn-id: r44732
 2009-10-07 12:53:58 +00:00
Martin Kiewitz
337dbf2289 SCI: removed OSystem from SciGuiScreen 
svn-id: r44731
 2009-10-07 12:52:21 +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
23b39f5c45 SCI: SciGuiPalette - init() is now private 
svn-id: r44726
 2009-10-07 12:09:20 +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
a17d01bd21 More work on the view code wrapper. Now all SCI0-SCI11 views should be displayed correctly, apart from the late SCI0 ones (e.g. in Codename Iceman), where the palette is incorrect 
svn-id: r44724
 2009-10-07 11:31:30 +00:00
Filippos Karapetis
f72c4d21c7 More work on the view wrapper code 
svn-id: r44723
 2009-10-06 22:45:08 +00:00
Filippos Karapetis
ffc769ca53 Updated the parameter names of FillRect() 
svn-id: r44722
 2009-10-06 22:13:46 +00:00
Filippos Karapetis
e4c3cbbd79 Reverted the priority line drawing code in the current GUI (with some cleanup) to use the FreeSCI line drawing code, which was removed in #44692. Apparently, Sierra's implementation of the Bresenham line drawing algorithm was a bit different than ours, which resulted in problems with flood fill 
svn-id: r44721
 2009-10-06 21:41:20 +00:00
Filippos Karapetis
f533e0ad9e Reverted #44697 (line drawing in the new GUI), with some function renaming. Apparently, Sierra's implementation of the Bresenham line drawing algorithm was a bit different than ours, which resulted in problems with flood fill 
svn-id: r44720
 2009-10-06 21:23:24 +00:00
Martin Kiewitz
c676b90475 SCI/newgui: pattern drawing table fix 
svn-id: r44719
 2009-10-06 21:20:32 +00:00
Filippos Karapetis
f817169934 More work on the view wrapper code 
svn-id: r44718
 2009-10-06 20:49:14 +00:00
Filippos Karapetis
6d135e904f WIP code for replacing the FreeSCI view decoding code with the new one (no changes to the logic, yet) 
svn-id: r44717
 2009-10-06 19:57:55 +00:00
Arnaud Boutonné
7601f1b14f gob - fix valgrind warning: invalid read when animKeysCount equals 0 
svn-id: r44716
 2009-10-06 19:57:17 +00:00
Martin Kiewitz
cbb4f05bf9 SCI/newgui: changed menuPort to one pixel less 
svn-id: r44715
 2009-10-06 19:47:12 +00:00
Martin Kiewitz
d8e10f3e40 SCI/newgui: dont allow negative coordinates in draw pattern (fixes bad pixels in kq1) 
svn-id: r44714
 2009-10-06 19:22:59 +00:00
Martin Kiewitz
ab4013d1e5 SCI/newgui: pattern drawing circles now fixed 
svn-id: r44713
 2009-10-06 18:53:20 +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
Martin Kiewitz
b8f18e8ddd SCI/newgui: pattern drawing texture now bit0-bit7, sierra did it bit7-bit0 
svn-id: r44711
 2009-10-06 17:44:17 +00:00
Florian Kagerer
4991a87b53 Kyra: fix kyra 3 font 
svn-id: r44710
 2009-10-06 17:28:32 +00:00
Florian Kagerer
45fda46cf3 KYRA/LOL: - get rid of ascii/sjis detection which could cause problems when typing savegame names 
- fixed some minor bugs

svn-id: r44709
 2009-10-06 17:22:40 +00:00
Filippos Karapetis
1481c78d1a Removed yet another unused reference to OSystem 
svn-id: r44708
 2009-10-06 17:18:44 +00:00
Willem Jan Palenstijn
5e9820cc6f SCI: clean up oldx/y vs x/y 
svn-id: r44707
 2009-10-06 17:17:12 +00:00
Willem Jan Palenstijn
d1bca7ced6 SCI: Minor cleanup 
svn-id: r44706
 2009-10-06 17:16:27 +00:00
Filippos Karapetis
1342d04821 Moved the LSL1VGA workaround inside the font class 
svn-id: r44705
 2009-10-06 17:13:57 +00:00
Filippos Karapetis
0b47085da0 Removed an unused reference to OSystem 
svn-id: r44704
 2009-10-06 17:09:34 +00:00
Filippos Karapetis
f664dcdee8 Simplified the LSL1VGA font resource workaround 
svn-id: r44703
 2009-10-06 17:04:56 +00:00
Martin Kiewitz
ed0a961170 SCI/newgui: drawpattern now adjusts to curPort 
svn-id: r44702
 2009-10-06 16:45:06 +00:00
Martin Kiewitz
ca9f08c624 SCI/newgui: kHiLite support 
svn-id: r44701
 2009-10-06 16:36:28 +00:00
Martin Kiewitz
d2fdc8fc79 SCI/newgui: Draw_Line() now doesnt modify prio/control anymore 
svn-id: r44700
 2009-10-06 16:25:34 +00:00
Filippos Karapetis
f258a29d6b Updated the SCI engine module.mk and MSVC project files for commit #44698 
svn-id: r44699
 2009-10-06 16:19:20 +00:00
Martin Kiewitz
14dfa5d7b0 SCI/newgui: palette functions from SciGuiGfx now in SciGuiPalette 
svn-id: r44698
 2009-10-06 16:14:40 +00:00
Filippos Karapetis
855af31757 Removed the Bresenham line drawing code in the SCI new GUI, and replaced it with Graphics::drawLine() 
svn-id: r44697
 2009-10-06 15:20:33 +00:00
Filippos Karapetis
5d382150df - Removed the SciGuiGfx parameter from SciGuiView 
- Moved _sysPalette inside SciGuiScreen
- Made CreatePaletteFromData() a static helper function

svn-id: r44696
 2009-10-06 14:37:25 +00:00
Filippos Karapetis
3eb350ff1f Removed duplicate private variables 
svn-id: r44695
 2009-10-06 14:00:35 +00:00
Martin Kiewitz
334a48a33d SCI/newgui: removed warnings from vector drawing 
svn-id: r44694
 2009-10-06 13:30:20 +00:00
Filippos Karapetis
daa6f0d9a2 SciGuiView is only using the ResourceManager, so there's no need to pass the whole EngineState to it 
svn-id: r44693
 2009-10-06 12:33:36 +00:00
Filippos Karapetis
df29b0067e - Unified the screen buffers that are used by the current and the new GUI 
- Replaced the FreeSCI line drawing code (which is actually Bresenham) with Graphics::drawLine(), after discussing with waltervn. This shouldn't bring any regressions, as we're no longer offering the option to scale the background at a vector level. After playing through some of the games, I haven't noticed any regressions
- Some cleanup

svn-id: r44692
 2009-10-06 12:26:13 +00:00
Filippos Karapetis
8e108cc0a0 Removed unused reference to OSystem 
svn-id: r44691
 2009-10-06 08:11:06 +00:00
Martin Kiewitz
467c883ae1 SCI/newgui: view type amiga now supported 
svn-id: r44689
 2009-10-06 07:37:08 +00:00
Benjamin Haisch
6cd612d359 Fix regression introduced by r44459; LGoP2 crashed after Infocom logo 
svn-id: r44688
 2009-10-06 07:35:21 +00:00
Martin Kiewitz
c901f18e03 SCI/newgui: view 1.1 loading now completely fixed, included sanity check and one fixme 
svn-id: r44687
 2009-10-06 07:25:07 +00:00
Martin Kiewitz
358bfb3141 SCI/newgui: one typo in view sci1.1 fixed 
svn-id: r44686
 2009-10-06 07:12:09 +00:00
Martin Kiewitz
8d762cf0f0 SCI/newgui: support for amiga palette, amiga picture support, cleanup 
svn-id: r44685
 2009-10-06 06:50:31 +00:00
Willem Jan Palenstijn
437a7cc07c SCI: Make getBitsDataSize use the same logic as saveBits 
svn-id: r44682
 2009-10-05 23:00:48 +00:00
Martin Kiewitz
30596adec2 SCI/newgui: Implemented trick to get dithering going after drawing picture w/o destroying statusbar 
svn-id: r44681
 2009-10-05 22:42:41 +00:00
Willem Jan Palenstijn
20125b51c4 SCI: Fix error message 
svn-id: r44680
 2009-10-05 21:47: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
c30cdf65e7 SCI/newgui: color duplicated to upper 4 bits on EGA to remove dithering with black 
svn-id: r44678
 2009-10-05 20:46:19 +00:00
Martin Kiewitz
db4938fd86 SCI/newgui: SciGuiPicture - enum rename from SCI0/SCI1 to EGA/VGA 
svn-id: r44677
 2009-10-05 20:21:59 +00:00
Martin Kiewitz
9b416ca947 SCI/newgui: switch to SCI1 commands when being IsVGA(), fixes qfg2 
svn-id: r44676
 2009-10-05 20:19:07 +00:00
Martin Kiewitz
e77f997e33 SCI/newgui: EGA picture drawing is now using EGA palette 
svn-id: r44675
 2009-10-05 20:02:29 +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