drummyfish/Licar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add fan sound

Browse source
This commit is contained in:
Miloslav Ciz 2025-01-31 14:20:49 +01:00
parent 67e0814afb
commit 2ff43a0d1a
4 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets.h
View file

@ -71,7 +71,7 @@ static const char *LCR_internalDataFile =
":;p0w0L :f5130" // bugs
":>f0s0 :fd110" // small labyrinth
":of0s0 :fd110" // small labyrinth
":oc0p0 :fd110"
":=f0s0 :f11d0"
":=c0p0 :f11d0"

36
audio.h
View file

@ -11,13 +11,15 @@
file, left to be optionally loaded and played by the frontend).
*/
#define LCR_SOUND_NONE 0
#define LCR_SOUND_CLICK 1
#define LCR_SOUND_NONE 0
#define LCR_SOUND_CLICK 1
#define LCR_SOUND_CRASH_SMALL 2
#define LCR_SOUND_CRASH_BIG 3
#define LCR_SOUND_CRASH_BIG 3
#define LCR_SOUND_ACCELERATOR 4
#define LCR_SOUND_FAN 5
#define LCR_AUDIO_CRASH_LEN 2048
#define LCR_AUDIO_CRASH_SOUND_LEN 2048
#define LCR_AUDIO_FAN_SOUND_LEN 4096
struct
{
@ -100,10 +102,10 @@ uint8_t LCR_audioGetNextSample(void)
case LCR_SOUND_CRASH_BIG:
{
int limit = (LCR_audio.soundPlayed == LCR_SOUND_CRASH_BIG ? 256 : 96) -
(LCR_audio.soundPlayedFrame * 256) / LCR_AUDIO_CRASH_LEN;
(LCR_audio.soundPlayedFrame * 256) / LCR_AUDIO_CRASH_SOUND_LEN;
if (LCR_audio.frame % 2 || // lower frequency
LCR_audio.soundPlayedFrame < LCR_AUDIO_CRASH_LEN / 4)
LCR_audio.soundPlayedFrame < LCR_AUDIO_CRASH_SOUND_LEN / 4)
LCR_audio.crashSample = _LCR_audioNoise();
if (LCR_audio.crashSample > limit)
@ -127,6 +129,28 @@ uint8_t LCR_audioGetNextSample(void)
break;
case LCR_SOUND_FAN:
{
int limit = LCR_AUDIO_FAN_SOUND_LEN - LCR_audio.soundPlayedFrame;
if (limit > LCR_AUDIO_FAN_SOUND_LEN / 2)
limit = LCR_AUDIO_FAN_SOUND_LEN - limit;
limit = (limit * 256) / (LCR_AUDIO_FAN_SOUND_LEN / 2);
result = _LCR_audioNoise();
if (result > limit)
result = limit;
result = 128 - limit / 2 + result;
if (LCR_audio.soundPlayedFrame >= LCR_AUDIO_FAN_SOUND_LEN)
LCR_audio.soundPlayed = LCR_SOUND_NONE;
break;
}
case LCR_SOUND_CLICK:
{
int v = ((LCR_audio.soundPlayedFrame >> 6) *

4
game.h
View file

@ -1387,7 +1387,9 @@ LCR_replayOutputStr(_LCR_gameDataCharWrite);
LCR_LOG2("crash (big)");
}
else if (events & LCR_RACING_EVENT_ACCELERATOR)
LCR_audioPlaySoundIfFree(LCR_SOUND_ACCELERATOR);
LCR_audioPlaySoundIfFree(LCR_SOUND_ACCELERATOR);
else if (events & LCR_RACING_EVENT_FAN)
LCR_audioPlaySoundIfFree(LCR_SOUND_FAN);
int engineIntensity = LCR_carSpeedKMH() * 2;

4
racing.h
View file

@ -42,6 +42,7 @@ typedef int32_t LCR_GameUnit; ///< abstract game unit
#define LCR_RACING_EVENT_CRASH_SMALL 0x0004
#define LCR_RACING_EVENT_CRASH_BIG 0x0008
#define LCR_RACING_EVENT_ACCELERATOR 0x0010
#define LCR_RACING_EVENT_FAN 0x0020
#define LCR_PHYSICS_UNIT 4096 ///< len. of square for phys. engine
@ -1202,7 +1203,10 @@ uint32_t LCR_racingStep(unsigned int input)
onAccel = LCR_mapBlockIsAccelerator(b);
if (LCR_mapBlockIsFan(b))
{
LCR_racing.fanForce = LCR_GRAVITY * LCR_FAN_FORCE;
result |= LCR_RACING_EVENT_FAN;
}
groundMat = LCR_mapBlockGetMaterial(
LCR_currentMap.blocks + groundBlockIndex * LCR_BLOCK_SIZE);