Commit Graph

59 Commits

Author SHA1 Message Date
Johannes Schickel
9b51b138db KYRA: Some formatting fixes. 2011-12-26 21:34:22 +01:00
athrxx
692f9ee6d5 KYRA: whitespace cleanup 2011-12-26 16:18:17 +01:00
Christoph Mallon
23a0f5318c JANITORIAL: Remove trailing empty lines. 2011-08-07 13:53:33 +02:00
strangerke
69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
Johannes Schickel
7d03da14cb KYRA: Clean up of header includes. 2011-04-28 15:39:57 +02:00
Johannes Schickel
a30b8f0bdc - Fix some missing initialization warnings from cppcheck
- Fix two invalid memory accesses reported by cppcheck

svn-id: r45414
2009-10-26 20:07:37 +00:00
Max Horn
f242266f6d Change a couple places from 'end of namespace' to 'End of namespace', for consistency
svn-id: r44634
2009-10-04 21:26:33 +00:00
Johannes Schickel
a8f5f651a5 Cleanup.
svn-id: r43230
2009-08-10 22:18:18 +00:00
Johannes Schickel
ad40f3b46e Cleanup AMIGA graphics conversion.
svn-id: r43183
2009-08-09 19:11:10 +00:00
Johannes Schickel
3bde2647b6 Change raw palette read to Screen::loadPalette call.
svn-id: r41946
2009-06-29 16:08:00 +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
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
b1041bba7f Add support for "WF_NO_LAST_FRAME" in WSA v1 code too. Since so far every v1 WSA file played fine, it might be unneeded, but better safe than sorry.
svn-id: r41316
2009-06-07 00:58:14 +00:00
Johannes Schickel
6cfb706fae Fix WSA v2 code, now the automap remove WSA file in Lands of Lore plays correctly.
svn-id: r41315
2009-06-07 00:51:19 +00:00
Johannes Schickel
e1b4f63343 Fix some Kyra1 movies.
svn-id: r40768
2009-05-21 17:25:29 +00:00
Johannes Schickel
e51481d69b Remove trailing tabs/whitespaces.
svn-id: r40760
2009-05-21 13:13:09 +00:00
Johannes Schickel
7561bd9dfb Remov lots of superfluous debug output.
svn-id: r40715
2009-05-19 01:13:29 +00:00
Johannes Schickel
273b93f3a7 Preliminary support for LoL intro demo.
svn-id: r40705
2009-05-18 21:45:09 +00:00
Johannes Schickel
68b3cc89ae Fixed long standing palette loading bug in WSA v1 code.
svn-id: r40700
2009-05-18 20:08:18 +00:00
Florian Kagerer
e1cc5c309a KYRA: fixed typo
svn-id: r40436
2009-05-10 20:47:58 +00:00
Johannes Schickel
3a392ed05b Oops typo.
svn-id: r40428
2009-05-10 17:49:21 +00:00
Johannes Schickel
978758190e Cleanup.
svn-id: r40426
2009-05-10 17:26:46 +00:00
Florian Kagerer
dd84aaf648 LOL: - added some spell casting (spark, heal, swarm)
- fixed several bugs (not the one in the fighting system though)
- added several opcodes. there shouldn't be any real show stoppers in the draracle cave now.
- simplified wsa code (which required 4 lines of code for displaying a frame)
- added support for wsa animations that don't have a last frame (apparently kyra 2 and 3 don't have this type of wsa file)

svn-id: r40420
2009-05-10 13:40: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
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +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
6e0c569966 Consisteny fixes:
- Renamed classes *_v1 -> *_LoK
 - Renamed files *_v1.* -> *_lok.*
 - Renamed WSAMovieV1 -> WSAMovie_v1
 - Renamed WSAMovieV2 -> WSAMovie_v2

svn-id: r32042
2008-05-11 22:32:37 +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
347eb2dc07 - cleanup
- some valgrind warning fixes

svn-id: r31669
2008-04-23 18:18:11 +00:00
Johannes Schickel
1f91dc0384 - some refactoring for Kyra3
- removed unneeded map code in KyraEngine_v3

svn-id: r31488
2008-04-12 23:17:21 +00:00
Oystein Eftevaag
41d67964b1 Committing [ 1816080 ] KYRA: Intro Patch for HoF, from Florian, with some cleanup and a minor fix
svn-id: r29233
2007-10-19 22:16:00 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Johannes Schickel
1140fca82e - Kyrandia 1 works again
- Added timer class for timer handling
- Little bit more resturcturing
- A little bit (almost nothing but a start!) Kyrandia 2 support

svn-id: r28297
2007-07-29 16:33:11 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Johannes Schickel
2103678d93 Fixed WSA playing regression, introduced while cleaning up. (should fix Floppy and Amiga version)
svn-id: r26786
2007-05-08 11:46:27 +00:00
Johannes Schickel
21b2c7bceb Formatting/Cleanup.
svn-id: r26511
2007-04-15 16:41:20 +00:00
Johannes Schickel
5e1c6c7907 - Renamed some files for consistency with other engines.
- Kyra2 detector entries update.

svn-id: r26494
2007-04-15 13:39:08 +00:00
Johannes Schickel
e8b6baca74 Little WSA loading fix.
svn-id: r26375
2007-04-03 14:26:12 +00:00
Johannes Schickel
689ea77c0d WIP code for Amiga version:
- Font displaying is not yet supported.
- Intro should be glitch free
- all other things are *untested*

svn-id: r26113
2007-03-12 20:43:56 +00:00
Johannes Schickel
15168e6c42 c&p error
svn-id: r25775
2007-02-21 22:29:45 +00:00
Johannes Schickel
48c2b96c26 typo.
svn-id: r25187
2007-01-25 12:09:22 +00:00
Oystein Eftevaag
ee221cc5df Merging decodeFrameDeltaPage() again and using Fingolfin's template trickery instead
svn-id: r25039
2007-01-06 18:52:30 +00:00
Johannes Schickel
46271f2145 formatting
svn-id: r25038
2007-01-06 18:45:43 +00:00
Oystein Eftevaag
8fbf9a1e23 A few minor fixes and optimizations (biggest one is splitting decodeFrameDeltaPage() into two functions to avoid a high amount of conditional jumps per decided animation frame
svn-id: r25034
2007-01-06 17:11:08 +00:00
Johannes Schickel
b6a8e38726 - removes the kyra specific language flag system, and uses the language enum defined in Common for that now
- also reworks the game flag system in general

svn-id: r23920
2006-09-17 20:21:40 +00:00
Oystein Eftevaag
c47a957fb3 Adds some framework for the Kyra2 intro, expands it a little bit and adds some static resources (strings, etc). Also
adding a modified version of eriktorbjorn's '[1531929] KYRA: Kyra 2 & 3 main menu unification', with added mouse pointer and sundry.

svn-id: r23766
2006-08-26 22:17:30 +00:00
Oystein Eftevaag
3c4b13ed33 Moves the kyra2 code to kyra2.cpp and kyra2.h, renames WSAMovieV3 to WSAMovie2 (kyra2 uses the same format), renames a define in kyra3.h for consistency, and adds a case for CMDS in the VQA player to avoid the constant warning (the tag is always present and empty). Credit/blame for the last one goes to Clemmy :). Starting kyra2 will now show the title animation.
svn-id: r23614
2006-07-28 11:42:53 +00:00
Johannes Schickel
8a0ec2a3e5 - moving KyraEngine_v3 declaration to newly added kyra3.h
- implements a little bit init stuff
- implements some music handling

svn-id: r23610
2006-07-27 18:29:14 +00:00