Commit Graph

34239 Commits

Author SHA1 Message Date
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