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
Johannes Schickel
0d995c5920
Rename all "Adlib" uses to "AdLib" to match the real name of the sound card / company.
...
Check this for reference:
http://en.wikipedia.org/wiki/Ad_Lib,_Inc .
http://www.crossfire-designs.de/images/articles/soundcards/adlib.jpg (note the upper left of the card)
This commit does not touch "adlib" and "ADLIB" uses!
Also it does not update all the SCUMM detection entries, which still use "Adlib".
svn-id: r47279
2010-01-12 21:07:56 +00:00
Max Horn
0cf53b025d
Move DisposeAfterUse::Flag from Common to global namespace, and into a new header common/types.h
...
svn-id: r47180
2010-01-08 22:07:35 +00:00
Torbjörn Andersson
72eb9ec9ea
Fixed a bunch of cppcheck warnings. Mostly about checking if a pointer is null
...
before freeing it, which isn't necessary.
svn-id: r46941
2010-01-03 19:37:43 +00:00
Paul Gilbert
5c732e00ee
Started implementation of the original game's cheat mode
...
svn-id: r46425
2009-12-20 07:10:32 +00:00
Paul Gilbert
b729218bb6
Changed the M4 event handler to encode the keyboard flags into KEVENT_KEY events
...
svn-id: r46424
2009-12-20 07:09:40 +00:00
Paul Gilbert
63350a0ecc
Further implementation of dialog/message script language
...
svn-id: r46418
2009-12-19 05:47:31 +00:00
Paul Gilbert
ae50fdca72
Added an extra assert
...
svn-id: r46417
2009-12-19 05:46:26 +00:00
Paul Gilbert
575308cea7
Implemented basic message parsing
...
svn-id: r46402
2009-12-17 07:55:08 +00:00
Paul Gilbert
d10bb1036e
Implemented the rendering section of dialog display
...
svn-id: r46338
2009-12-12 11:59:38 +00:00
Torbjörn Andersson
22ca0c1e92
Renamed line() to drawLine() to silence warning about function parameters in
...
dialogs.cpp shadowing it. Actually, the function doesn't seem to be used
anywhere at the moment, but perhaps someone has future plans for it?
svn-id: r46331
2009-12-11 17:14:55 +00:00
Paul Gilbert
724d698a05
Beginnings of a dialog display class
...
svn-id: r46330
2009-12-11 09:41:27 +00:00
Max Horn
c8873d8492
Changed MidiDriver::createMidi to take a MidiDriverType instead of an int
...
svn-id: r46316
2009-12-09 18:12:51 +00:00
Max Horn
d34cdae9ce
M4: Move 'determine transparent color' hack into a new M4Sprite method
...
svn-id: r46281
2009-12-07 18:23:28 +00:00
Max Horn
f8126d9da6
M4: Make M4Surface member w, h, pixels protected; some cleanup
...
svn-id: r46280
2009-12-07 18:22:18 +00:00
Max Horn
6d1e4dd034
M4: Rename M4Surface::getData() to getBasePtr() for consistency
...
svn-id: r46279
2009-12-07 18:20:20 +00:00
Paul Gilbert
f21810242e
Hooked up the actions list and object-specific actions to change the status text
...
svn-id: r46268
2009-12-05 11:32:19 +00:00
Paul Gilbert
0841063a32
Added a new variation to the 'object' command to add an object to the player's inventory
...
svn-id: r46267
2009-12-05 07:47:01 +00:00
Paul Gilbert
0e85be8405
Implemented support for the inventory list scrollbar and directly selecting an object
...
svn-id: r46266
2009-12-05 07:46:41 +00:00
Torbjörn Andersson
cb90685831
Silenced warning.
...
svn-id: r46265
2009-12-05 06:14:04 +00:00
Paul Gilbert
60fa351d32
Expanded the actions view into a full user interface view, and added support for highlighting of user interface elements
...
svn-id: r46262
2009-12-05 05:44:46 +00:00
Paul Gilbert
9bc2aa2afa
Corrected the palette colours for the interface elements
...
svn-id: r46230
2009-12-01 10:47:39 +00:00
Max Horn
e98f789a02
Fix warning
...
svn-id: r46156
2009-11-26 16:10:59 +00:00
Paul Gilbert
f3b15df8e3
Changed the game list in the doxygen comment to list all the games the engine will hopefully eventually support
...
svn-id: r46154
2009-11-26 12:07:01 +00:00
Paul Gilbert
3f1093c162
Added some comments on the status of the engine
...
svn-id: r46153
2009-11-26 12:00:37 +00:00
Paul Gilbert
5afc0e5ed7
Added the basics of a action list display
...
svn-id: r46152
2009-11-26 11:48:43 +00:00
Max Horn
df651bf20f
Added Doxygen comments for the various engine namespaces (currently mostly without details; help filling these out is welcome)
...
svn-id: r46128
2009-11-24 22:10:14 +00:00
Paul Gilbert
67442c230c
Added display of the rotating inventory objects
...
svn-id: r45912
2009-11-15 08:22:57 +00:00
Paul Gilbert
6bb2b8aa9a
Added support for needed MADS game configuration options
...
svn-id: r45911
2009-11-15 08:22:14 +00:00
Paul Gilbert
94f5c0a2f8
Added a staticres file with the MADS articles list, and added an article field to the MADSObject class
...
svn-id: r45856
2009-11-12 10:07:44 +00:00
Johannes Schickel
2c95e82e26
Comment out unused variable.
...
svn-id: r45833
2009-11-11 14:27:45 +00:00
Paul Gilbert
feab5f63ff
Beginnings of support for AA file animations. The mads_anim.cpp commit is part of this, not the previous commit
...
svn-id: r45828
2009-11-11 09:56:29 +00:00
Paul Gilbert
faaec05e65
Removed all the '- 1' from calls to get vocabs, centralising it in the getVocab method. This is correct, as the first element in the game vocab list is '1', not '0'.
...
svn-id: r45827
2009-11-11 09:55:05 +00:00
Lars Persson
e4e9080187
Missing template argument for MIN (added <uint>)
...
svn-id: r45803
2009-11-10 09:31:47 +00:00