Commit Graph

34502 Commits

Author SHA1 Message Date
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
Max Lingua
36c2625f07 Here we have:
- dropped gBitFormat 

 - added extra param "const Graphics::PixelFormat *" to 

    OSystem_PS2::initSize

    OSystem_PS2::setMouseCursor

Note! To compile on SVN you will have (for now ;-) to create
few few empty folders by hand, note very elegant but will
keep you going until when we (ehm...) refine the PS2 Makefile.

Here comes the brute force script I use inside backends/platform/ps2

mkdir -p backends/platform/ps2
mkdir -p base
mkdir -p engines/scumm
mkdir -p engines/scumm/he
mkdir -p engines/scumm/imuse
mkdir -p engines/scumm/imuse_digi
mkdir -p engines/scumm/insane
mkdir -p engines/scumm/smush
mkdir -p engines/agi
mkdir -p engines/agos
mkdir -p engines/cine
mkdir -p engines/cruise
mkdir -p engines/drascula
mkdir -p engines/gob
mkdir -p engines/gob/demos
mkdir -p engines/gob/save
mkdir -p engines/gob/sound
mkdir -p engines/igor
mkdir -p engines/igor/parts
mkdir -p engines/kyra
mkdir -p engines/lure
mkdir -p engines/made
mkdir -p engines/parallaction
mkdir -p engines/queen
mkdir -p engines/saga
mkdir -p engines/sky
mkdir -p engines/sky/music
mkdir -p engines/sword1
mkdir -p engines/sword2
mkdir -p engines/touche
mkdir -p gui
mkdir -p graphics
mkdir -p graphics/fonts
mkdir -p graphics/scaler
mkdir -p graphics/video
mkdir -p graphics/video/coktelvideo
mkdir -p sound
mkdir -p sound/mods
mkdir -p sound/softsynth
mkdir -p sound/softsynth/opl
mkdir -p backends/events/default
mkdir -p backends/fs
mkdir -p backends/fs/amigaos4
mkdir -p backends/fs/ds
mkdir -p backends/fs/palmos
mkdir -p backends/fs/posix
mkdir -p backends/fs/ps2
mkdir -p backends/fs/psp
mkdir -p backends/fs/symbian
mkdir -p backends/fs/windows
mkdir -p backends/fs/wii
mkdir -p backends/keymapper
mkdir -p backends/midi
mkdir -p backends/plugins/dc
mkdir -p backends/plugins/posix
mkdir -p backends/plugins/sdl
mkdir -p backends/plugins/win32
mkdir -p backends/saves
mkdir -p backends/saves/default
mkdir -p backends/saves/posix
mkdir -p backends/saves/psp
mkdir -p backends/timer/default
mkdir -p backends/vkeybd
mkdir -p common

I know, you don't need all those "-p" but it looks more consistent ;-)

svn-id: r44683
2009-10-05 23:46:39 +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
Martin Kiewitz
7da723ab4e SCI/newgui: drawControlIcon - updates screen now
svn-id: r44660
2009-10-05 12:12:18 +00:00
Filippos Karapetis
4d699301c7 Minimize unnecessary calls to updateScreen() in the new GUI. This improves drawing speed dramatically
svn-id: r44659
2009-10-05 12:04:39 +00:00
Martin Kiewitz
6e38de3905 SCI/newgui: kDrawControl on icon implemented
svn-id: r44658
2009-10-05 11:42:04 +00:00
Filippos Karapetis
55e7c29d95 Removed dead code
svn-id: r44657
2009-10-05 10:27:00 +00:00
Willem Jan Palenstijn
4478ab6472 SCI: Name argument
svn-id: r44656
2009-10-05 09:23:59 +00:00
Filippos Karapetis
d37f4ea07d Proper check for window shadows
svn-id: r44655
2009-10-05 09:20:55 +00:00
Filippos Karapetis
93833ee86a Window shadows are also taken into account when storing their bits. This fixes the issue where window shadows were left on screen when windows were closed
svn-id: r44654
2009-10-05 08:19:43 +00:00
Filippos Karapetis
7f053e3a62 Removed the unused _bytesPerDisplayPixel parameter. All SCI games use 8bpp color (apart from the videos in Phantasmagoria 2, which are not part of the engine itself)
svn-id: r44653
2009-10-05 07:51:31 +00:00
Filippos Karapetis
d61e73367f Silenced some warnings in drawVectorData()
svn-id: r44652
2009-10-05 07:48:43 +00:00
Filippos Karapetis
3f77685f13 More method renaming
svn-id: r44651
2009-10-05 07:38:05 +00:00
Filippos Karapetis
6f97a7ca81 Cleanup
svn-id: r44650
2009-10-05 07:25:18 +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
Filippos Karapetis
136dbba9c4 Fixed warning (GameObject is a struct)
svn-id: r44648
2009-10-05 07:00:59 +00:00