libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-15 00:27:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
37,543 Commits 6 Branches 5 Tags
Commit Graph

2237 Commits

Author SHA1 Message Date
Johannes Schickel
23ed4c2a76 Revert "Fix use of "friend" keyword in KYRA for strict C++ compilers." 
Actually g++ is just fine in this case :-). The thing I missed here
was that I declared the "offending" classes as friends in subclasses
of KyraEngine_v1, thus those friends were allowed to access the
protected elements of KyraEngine_v1 too.

svn-id: r48643
 2010-04-12 19:50:40 +00:00
Johannes Schickel
050aca584b Fix use of "friend" keyword in KYRA for strict C++ compilers. 
Unlike g++, which does inherit friends (it seems), C++ does
specify that friend is not inherited. I.e. when B is a friend of
A and you have a class C subclassing B, C is not allowed to
access private memebers of A.

svn-id: r48641
 2010-04-12 19:10:21 +00:00
Max Horn
a1840bd573 AUDIO: Rename Mixer::playInputStream to playStream 
svn-id: r48637
 2010-04-12 09:14:17 +00:00
Johannes Schickel
b928da4418 Setup and destroy a dummy cursor and palette in the Engine class. 
The idea behind this is exactly the same as behind r48620,
but it affects all engines, thus engine authors can now use
CursorMan.replaceCursor without having to worry about possible
memory leaks or the like.

svn-id: r48626
 2010-04-11 18:30:42 +00:00
Johannes Schickel
175a81ce98 Fix KYRA's cursor handling by pushing a dummy cursor via CursorMan.pushCursor too. Also replace CursorMan.popAllCursors by CursorMan.popCursor to prevent the caller's cursor from being destroyed. 
svn-id: r48621
 2010-04-11 17:27:33 +00:00
Johannes Schickel
cf85c0b318 Fix bug #2985387 "KYRA1: Crash at the end of game". 
svn-id: r48617
 2010-04-11 15:05:26 +00:00
Ori Avtalion
aee05cd21d Remove extra semicolons 
svn-id: r48457
 2010-04-01 15:03:08 +00:00
Max Horn
4bac9e1b75 COMMON: Cleanup ConfigManager code 
* get rid of ConfigManager::_emptyString
* get rid of ConfigManager::Domain::get (use getVal instead)
* remove some dead code

svn-id: r48417
 2010-03-29 20:31:23 +00:00
Johannes Schickel
5315993ffc Remove pointer dereferencation in a place, where the result is not used at all. 
svn-id: r48396
 2010-03-24 21:39:02 +00:00
Max Horn
92c896d883 Patch #2973290: Semicolon cleanup 
svn-id: r48359
 2010-03-22 20:28:08 +00:00
Johannes Schickel
01f5610836 Fix out of bounds access. 
svn-id: r48338
 2010-03-20 20:25:37 +00:00
Max Horn
cac0ac66e2 COMMON: Get rid of Common::StringList 
svn-id: r48287
 2010-03-18 15:54:40 +00:00
Max Horn
d78dba3bca COMMON: Move Common::RandomSource to common/random.* 
svn-id: r48279
 2010-03-18 15:07:11 +00:00
Max Horn
4e99cfc549 Switch from Common::tag2string(foo).c_str() to tag2str(foo) 
svn-id: r48276
 2010-03-18 15:04:38 +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
Max Horn
f24cc1c8be Tweak makeVOCDiskStream 
* now takes a SeekableReadStream *pointer* like (almost) all other
  audiostream factories
* fix potential memory leak in it
* rename takeOwnershipOfStream to disposeAfterUse for consistency

svn-id: r48184
 2010-03-08 10:27:42 +00:00
Johannes Schickel
4221460f6d Fix item exchange string in Kyra 1 Amiga (both English and German). 
svn-id: r48159
 2010-03-04 16:34:27 +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
Johannes Schickel
049b4384bc Fix for bug #2954279 "KYRA: Error when loading non-existent savegame". 
svn-id: r48089
 2010-02-19 14:05:55 +00:00
Johannes Schickel
c8470e1d89 Use Common::KEYCODE_* instead of ASCII values for keycode comparison. 
svn-id: r48079
 2010-02-17 16:18:23 +00:00
Johannes Schickel
5d6b9af72a Use Common::KeyCode instead of int as key type for KeyMap. 
svn-id: r48078
 2010-02-17 16:08:47 +00:00
Florian Kagerer
9b6042efb4 LOL: fixed script bug in castle cimmeria that would cause out of bounds mem access (should fix bug #2948109) 
svn-id: r48016
 2010-02-09 21:09:29 +00:00
Florian Kagerer
d4a0375f7e LOL: fixed handling of invalid monster attack sfx in the Urbish mines (should fix bug no #2945950) 
svn-id: r47967
 2010-02-07 16:12:31 +00:00
Johannes Schickel
fe35d372da - Rename FlacStream to FLACStream. 
- Rename makeFlacStream to makeFLACStream.

svn-id: r47846
 2010-02-03 09:42:11 +00:00
Johannes Schickel
a505d32eff Replace use of Audio::makeRawMemoryStream by Audio::makeRawStream. 
svn-id: r47716
 2010-01-30 15:26:54 +00:00
Johannes Schickel
8e69a24783 Fix yet another use of possibly undefined behavior reported by syke. 
svn-id: r47689
 2010-01-29 23:52:58 +00:00
Johannes Schickel
595a2e16f1 Fix use of undefined behavior. (Thanks to syke for reporting) 
svn-id: r47685
 2010-01-29 22:43:23 +00:00
Johannes Schickel
812603e29e Fix invalid sample position on Timestamp to sample conversion for Stereo streams. 
svn-id: r47591
 2010-01-27 08:08:33 +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
2eb16caade Remove HACK, which is obsolete because of r47336. 
svn-id: r47548
 2010-01-25 03:05:39 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs. 
svn-id: r47541
 2010-01-25 01:39:44 +00:00
Torbjörn Andersson
45cbc7b265 Fixed warning. 
svn-id: r47504
 2010-01-24 17:24:11 +00:00
Florian Kagerer
4eb077dcf3 LOL: save/load menu speed up 
svn-id: r47501
 2010-01-24 15:40:36 +00:00
Max Horn
4b996e7de7 Reorder params to Audio::makeRawMemoryStream 
svn-id: r47492
 2010-01-23 23:55:35 +00:00
Johannes Schickel
4fcc82e7a6 Paranoia change: add some explicit terminating 0 after some strncpy uses. 
svn-id: r47479
 2010-01-23 16:15:18 +00:00
Max Horn
b036392a7b Get rid of deprecated makeRawDiskStream variants; rename deprecated makeRawMemoryStream variant to makeRawMemoryStream_OLD; adapt some code to this change 
svn-id: r47472
 2010-01-23 13:34:29 +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
dc5e08e623 Move raw audio flags from sound/mixer.h to sound/raw.h 
svn-id: r47395
 2010-01-19 22:30:33 +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
69be747621 Move raw audio streams to new header sound/raw.h 
svn-id: r47368
 2010-01-19 00:54:06 +00:00
Max Horn
349fcd1d71 Rename 'Linear' audio streams to 'raw' 
svn-id: r47367
 2010-01-19 00:52:41 +00:00
Florian Kagerer
0fd8008296 LOL: minor key map fix 
svn-id: r47359
 2010-01-18 19:15:05 +00:00
Florian Kagerer
4c9f323199 LOL: cleanup last commit 
svn-id: r47354
 2010-01-18 07:21:54 +00:00
Florian Kagerer
371a2a9ee9 LOL: fixed spell array size 
svn-id: r47353
 2010-01-18 00:56:30 +00:00
Johannes Schickel
e11e9338d1 Delay the time a sysEx takes to send instead of the old (incorrect) way of delaying only 45ms between two sysEx calls. (Code thankfully borrowed from waltervn). 
svn-id: r47336
 2010-01-17 02:42:31 +00:00
Max Horn
7ec2da968c Switch most AudioStream factories to use DisposeAfterUse::Flag 
svn-id: r47334
 2010-01-16 21:36:08 +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
Johannes Schickel
6ca0570fe3 - Add a SubLoopingAudioStream, which loops a nested part of a stream and thus features the same looping capabilites as LinearMemoryStream and LinearDiskStream. 
- Remove custom looping code from LinearMemoryStream and LinearDiskStream.
- Adapt various client code to the changes.

svn-id: r47226
 2010-01-10 15:20:14 +00:00
Max Horn
be8371fb07 Replace AppendableAudioStream by QueuingAudioStream 
svn-id: r47189
 2010-01-09 00:19:13 +00:00
Max Horn
f720d99b0a Switch Mixer::playInputStream to use DisposeAfterUse::Flag 
svn-id: r47182
 2010-01-08 22:09:43 +00:00