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
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
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
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
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
442a870123
Stop spamming of the console
...
svn-id: r44672
2009-10-05 19:30:17 +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
Martin Kiewitz
ec43c30503
SVN/newgui: renamed getScreenPalette to getSysPalette (code doesnt get the screen palette at all, but actually the current sysPalette which does not need to be active at all times
...
svn-id: r44669
2009-10-05 18:20:50 +00:00
Willem Jan Palenstijn
2a06f34181
SCI: Move restoreRect adjustment from DrawWindow to NewWindow
...
svn-id: r44668
2009-10-05 18:00:12 +00:00
Martin Kiewitz
ac9faddd17
SVN/newgui: views on sci1.1 - mirroring now possible
...
svn-id: r44667
2009-10-05 17:57:06 +00:00
Martin Kiewitz
ac5d71b57e
SCI/newgui: duplicate the color in cels into upper 4 bits on ega so they wont get dithered with black
...
svn-id: r44666
2009-10-05 17:40:21 +00:00
Martin Kiewitz
d7f584166d
SVN/newgui: ega cel uncompression implemented
...
svn-id: r44665
2009-10-05 16:51:01 +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
Filippos Karapetis
3e66ae85f6
Better naming for the palette setting functions, to disambiguate them from the existing ones
...
svn-id: r44662
2009-10-05 12:49:31 +00:00
Filippos Karapetis
f3d3596d54
Renamed
...
setCLUT() -> setPalette()
getCLUT() -> getPalette()
svn-id: r44661
2009-10-05 12:37:01 +00:00