Commit graph

142 commits

Author SHA1 Message Date
Hubert Maier
3aca967665
JANITORIAL: GRIM: Fix typos in comments 2024-08-07 10:10:21 +03:00
Cameron Cawley
288e1aaa3f COMMON: Remove use of fmin/fmax/fminf/fmaxf 2024-01-08 13:07:05 +01:00
Donovan Watteau
18ab6803d6 JANITORIAL: Fix various "an" typos in comments 2023-03-16 14:47:28 +01:00
Vladimir Serbinenko
7d8aba66cf GRIM: Change audio encoding to little-endian
We create it from 8-bit compression so on most platforms it just results in
2 useless byte swaps
2023-03-06 16:00:46 +01:00
Paweł Kołodziejski
06902574b4
GRIM: Janitorial 2022-06-08 01:12:00 +02:00
Paweł Kołodziejski
20cb0ae228
ALL: Cleanup ResidualVM -> ScummVM 2021-12-26 21:19:38 +01:00
Eugene Sandulenko
abea37c9bb
ALL: Update ScummVM project license to GPLv3+ 2021-12-26 18:48:43 +01:00
Paweł Kołodziejski
9ae57ad4c1
GRIM: EMI: Use new math vector and matrix multiplication 2021-12-26 18:45:59 +01:00
Orgad Shaneh
fd4d6e3bc0 GRIM: Use override
Using clang-tidy modernize-use-override
2021-11-14 14:34:14 +02:00
Max Horn
445fe63524 GRIM: fix global constructor warnings
Since now `_musicTable` always points to a an array allocated
via `new[]`, we can also simplify the `EMISound` destructor.
2021-08-07 10:46:14 +02:00
Max Horn
b7e6d61669 JANITORIAL: Fix compiler warnings about unused code 2021-08-07 10:46:14 +02:00
Orgad Shaneh
a05e54f00c JANITORIAL: Remove trailing whitespaces 2021-05-04 11:46:30 +03:00
Christian Krause
ab828f3f3c GRIM: gracefully handle critical floating point operations 2020-12-08 19:35:54 +01:00
Eugene Sandulenko
a312ddce78 GRIM: Fix typo in error message 2020-10-12 13:13:34 +02:00
Pawel Kolodziejski
490bedb584 ALL: Fixed some compiler warnings while using c++11 2020-09-25 18:51:18 +02:00
Pawel Kolodziejski
d5304e2568 ALL: Synced with ScummVM - rev: 33a47d23b8 2020-09-03 02:21:14 +02:00
Mathias Parnaudeau
a8e8b71550 EMI: Check _musicTable is null before it is used
After having installed EMI data and started the game, if we are in the situation
where it is asked to rename resource file FullMonkeyMap.imt from both CDs
into FullMonkeyMap1.imt and FullMonkeyMap2.imt, the game tries to start but
leads to an immediate segmentation fault.

In EMISound::setMusicState, _musicTable is checked againt nullptr but ... after
it is used. This check is moved up.
2020-02-21 07:11:56 +01:00
Dries Harnie
74a8f2d09c EMI: Support merged FullMonkeyMap.int as well 2019-05-13 20:55:21 +02:00
Bastien Bouclet
6708f19a50 GRIM: Fix invalid ADGF_DEMO flag usage 2017-07-26 20:12:35 +02:00
Pawel Kolodziejski
5c7fd27706 ALL: sync with ScummVM 2015-09-06 16:08:49 +02:00
Pawel Kolodziejski
11b457122b ALL: synced with ScummVM 2015-08-16 08:49:02 +02:00
Christian Krause
404ae70687 EMI: Avoid +/-inf values for volumes
Ensure that all math operations are done with floating point
arithmetic to avoid a floating point division by zero for small
values of _volume. In this case, the term in parenthesis would
be evaluated first via integer arithmetic and may produce easily 0.
2014-11-21 19:36:44 +01:00
Christian Krause
36b037c81d EMI: Refactor conversion of sound volume values
- LUA code uses a range of 0 .. 100
- the LUA group volumes are in the range 25 .. 100, otherwise the sound
  group is muted
- residualvm engine uses a range of 0 .. Audio::Mixer::kMaxChannelVolume
- do most of the conversion in lua_v2_sound.cpp
- most parts of the engine will solely use the engine internal range
- only when reading/writing the registry residualvm continues to use
  a special conversion for compatibility with the volume settings
  of the residualvm engine settings
- proper handling of volumes close to 0.0f in SoundTrack::updatePosition()
2014-10-27 01:10:29 +01:00
Joseph Jezak
68bf45f373 EMI: Additional conversions from interest/roll to _rot. 2014-08-19 21:15:18 -04:00
Joni Vähämäki
ec6241fa00 EMI: Fixed implementation of UpdateSoundPosition. 2014-08-14 17:51:08 +03:00
Joni Vähämäki
029b57e3ab EMI: Remap volumes from the range 0-100 to the range 0-255 for the audio mixer. 2014-08-14 17:51:07 +03:00
Joni Vähämäki
d5355e6713 EMI: Fixed sound panning. 2014-08-14 17:51:06 +03:00
Joni Vähämäki
2b2b12cf1d EMI: Adjust attenuation of sounds to match the original game better. 2014-08-14 17:51:05 +03:00
Joni Vähämäki
896fd7cb42 EMI: Recalculate volume and balance for positioned sounds when the setup changes. Fixes #996 2014-08-14 17:50:58 +03:00
Joni Vähämäki
338a31ab26 EMI: Initialize _looping in SCXTrack. 2014-08-09 14:14:16 +03:00
Joni Vähämäki
40fd8016dc EMI: Accept .lab suffix when detecting MP3 music. 2014-08-09 14:14:16 +03:00
Joni Vähämäki
c5954a2305 EMI: Make sure the music state id does not exceed the number of entries in the music table. 2014-08-09 14:14:14 +03:00
Joni Vähämäki
2264fd7c8e EMI: Remove MusicEntry constructors to fix C++98 compile error. 2014-08-07 13:03:54 +03:00
Joni Vähämäki
468e58b2e8 EMI: Pause loaded sounds also. 2014-08-06 19:43:30 +03:00
Joni Vähämäki
204aed2650 EMI: Save and restore sound track looping status. 2014-08-06 19:43:29 +03:00
Joni Vähämäki
b5e4aa4826 EMI: Refactor EMISound to get rid of the fixed number of channels. 2014-08-06 19:43:28 +03:00
Joni Vähämäki
e08141392e EMI: Replace assert with warning if EMISound runs out of channels. 2014-08-06 19:43:28 +03:00
Joni Vähämäki
9e482d1563 EMI: Initialize the fields of MusicEntry. 2014-08-06 19:43:27 +03:00
Joni Vähämäki
f31ac635a9 EMI: Implement SCXTrack::setLooping. 2014-08-06 19:43:26 +03:00
Joni Vähämäki
93140ed84a EMI: Do not dispose SCX tracks after playing. 2014-08-06 19:43:26 +03:00
Joni Vähämäki
81d00e041f EMI: If the new music track is the same as the previous one, keep playing the previous one. 2014-08-06 19:43:25 +03:00
Joni Vähämäki
685803cc83 EMI: Fix pop at the end of SCX playback. 2014-08-06 19:43:24 +03:00
Joni Vähämäki
5e8d3dad0c EMI: Implement seeking to start position for SCX tracks. 2014-08-06 19:43:24 +03:00
Joni Vähämäki
da2518bdb3 EMI: Add PS2 music table. 2014-08-06 19:43:23 +03:00
Joni Vähämäki
1da4de97ae EMI: Add comment about the mutex in EMISound. 2014-08-06 19:43:22 +03:00
Joni Vähämäki
f198433a69 EMI: Comment saved boolean value which indicates whether the sound channel is active or not. 2014-08-06 19:43:22 +03:00
Joni Vähämäki
25f688764a EMI: Make use of brackets consistent in EMISound::initTrack. 2014-08-06 19:43:21 +03:00
Joni Vähämäki
7c4e942253 EMI: Add comment about disposing of AIFF tracks. 2014-08-06 19:43:20 +03:00
Joni Vähämäki
1f8fe2a4aa EMI: Pass sound name as Common::String& to EMISound's methods. 2014-08-06 19:43:20 +03:00
Joni Vähämäki
f66f218832 EMI: Respect the loop flag passed as parameter to PlayLoadedSound. 2014-08-06 19:43:19 +03:00