libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-03 16:09:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
39,123 Commits 5 Branches 5 Tags 1.8 GiB
00dfb4db29
Commit Graph

243 Commits

Author SHA1 Message Date
Paul Gilbert
02ed880180 Added logic for handling the rate of animation background scrolling, and miscellaneous extra fields 
svn-id: r49627
 2010-06-13 08:53:06 +00:00
Paul Gilbert
2625c9b20b Applied fix for checking unallocated channels for All Notes Off MIDI command 
svn-id: r49613
 2010-06-12 23:53:26 +00:00
Paul Gilbert
277a700e67 Reimplemented the scaled sprite drawing logic. The first introduction sequence scene now displays correctly 
svn-id: r49604
 2010-06-12 11:32:28 +00:00
Paul Gilbert
e572267a05 Bugfixes to correctly scroll the background during animations 
svn-id: r49596
 2010-06-11 11:08:37 +00:00
Paul Gilbert
ef34896dce Clarified various incorrectly named parameters, and fixed code for loading the correct art file backgrounds when running animation sequences 
svn-id: r49595
 2010-06-11 11:03:51 +00:00
Paul Gilbert
4d87342847 Added extra code and support methods for properly clearing up backgrounds and used sprites when an animation sequence ends 
svn-id: r49566
 2010-06-10 10:20:25 +00:00
Paul Gilbert
62402e743e Added extra positioning and dummy depths surface so that the introduction cutscene now starts up 
svn-id: r49480
 2010-06-07 10:17:44 +00:00
Paul Gilbert
b2678ddf52 Changed a create call to setSize to fix compiler error 
svn-id: r49479
 2010-06-07 09:35:59 +00:00
Paul Gilbert
34f7c05e4d Initial conversion of the AnimviewView class to use the expanded MadsAnimation class, rather than the older AAFile skeleton class 
svn-id: r49478
 2010-06-07 09:19:42 +00:00
Paul Gilbert
1572524b64 Moved destruction of globals and resource manager to common M4 engine base class - this fixes a bug where resources were still being tossed after the resource manager was destroyed 
svn-id: r49476
 2010-06-07 09:06:06 +00:00
Paul Gilbert
3efec5720d Bugfixes for correct positioning of opening animation 
svn-id: r49448
 2010-06-06 06:46:29 +00:00
Paul Gilbert
b9065aa2d2 Various bugfixes to the animation code - first Rex animation now plays, albeit in the wrong place 
svn-id: r49437
 2010-06-05 04:18:23 +00:00
Paul Gilbert
5686c251f0 Added missing animation initialisation code 
svn-id: r49436
 2010-06-05 01:55:17 +00:00
Paul Gilbert
3a5fe4ca00 Bugfix for wrong parameter order in scene resources load method call. Also added fragment to destroy an active animation when it's finished animating 
svn-id: r49434
 2010-06-04 22:53:26 +00:00
Paul Gilbert
3d98f679e7 Bugfix for the loading of the animation frame list 
svn-id: r49427
 2010-06-04 12:51:06 +00:00
Paul Gilbert
86462c66a0 Added code and support routines for destroying animations correctly, which also necessitated changing the sprite list code 
svn-id: r49426
 2010-06-04 11:28:30 +00:00
Torbjörn Andersson
038ac90482 Renamed some variables to silence GCC warnings. 
svn-id: r49412
 2010-06-03 21:13:08 +00:00
Paul Gilbert
26860b8e51 Properly implemented the logic for loading the correct interface background as specified in a scene's resources 
svn-id: r49409
 2010-06-03 10:46:55 +00:00
Paul Gilbert
86dcc28342 Moved the MADS interface view into mads_scene.cpp and did a major cleanup of scene loading code 
svn-id: r49405
 2010-06-03 09:34:32 +00:00
Willem Jan Palenstijn
2bebba8c94 Fix warning, whitespace 
svn-id: r49352
 2010-05-31 12:38:15 +00:00
Filippos Karapetis
ff40247376 Hopefully fixed compilation 
svn-id: r49350
 2010-05-31 12:27:13 +00:00
Paul Gilbert
088e6456ea In progress work implementing the animation player 
svn-id: r49347
 2010-05-31 12:10:30 +00:00
Paul Gilbert
bea6ef4beb Clarified variable usage for sequence list entry indexes 
svn-id: r49287
 2010-05-28 10:20:02 +00:00
Paul Gilbert
145eacd491 Implemented needed methods for scrolling surfaces horizontally or vertically 
svn-id: r49286
 2010-05-28 10:17:16 +00:00
Paul Gilbert
eca8c35cfc Gave proper names to each flag in the message flag set 
svn-id: r49229
 2010-05-26 08:32:32 +00:00
Paul Gilbert
961a64a9f8 Bugfix to allow timed text to display in the correct colours 
svn-id: r49211
 2010-05-25 11:54:18 +00:00
Paul Gilbert
a83aafab54 Changed the font system to allow for multiple fonts to be loaded simultaneously 
svn-id: r49209
 2010-05-25 10:46:56 +00:00
Paul Gilbert
6bda3e15db Implemented the bulk of the logic for displaying timed on-screen messages 
svn-id: r49180
 2010-05-24 12:12:27 +00:00
Paul Gilbert
dd9bf70761 Major work done on the animation and support classes to match the original 
svn-id: r49150
 2010-05-23 07:20:40 +00:00
Paul Gilbert
68cae03b3c Bugfixes for animation display, and better understanding of how animations cycle 
svn-id: r49057
 2010-05-17 10:30:17 +00:00
Paul Gilbert
43e61ec60f Bugfixes for animation depth logic 
svn-id: r49045
 2010-05-16 01:32:46 +00:00
Paul Gilbert
86bfccb842 Removed use of globally constructed menu item position lists 
svn-id: r49035
 2010-05-15 00:42:56 +00:00
Paul Gilbert
e91df69eb6 Decoded further fields in the SequenceList class, and started implementation of kernel message display 
svn-id: r49034
 2010-05-15 00:28:44 +00:00
Max Horn
2149a2383d Reduce indirect header dependencies further 
svn-id: r48936
 2010-05-04 12:00:16 +00:00
Max Horn
970745e60c Move DebugChannel related code to new header 
svn-id: r48935
 2010-05-04 11:59:22 +00:00
Max Horn
b3e404109c Move initGraphics and initCommonGFX from to new header. 
These functions are only used internally be Engine subclasses, and
by moving them to a separate header we can reduce indirect header
dependencies.

svn-id: r48934
 2010-05-04 11:58:12 +00:00
Max Horn
5568a8473b Get rid of Engine::_gameDataDir. 
This greatly reduces indirect dependencies on several header files
from common.

svn-id: r48933
 2010-05-04 11:56:52 +00:00
Johannes Schickel
990f633b00 Fix g++ warning by commenting out an unused variable. 
svn-id: r48905
 2010-05-03 13:04:08 +00:00
Torbjörn Andersson
35f1a55b70 Allow the Orion Burger title screen to be shown again. At least, it doesn't 
crash on my computer any more. (It doesn't do much interesting either.)

svn-id: r48892
 2010-05-02 17:43:24 +00:00
Paul Gilbert
e11afdeab5 Added proper names for some of the previous unknown timer fields, and bugfixes for the sequence list methods 
svn-id: r48875
 2010-04-30 11:27:42 +00:00
Max Horn
460d69e885 COMMON: Move DebugChannel stuff into a new DebugMan singleton 
svn-id: r48821
 2010-04-27 21:40:52 +00:00
Paul Gilbert
46c520f797 Added further timer method implementation. Also renamed some of the classes to match those of the original engine, based on the contents of various in-game error messages 
svn-id: r48816
 2010-04-27 11:23:27 +00:00
Paul Gilbert
328d571bba Implemented extra timer methods and a DynamicHotspots class 
svn-id: r48776
 2010-04-23 10:28:30 +00:00
Paul Gilbert
3edc151c5b Changed MadsView into a separate class, since it's functionality is needed by two different class hierarchies that can't share a common ancestor class 
svn-id: r48763
 2010-04-21 10:42:01 +00:00
Max Horn
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream 
svn-id: r48637
 2010-04-12 09:14:17 +00:00
Paul Gilbert
eb433fcccd Added the beginnings of the main timer list 
svn-id: r48635
 2010-04-12 08:31:46 +00:00
Ori Avtalion
bfbbc0a072 Remove unused dereference 
svn-id: r48586
 2010-04-08 22:04:17 +00:00
Ori Avtalion
aee05cd21d Remove extra semicolons 
svn-id: r48457
 2010-04-01 15:03:08 +00:00
Johannes Schickel
a3ab15e8cf Use the enumerators instead of hardcoding the values of them. 
svn-id: r48411
 2010-03-27 13:29:10 +00:00
Paul Gilbert
a2de7bb0ef Added the game options dialog, along with several bugfixes to dialog display code 
svn-id: r48410
 2010-03-27 10:44:38 +00:00
Paul Gilbert
38f2c1b7a4 Completed dialog item selection code 
svn-id: r48409
 2010-03-27 07:14:52 +00:00
Paul Gilbert
c73a50b4e3 Changed the encoding of keycodes to only include the flags for Ctrl, Alt, and Shift 
svn-id: r48408
 2010-03-27 07:13:30 +00:00
Paul Gilbert
73787f05f0 Bugfixes to the graphics display of dialogs 
svn-id: r48405
 2010-03-26 20:45:32 +00:00
Paul Gilbert
5d85ad0759 Further fixed the setEntry method to make it Endian safe 
svn-id: r48404
 2010-03-26 10:21:08 +00:00
Paul Gilbert
02b1e3278a Bugfix for logic used to calculate single RGB palette entries 
svn-id: r48403
 2010-03-26 09:35:48 +00:00
Johannes Schickel
fcc7ab61ac Fix compilation by removing a public keyword outside a class scope and using "> >" instead of ">>" for template closing brackets. 
Note that ">>" is always operator>> in the current C++ standard, thus
one has to use "Common::Array<Common::SharedPtr<SpriteAsset> >" instead
of "Common::Array<Common::SharedPtr<SpriteAsset>>" for example.

svn-id: r48402
 2010-03-25 12:54:55 +00:00
Paul Gilbert
ae8853d80b Added preliminary logic for showing loaded sprite frames 
svn-id: r48401
 2010-03-25 12:46:06 +00:00
Johannes Schickel
86c779bed8 Prevent inifinite loop caused by a check of an unsigned integer against >= 0. 
svn-id: r48397
 2010-03-24 21:39:26 +00:00
Paul Gilbert
cf5cd833fd Moved new MadsView related code into Mads_Views, where it's more appropriate. Added extra logic necessary for displaying text in the game dialogs 
svn-id: r48378
 2010-03-24 11:49:26 +00:00
Paul Gilbert
d34fd9cdd6 Bugfix for getting correct quote information 
svn-id: r48377
 2010-03-24 11:47:08 +00:00
Paul Gilbert
e0f92f61eb Bugfixes for correctly getting string lengths and cropping drawn text 
svn-id: r48376
 2010-03-24 11:46:09 +00:00
Paul Gilbert
b46a2b4e10 Added further code for the game dialog framework 
svn-id: r48368
 2010-03-23 12:02:23 +00:00
Max Horn
92c896d883 Patch #2973290: Semicolon cleanup 
svn-id: r48359
 2010-03-22 20:28:08 +00:00
Johannes Schickel
a725b490e8 Fix shadow member of this warnings of gcc. 
svn-id: r48355
 2010-03-21 12:36:57 +00:00
Paul Gilbert
05922881cb Added framework for displaying game dialogs 
svn-id: r48353
 2010-03-21 10:51:11 +00:00
Paul Gilbert
b2b7a08cc2 Beginnings of hooking up the new logic for current action display 
svn-id: r48298
 2010-03-19 09:19:23 +00:00
Max Horn
c934642bdb COMMON: Move typedef StringList from str.h to new header str-array.h 
This removes the dependency on array.h from str.h.
Also, begun migration from the confusing type name "StringList" to
the more appropriate StringArray.

svn-id: r48282
 2010-03-18 15:09:24 +00:00
Max Horn
d78dba3bca COMMON: Move Common::RandomSource to common/random.* 
svn-id: r48279
 2010-03-18 15:07:11 +00:00
Paul Gilbert
730405f975 Further code implemented for the current action display 
svn-id: r48266
 2010-03-16 08:26:08 +00:00
Paul Gilbert
404088f58b Further separation of MADS and M4 scene logic 
svn-id: r48257
 2010-03-14 05:47:33 +00:00
Paul Gilbert
77c821249e Further work on separating M4 specific scene code into the m4_scene.cpp file 
svn-id: r48256
 2010-03-14 05:39:47 +00:00
Paul Gilbert
ca64698408 Split up the SceneResources class into a generic common set, with specific versions each for M4 and Mads, and merged the MadsSceneInfo data into it 
svn-id: r48223
 2010-03-10 11:43:48 +00:00
Torbjörn Andersson
65585f6433 Silenced some harmless cppcheck warnings about unreachable code after a return. 
In this case, it was always a break after a return in a switch case. There are
similar cases which cppcheck didn't detect, and a couple of cases where we have
a break after a continue in a switch case (where the continue refers to an
outer loop), but I didn't touch those. Not yet, at least.

svn-id: r48218
 2010-03-10 06:39:23 +00:00
Paul Gilbert
7f57001e17 Split up the scene.cpp file into separate files for M4 and MADS specific scene code and support classes. Also have started adding code for textual display and proper current action display 
svn-id: r48172
 2010-03-07 05:06:58 +00:00
Johannes Schickel
576f0b9a66 Fix gcc warning. 
svn-id: r48151
 2010-02-28 01:35:34 +00:00
Paul Gilbert
2881a8c057 Implemented loading of the Rex Nebular walkable areas 
svn-id: r48150
 2010-02-28 01:07:25 +00:00
Paul Gilbert
75a0022dff Beginnings of code for scene info loading 
svn-id: r48143
 2010-02-27 05:30:53 +00:00
Yotam Barnoy
ef330ed9b4 Patch for bug 2943361 by littleboy, adding full kb modifier support to all engines + GUI and proper keypad handling 
svn-id: r48101
 2010-02-21 04:04:13 +00:00
Paul Gilbert
6969b5ebe6 Implemented some of the sprite animations loading logic for the first scene (no display yet) 
svn-id: r48099
 2010-02-21 01:18:03 +00:00
Paul Gilbert
bf82639c04 Implemented player sprite loading portion of scene enter code 
svn-id: r48076
 2010-02-17 11:37:17 +00:00
Paul Gilbert
52c2abba96 Added the beginnings of scene set-up logic 
svn-id: r48039
 2010-02-13 11:49:18 +00:00
Paul Gilbert
1b877ceb5b Added command variation for dumping quotes and vocab 
svn-id: r48038
 2010-02-13 11:45:54 +00:00
Willem Jan Palenstijn
005cdeb830 Fix warning 
svn-id: r48031
 2010-02-10 12:36:46 +00:00
Paul Gilbert
3415cae9ad Separated scene info console method between M4 and MADS classes, and cleaned up the message method 
svn-id: r48030
 2010-02-10 11:11:31 +00:00
Paul Gilbert
a435237a38 Bugfix for crash when view gets focus based on a key event 
svn-id: r48029
 2010-02-10 11:03:04 +00:00
Paul Gilbert
9c178c2d3a Formatting corrections to conform to ScummVM formatting guidelines 
svn-id: r47733
 2010-01-31 00:47:29 +00:00
Paul Gilbert
dc8ff8c9d4 Further work on separating the scene logic for MADS and M4 
svn-id: r47732
 2010-01-31 00:42:47 +00:00
Paul Gilbert
3d1a43bc54 Worked on separating scene logic into separate classes for M4 and MADS 
svn-id: r47728
 2010-01-30 23:03:07 +00:00
Johannes Schickel
a505d32eff Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream. 
svn-id: r47716
 2010-01-30 15:26:54 +00:00
Paul Gilbert
3285a4ba4d Beginnings of a separation of the MADS and M4 engines into separate classes. This will be cleaner then having checks everywhere for whether the game mode is MADS or M4. 
svn-id: r47705
 2010-01-30 09:21:07 +00:00
Max Horn
1565f14bc1 Moved audio stream implementations (for MP3, FLAC, etc.) to new dir sound/decoders/ 
svn-id: r47579
 2010-01-26 22:48:45 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs. 
svn-id: r47541
 2010-01-25 01:39:44 +00:00
Max Horn
4b996e7de7 Reorder params to Audio::makeRawMemoryStream 
svn-id: r47492
 2010-01-23 23:55:35 +00:00
Torbjörn Andersson
4818467908 Silenced some more cppcheck warnings. Some of these may seem silly, but the way 
I figure it the changes are harmless at worst, and making them will make it
easier to find real errors in the (still quite long) list of warnings.

svn-id: r47443
 2010-01-22 19:05:02 +00:00
Max Horn
cebaa0b0d3 Started to get rid of Audio::FLAG_LOOP 
svn-id: r47397
 2010-01-19 23:50:33 +00:00
Max Horn
dc5e08e623 Move raw audio flags from sound/mixer.h to sound/raw.h 
svn-id: r47395
 2010-01-19 22:30:33 +00:00
Torbjörn Andersson
428f8d6955 Fixed some cppcheck warnings. 
svn-id: r47393
 2010-01-19 20:41:51 +00:00
Max Horn
b227c660c6 Remove loop start/end params from Mixer::playRaw; convert some code from Mixer::playRaw to Mixer::playInputStream 
svn-id: r47375
 2010-01-19 11:20:58 +00:00
Max Horn
557bb394de Get rid of Mixer::FLAG_AUTOFREE. 
Also fix several recently introduced new/delete vs. malloc/free mismatches.

svn-id: r47369
 2010-01-19 00:56:29 +00:00
Max Horn
b8f2a3a342 cleanup 
svn-id: r47333
 2010-01-16 21:34:36 +00:00