diff --git a/src/pilot.h b/src/pilot.h index 7a09f4f..6c3b2f0 100644 --- a/src/pilot.h +++ b/src/pilot.h @@ -1,12 +1,11 @@ #pragma once -#include "lephisto.h" #include "physics.h" +#include "ship.h" #include "ai.h" #include "outfit.h" #include "faction.h" #include "sound.h" #include "economy.h" -#include "ship.h" #define PLAYER_ID 1 diff --git a/src/ship.h b/src/ship.h index c4c3cf5..2ebe8ac 100644 --- a/src/ship.h +++ b/src/ship.h @@ -1,7 +1,7 @@ #pragma once -#include "lephisto.h" -#include "outfit.h" #include "opengl.h" +#include "outfit.h" +#include "sound.h" // Target gfx dimensions. #define SHIP_TARGET_W 128 diff --git a/src/sound.c b/src/sound.c index f39f42c..313bfb2 100644 --- a/src/sound.c +++ b/src/sound.c @@ -450,7 +450,7 @@ static int voice_getSource(alVoice* voc) { static void voice_init(alVoice* voice) { // Distance model. alSourcef(voice->source, AL_ROLLOFF_FACTOR, SOUND_ROLLOFF_FACTOR); - alSourcef(voice->source, AL_MAX_DISTANCE, SOUN_MAX_DIST); + alSourcef(voice->source, AL_MAX_DISTANCE, SOUND_MAX_DIST); alSourcef(voice->source, AL_REFERENCE_DISTANCE, SOUND_REFERENCE_DIST); alSourcei(voice->source, AL_SOURCE_RELATIVE, AL_FALSE); diff --git a/src/sound.h b/src/sound.h index 4ede647..9ef5a53 100644 --- a/src/sound.h +++ b/src/sound.h @@ -20,7 +20,7 @@ void sound_volume(const double vol); alVoice* sound_addVoice(int priority, double px, double py, double vx, double vy, const ALuint buffer, const int flags); -void sound_delVoice(alVoice(alVoice* voice); // Delete voice. +void sound_delVoice(alVoice* voice); // Delete voice. void voice_update(alVoice* voice, double px, double py, double vx, double vy); void voice_buffer(alVoice* voice, const ALuint buffer, const int flags);