Commit Graph

253 Commits

Author SHA1 Message Date
Johannes Schickel
d68706d8ed Enable interface text fading in Kyra1 amiga again.
svn-id: r43196
2009-08-10 01:33:56 +00:00
Johannes Schickel
e265084bc3 Fix interface text color.
svn-id: r43195
2009-08-10 01:33:36 +00:00
Johannes Schickel
48e86a9e22 Initial support for correct colors in the interface of Kyra1 AMIGA.
svn-id: r43192
2009-08-10 01:32:39 +00:00
Johannes Schickel
738c51f88f Clear the destination page for bitmap loading, this fixes graphics artifacts in Kyra1 amiga.
svn-id: r43189
2009-08-09 23:32:52 +00:00
Johannes Schickel
300297d557 Add support for the font format used in Kyrandia 1 Amiga. (font colors are wrong though)
svn-id: r43187
2009-08-09 22:46:43 +00:00
Johannes Schickel
518cb968b2 Create a "Font" interface and create a "DOSFont" implementation for handling DOS version fonts.
svn-id: r43186
2009-08-09 22:46:25 +00:00
Johannes Schickel
ad40f3b46e Cleanup AMIGA graphics conversion.
svn-id: r43183
2009-08-09 19:11:10 +00:00
Johannes Schickel
84c0bf22d2 Simplify KYRA's SJIS font loading code.
svn-id: r42820
2009-07-26 14:18:49 +00:00
Johannes Schickel
cb960ad976 Change the way the font data for SJIS fonts is load.
svn-id: r42815
2009-07-26 14:17:40 +00:00
Johannes Schickel
0a03ae8265 Change KYRA to use our SJIS font, when it's available.
svn-id: r42814
2009-07-26 14:17:21 +00:00
Johannes Schickel
a93008713a Removed the now uneeded "Screen::_disableScreen" flag.
svn-id: r42366
2009-07-11 01:54:42 +00:00
Johannes Schickel
e35dd4df1c Change "FM-Towns" to "FM-TOWNS" for consistency.
svn-id: r42232
2009-07-07 19:00:39 +00:00
Johannes Schickel
8c65d4d4a9 - Rename FontSJIS::enableShadow to enableOutline.
- Initialize outline to false by default in FontTowns.

svn-id: r42231
2009-07-07 18:17:30 +00:00
Johannes Schickel
62eebc3e17 - Added support for outlined FM-Towns ROM drawing
- Adapted KYRA to use that

svn-id: r42230
2009-07-07 18:10:35 +00:00
Johannes Schickel
ec2c7cfefa Adapt KYRA to use the new Graphics::FontSJIS code.
svn-id: r42222
2009-07-07 14:22:39 +00:00
Florian Kagerer
9255bfc907 KYRA: fix minor bug in Screen::drawShape()
svn-id: r42110
2009-07-04 21:18:20 +00:00
Johannes Schickel
267efdc874 Fix invisible mouse cursor, when picking up items.
svn-id: r41967
2009-06-29 23:14:35 +00:00
Johannes Schickel
18940ffd46 Fix bug in drawShape.
svn-id: r41964
2009-06-29 20:17:10 +00:00
Johannes Schickel
e15502d381 Fix bug in drawShape, which caused invisibility in Kyra1 to be displayed incorrectly.
svn-id: r41962
2009-06-29 19:02:15 +00:00
Johannes Schickel
cc0b30370e Fix kyra2/kyra3 mouse cursor related regressions, introduced with r41959.
svn-id: r41960
2009-06-29 18:49:17 +00:00
Johannes Schickel
67f69bcaf2 - Get rid of code duplication for mouse cursor setup
- Fix mouse cursor colors in LoL PC98
(This commit might introduce regressions, since it changes the key color the mouse cursor uses)

svn-id: r41959
2009-06-29 18:00:18 +00:00
Johannes Schickel
07cdbd273d Add a "fill" method to Palette.
svn-id: r41952
2009-06-29 16:49:38 +00:00
Johannes Schickel
b12496d1dd Modified Palette::load*Palette definition.
svn-id: r41941
2009-06-29 16:05:50 +00:00
Johannes Schickel
e212c06845 Implement palette difference in Kanji drawing code for PC98.
svn-id: r41896
2009-06-26 00:12:08 +00:00
Johannes Schickel
e45a941f9d Implement PC98 text mode color palette.
svn-id: r41895
2009-06-26 00:11:56 +00:00
Johannes Schickel
44e2f4c929 Only initialize palettes with 16 colors in (real) 16 color games.
svn-id: r41892
2009-06-25 23:04:32 +00:00
Johannes Schickel
7bbad2738a Store palettes in a Common::Array instead of a fixed size array.
svn-id: r41891
2009-06-25 23:04:21 +00:00
Johannes Schickel
fc0d0e2323 Cleanup palette setup.
svn-id: r41890
2009-06-25 23:04:08 +00:00
Johannes Schickel
86b63e0e4e Implement proper AMIGA to VGA color conversion.
svn-id: r41852
2009-06-25 02:39:23 +00:00
Johannes Schickel
bd4b5d8336 Implement proper VGA (a color component in [0, 63]) to our palette format (color component in [0, 255]) conversion.
svn-id: r41851
2009-06-25 02:39:00 +00:00
Johannes Schickel
951e82a921 Readd PC98 palette loading for LoL 16 color.
svn-id: r41850
2009-06-25 02:38:19 +00:00
Johannes Schickel
6e299e4777 Strip trailing whitespaces and tabs.
svn-id: r41848
2009-06-25 01:30:12 +00:00
Johannes Schickel
4c01d4a954 Fix memory leak.
svn-id: r41747
2009-06-22 02:41:56 +00:00
Johannes Schickel
5767277d8d - Fixed regression in Screen::fadeToBlack
- Fixed some palette regressions in Kyra1 Amiga (only the intro works currently)

svn-id: r41746
2009-06-22 02:37:57 +00:00
Johannes Schickel
d7432e18ea Changed Screen::loadPalette to take a reference to a Palette object instead of an array.
svn-id: r41745
2009-06-22 02:37:41 +00:00
Johannes Schickel
d2e5166dae Changed Screen::loadBitmap and Movie::open to take an optional Palette pointer instead of an optional array pointer.
svn-id: r41744
2009-06-22 02:37:20 +00:00
Johannes Schickel
73ea378dee - Changed the following Screen functions to take a reference to a Palette object:
-> setScreenPalette
	-> fadePalette
	-> getFadeParams
	-> fadePalStep
- Fixed initialization of 256 color palettes

svn-id: r41743
2009-06-22 02:36:54 +00:00
Johannes Schickel
4bb392b593 Add wrapper functionality for copying full palettes.
svn-id: r41742
2009-06-22 02:36:16 +00:00
Johannes Schickel
882662977f Changed Screen::getPalette to return a reference to a Palette object.
svn-id: r41741
2009-06-22 02:35:45 +00:00
Johannes Schickel
9da52cb282 Got rid of Screen::_currentPalette.
svn-id: r41740
2009-06-22 02:35:04 +00:00
Johannes Schickel
b448d506b8 Start refactoring palette handling into new class "Palette".
svn-id: r41739
2009-06-22 02:34:35 +00:00
Johannes Schickel
0fa9b569bf Cleanup.
svn-id: r41723
2009-06-21 01:22:23 +00:00
Johannes Schickel
89607d994b Fix drawing of sharp s.
svn-id: r41719
2009-06-21 01:15:09 +00:00
Johannes Schickel
d4248b10c8 Prevent font code to draw characters not included in the font.
svn-id: r41718
2009-06-21 01:14:57 +00:00
Florian Kagerer
583a89be62 LOL: - started on the ingame menu code (death menu, load menu and main menu)
- fixed regression in kyra gui code (broken menu highlighting)
- fixed minor bug in animation code

svn-id: r41557
2009-06-15 20:52:09 +00:00
Johannes Schickel
ac46c98fb8 - Moved Screen_v2::copyWsaRect to Screen::copyWsaRect
- Made WSAMovie_v1::displayFrame code match the original
- Changed WSAMovieAmiga::displayFrame to use Screen::copyWsaRect too
- Got rid of '...' parameter usage in all WSA player classes

svn-id: r41398
2009-06-09 11:26:15 +00:00
Johannes Schickel
0f116f1c38 Cleanup.
svn-id: r41381
2009-06-08 18:30:28 +00:00
Johannes Schickel
aef8d2b04b Fix out of bounds memory access in Screen::drawShape.
svn-id: r41379
2009-06-08 17:47:37 +00:00
Johannes Schickel
897c0104c9 Remove unneeded functionality from Screen.
svn-id: r41357
2009-06-07 22:41:38 +00:00
Johannes Schickel
bdea557d7f - Fix some valgrind warnings
- Fix original bug in the Lands of Lore credits, which messed up some headings (the original didn't display them at all for some reason)

svn-id: r41111
2009-06-01 21:03:44 +00:00
Johannes Schickel
c7ee0a7ec8 More formatting.
svn-id: r40994
2009-05-29 13:09:26 +00:00
Johannes Schickel
17b761d1e9 Cleanup.
svn-id: r40986
2009-05-29 11:58:21 +00:00
Johannes Schickel
e23a229999 Fix valgrind warnings.
svn-id: r40983
2009-05-29 11:43:22 +00:00
Johannes Schickel
fd34892cd5 Cleanup and slight bugfix in drawShapeProcessLineScale* functions.
svn-id: r40982
2009-05-29 11:07:35 +00:00
Johannes Schickel
e51481d69b Remove trailing tabs/whitespaces.
svn-id: r40760
2009-05-21 13:13:09 +00:00
Johannes Schickel
783fb058b0 Formatting.
svn-id: r40717
2009-05-19 01:39:18 +00:00
Johannes Schickel
7561bd9dfb Remov lots of superfluous debug output.
svn-id: r40715
2009-05-19 01:13:29 +00:00
Johannes Schickel
aa4964a46f - Fix mouse cursor visibilty on load game in LoL
- Only show mouse cursor after cursor change, when the mouse was visible

svn-id: r40669
2009-05-17 23:42:54 +00:00
Florian Kagerer
6e566a9b1e LOL: added some drawing code and fixed some bugs
svn-id: r40167
2009-04-27 19:38:28 +00:00
Florian Kagerer
ccb64ad81e LOL: - Started implementing the fighting system. The damage inflicted is wrong, however (at least the damage inflicted by the monsters). I'm sowewhat clueless about that bug atm.
- added support for monsters with distance attacks (like those orcs in front of roland's house)
- lots of small bug fixes
- Some startup support for the pc-98 16 color version. The intro will run, but the font drawing/coloring is still wrong.

svn-id: r40144
2009-04-25 13:15:05 +00:00
Max Horn
5749b363d5 KYRA: Replaced Rect class by Common::Rect; replaced dirty rect handling code by code similiar to the one used in SAGA and the frontend GUI code
svn-id: r39929
2009-04-11 09:57:57 +00:00
Florian Kagerer
0ce597db80 LOL: - added drawing code for certain gfx (blood and slime spots on the floor, teleporters, ice walls)
svn-id: r39599
2009-03-21 20:24:36 +00:00
Florian Kagerer
769184c483 LOL: added some new drawing code required for some shapes and fixed a minor text displaying bug
svn-id: r39487
2009-03-17 18:27:56 +00:00
Florian Kagerer
7ea5cefef4 LOL: implemented some monster related code (monsters now get placed in the maze, but they still don't do anything)
svn-id: r39039
2009-03-01 14:45:30 +00:00
Johannes Schickel
33934251cb Fix for long delay while fading palette in Zanthia's home, when mixing potions.
svn-id: r38425
2009-02-17 17:17:47 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Johannes Schickel
dfc08c823d Clean up cursor stack on engine quit properly.
svn-id: r35427
2008-12-18 20:22:49 +00:00
Max Horn
b085afc451 Removed obsolete refs to OSystem::kFeatureAutoComputeDirtyRects
svn-id: r35240
2008-12-04 19:09:10 +00:00
Johannes Schickel
5a0556f09c Committed my patch #2123680 "SDL: Backend transaction / rollback support".
svn-id: r35062
2008-11-14 22:08:10 +00:00
Max Horn
3248906156 Engine class changed:
- Moved initCommonGFX() && GUIErrorMessage() out of class Engine
- got rid of the _autosavePeriod member (this prevented users from
  changing the autosave period during runtime)
- Got rid of an evil 'using GUI::Dialog' statement
- Clarified some Doxygen comments

svn-id: r34720
2008-10-02 17:48:01 +00:00
Max Horn
9b160804ab Renamed Engine::quit to Engine::shouldQuit (previously, it was easily confused with Engine::quitGame); also cleaned up engine.h a bit
svn-id: r34700
2008-09-30 12:27:38 +00:00
Johannes Schickel
20a7a9112f Fix potentional bug in Screen::setResolution.
svn-id: r34533
2008-09-14 19:05:05 +00:00
Johannes Schickel
38097172e2 Typo.
svn-id: r34528
2008-09-14 16:48:20 +00:00
Johannes Schickel
eddae0e105 Fixed thumbnail creation / loading in kyra.
svn-id: r34527
2008-09-14 16:29:14 +00:00
Johannes Schickel
25d79f8918 Cleanup.
svn-id: r34484
2008-09-10 20:47:58 +00:00
Johannes Schickel
08b4cf127b Cleanup.
svn-id: r33948
2008-08-16 21:51:56 +00:00
Johannes Schickel
a023dba941 Fixed regressions in kyra1 amiga.
svn-id: r33522
2008-08-02 14:32:05 +00:00
Johannes Schickel
7e7468b322 - Fixed fadePalette for HoF and Kyra3
- Fixed bug in wsaFrameAnimationStep

svn-id: r33334
2008-07-27 12:12:40 +00:00
Florian Kagerer
7b30081be2 - improved hof music support for fm-towns (driver for *.twn tracks) (still needs quite some work)
- some PC-98 music support since it uses a very similar driver, but this can't be considered working yet)
- Kyra 1 PC-98 music doen't work at all since I haven't figured out yet how to turn track numbers into the corresponding music file names (might require a hard coded track map)

svn-id: r32807
2008-06-26 19:42:59 +00:00
Johannes Schickel
6f14d88138 More descriptive error message when encountering invalid font data.
svn-id: r32092
2008-05-13 21:17:46 +00:00
Johannes Schickel
de6e6408b6 Fixed some valgrind warnings.
svn-id: r32065
2008-05-12 17:23:28 +00:00
Johannes Schickel
bb03596744 - Renamed KyraEngine to KyraEngine_v1
- kyra.* -> kyra_v1.*
- scene.cpp -> scene_v1.cpp

svn-id: r32044
2008-05-11 23:16:50 +00:00
Johannes Schickel
1d018f6046 Formatting.
svn-id: r32037
2008-05-11 21:09:16 +00:00
Johannes Schickel
b53fe83695 Silenced some g++ 4.3 warnings.
svn-id: r31956
2008-05-08 21:23:14 +00:00
Johannes Schickel
3d9ea59616 Changed kyra to use delete[] instead of delete [].
svn-id: r31925
2008-05-07 14:20:37 +00:00
Johannes Schickel
4b5f3266cf Started to refactor kyra2/kyra3 code to a common base. (regressions possible, compiling currently broken)
svn-id: r31817
2008-05-02 14:46:30 +00:00
Johannes Schickel
3bde19a137 Fixed unitialized variable in Screen.
svn-id: r31732
2008-04-26 10:28:23 +00:00
Johannes Schickel
61101b6dce Fixed kyra screen initialization.
svn-id: r31730
2008-04-26 10:15:54 +00:00
Florian Kagerer
13ef28215d minor drawShape() bug fix for Malcolm's shadow
svn-id: r31728
2008-04-25 22:38:40 +00:00
Johannes Schickel
347eb2dc07 - cleanup
- some valgrind warning fixes

svn-id: r31669
2008-04-23 18:18:11 +00:00
Johannes Schickel
9616ec94c9 Fixed yet another two long standing bugs in Screen::encodeShape.
svn-id: r31633
2008-04-20 23:13:38 +00:00
Johannes Schickel
01bbe8cb6c Fixed long standing bug in encodeShape.
svn-id: r31593
2008-04-20 11:52:08 +00:00
Johannes Schickel
4b7e5aeaf7 Little fix in drawShape.
svn-id: r31555
2008-04-17 22:50:15 +00:00
Torbjörn Andersson
7ec2b87fb6 Commented out unused variables.
svn-id: r31539
2008-04-17 16:35:16 +00:00
Florian Kagerer
607039db01 some more drawShape plot functions now (after Lord Hoto's additions) required for Kyra 1
svn-id: r31528
2008-04-17 06:33:48 +00:00
Johannes Schickel
b2331a01ec Fixed mask page handling in ScreenEx::copyWsaRect, this time it should be correct...
svn-id: r31524
2008-04-16 23:11:46 +00:00
Johannes Schickel
2b87cd1fa9 - Some more mask page handling fixes for Kyra3.
- Implemented a few scene animation opcodes
- basic run loop (all the user can do is quit though)
- music related fix
Wee you can see the squirrel animation and listen to the music now!

svn-id: r31523
2008-04-16 23:09:07 +00:00
Torbjörn Andersson
ac25887670 Fixed warning.
svn-id: r31522
2008-04-16 22:30:13 +00:00
Johannes Schickel
b2a586acb2 Fixed shape drawing in HoF (regression) and Kyra3.
svn-id: r31521
2008-04-16 22:23:09 +00:00
Johannes Schickel
57e91a6add Some more kyra3 code.
svn-id: r31519
2008-04-16 21:13:52 +00:00