Strangerke
eb61855ca0
MORTEVIELLE: Avoid loading sfx and noise files multiple times
2013-08-10 22:17:10 +02:00
Strangerke
0c00a7fde8
MORTEVIELLE: Some refactoring in noise sound code
2013-08-10 21:56:21 +02:00
Strangerke
9569aff5e6
Merge branch 'master' of github.com:scummvm/scummvm
2013-08-10 17:32:00 +02:00
Torbjörn Andersson
56431cfc59
TINSEL: Fix DW2 assertion when quitting during cutscene
...
Call _bmv->FinishBMV() before setting g_pCurBgnd to NULL. Otherwise,
there will be an assertion if quitting during a cutscene while a
subtitle is being shown. (At least I think that's the condition.)
(Also, it seems to be a good idea to call it before EndScene(),
because even though there was no assertion, I got a lot of warnings
when I did it after.)
2013-08-10 16:56:07 +02:00
Strangerke
272740bb5c
MORTEVIELLE: Handle sounds
2013-08-10 16:23:51 +02:00
Strangerke
673ea511ea
MORTEVIELLE: some refactoring in ambiant sound code
2013-08-10 14:01:30 +02:00
Strangerke
62b6c333d5
MORTEVIELLE: Play ambiant sounds
2013-08-10 13:41:50 +02:00
Strangerke
7d6d7a7945
MORTEVIELLE: Use more accurate frequency for music
2013-08-09 18:37:17 +02:00
Einar Johan Trøan Sømåen
7306979f6d
WINTERMUTE: Fix uninitialized scalar field (CID1060922)
2013-08-09 18:28:06 +02:00
Einar Johan Trøan Sømåen
a1d02cbe97
WINTERMUTE: Avoid setting alpha-image when filename is ""
2013-08-09 18:20:04 +02:00
Filippos Karapetis
976b4167f1
Merge pull request #369 from fingolfin/fix-neverhood
...
NEVERHOOD: Remove NRect constructor
2013-08-08 16:47:53 -07:00
Johannes Schickel
de952ae0b9
Merge pull request #373 from lordhoto/ini-file
...
Rename ConfigFile to INIFile and remove outdated comments
2013-08-08 15:56:17 -07:00
Torbjörn Andersson
0d14f9d009
LURE: Fix some formatting.
2013-08-08 17:57:58 +02:00
Johannes Schickel
63750d6780
COMMON: Rename ConfigFile to INIFile.
...
This clears up that 'ConfigFile' is actually a class handling only INI-files.
2013-08-08 16:28:38 +02:00
Torbjörn Andersson
6e5c308b91
KYRA: Fix Kyra3 family album animation glitch, CID 1004139
...
The first page wasn't animated, and it's likely that some of the
other right-page animations were slightly off as well.
2013-08-08 07:16:24 +02:00
Johannes Schickel
fffb2ee3ff
HOPKINS: Respect pitch when drawing on OSystem's screen surface.
2013-08-07 22:01:19 +02:00
Johannes Schickel
7f8308e0eb
Merge pull request #365 from lordhoto/protected-pixels
...
Make Graphics::Surface::pixels protected.
2013-08-07 12:24:59 -07:00
Johannes Schickel
e5f0c42a65
WINTERMUTE: Fix incorrect parameter order for getBasePtr.
...
This is a regression from 19fa89b8f58df702c5cb16d03a9cb51c1acce7ab. Thanks to
fuzzie for noticing.
2013-08-06 20:11:27 +02:00
Filippos Karapetis
d041177e2f
SCI: Add another version of Jones CD (bug #3614668 )
2013-08-06 12:46:44 +03:00
Max Horn
a993b8dc30
NEVERHOOD: Remove NRect constructor
...
Otherwise, every global variable of type NRect requires a constructor to be
run, which can cause portability issue.
2013-08-05 11:49:03 +02:00
Einar Johan Trøan Sømåen
a932e51b14
WINTERMUTE: Fix formatting.
2013-08-05 03:25:22 +02:00
Strangerke
71a1d18b0c
MORTEVIELLE: Fix flags in playSong(). Thanks clone2727 for telling about it
2013-08-05 00:40:47 +02:00
Strangerke
80cc1700a7
MORTEVIELLE: Fix leak in playSong, refactor it a bit
2013-08-05 00:13:57 +02:00
Paul Gilbert
0d2f812387
TSAGE: Bugfixes for further R2R scene 1000 cutscenes
2013-08-04 10:16:26 -04:00
Paul Gilbert
c92ffa95df
TSAGE: Completed R2R starship cutscene
2013-08-04 10:00:10 -04:00
Alyssa Milburn
89e14f6862
SCUMM: Fix backwards-in-same-array case of v72he::copyArray.
2013-08-04 15:54:37 +02:00
Thierry Crozat
7b517f7fd1
MORTEVIELLE: Improve looping of the intro song
...
Using a LoopingAudioStream gets rid of the pause between each loop
(and simplifies the code).
2013-08-04 12:59:34 +01:00
Thierry Crozat
deef0b955c
MORTEVIELLE: Fix crash in sound mixer when closing the engine
...
This was due to the _speakerHandle being reused between its
initialisation in the SoundManager constructor and the destructor
causing it to have a wrong value when trying (and failing) to stop
the PCSpeaker channel in the mixer before deleting the stream.
2013-08-04 12:56:15 +01:00
Strangerke
fbb1137f94
MORTEVIELLE: Take shouldQuit() into account while a song is played
2013-08-04 10:49:06 +02:00
Strangerke
c1f93815ee
MORTEVIELLE: Compute real buffer size in order to avoid ticks at the end of the song
2013-08-04 10:46:10 +02:00
Alyssa Milburn
2af07d5d8e
SCUMM: Add detection/version for Moonbase Commander v1.1.
2013-08-04 10:42:44 +02:00
Strangerke
134532090b
MORTEVIELLE: Implement music in intro screen
2013-08-04 10:39:34 +02:00
Torbjörn Andersson
870a583c8b
MORTEVIELLE: Pass Pattern struct by reference
...
This should avoid unnecessary copying of a 400+ byte struct. This
was a low-priority Coverity issue, for some reason without a CID.
2013-08-04 09:24:33 +02:00
Torbjörn Andersson
38071bc5c5
MORTEVIELLE: Fix out-of-bounds read
...
This should be sufficient. At this point, cy is at most 23, and if
cx is 41 it's either 23 or less than 20. That means ix is either
46 or less than 43. If it's less than 43, there is no out of bounds
access, and now we look at the special case first.
This was a Coverity issue, but for some reason I don't see any CID
for it.
2013-08-04 09:14:11 +02:00
Johannes Schickel
a96a427fc8
SCUMM: Add comment about getPixels uses in BaseCostumeRenderer.
2013-08-04 02:41:40 +02:00
Johannes Schickel
6485b291e9
SCUMM: Fix Loom (and some other graphics regressions).
...
These are regressions from c05cb7f3bbcf4d64d4a938e0eb42065d8f3d3038. They were
caused by VirtualScreen::getPixels differing from Surface::getBasePtr and I
accidently used the former in some cases in the conversion.
I also fixed a bug in debugger.cpp which exchanged x and y.
2013-08-04 02:29:13 +02:00
Johannes Schickel
b95858bb91
WINTERMUTE: Small formatting fixes.
2013-08-04 00:53:25 +02:00
Johannes Schickel
1ce54c217a
WINTERMUTE: Fix end of namespace comments.
2013-08-04 00:51:09 +02:00
Paul Gilbert
c02934df37
TSAGE: Cleanup of code in R2R scene 1000 to use AnimationPlayer
2013-08-03 16:57:17 -04:00
Thierry Crozat
0a2e64b903
DEVTOOLS: Include English menu in mortevielle dat file
2013-08-03 16:50:14 +01:00
Strangerke
178feb8e8b
MORTEVIELLE: Rename ROOM9 into JULIA_ROOM
2013-08-03 14:55:19 +02:00
Strangerke
6d2f53a63c
MORTEVIELLE: Fix error in c79ce89680d2c46e468152791a46f2700d04b336
2013-08-03 13:18:34 +02:00
Strangerke
65b0b59bd5
MORTEVIELLE: Some more renaming
2013-08-03 12:56:21 +02:00
Strangerke
c79ce89680
MORTEVIELLE: Rework code using _openObjects
2013-08-03 12:09:13 +02:00
Johannes Schickel
d5298006f3
WINTERMUTE: Do not set Surface::pixels directly anymore.
2013-08-03 04:14:08 +02:00
Johannes Schickel
b7330ea28b
TSAGE: Do not set Surface::pixels directly anymore.
2013-08-03 04:14:08 +02:00
Johannes Schickel
eb22417639
SWORD25: Do not set Surface::pixels directly anymore.
2013-08-03 04:14:08 +02:00
Johannes Schickel
d06cbe9043
PARALLACTION: Do not set Surface::pixels directly anymore.
2013-08-03 04:14:08 +02:00
Johannes Schickel
3917608df7
MORTEVIELLE: Do not set Surface::pixels directly anymore.
2013-08-03 04:14:08 +02:00
Johannes Schickel
61fcf86679
HUGO: Do not set Surface::pixels directly anymore.
2013-08-03 04:14:07 +02:00
