Raiza.dev/Minicraft3DS
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleaning up stuff

Browse source
This commit is contained in:
tognee 2019-09-18 00:09:46 +02:00
parent 5423be67ca
commit a5ea06a928
44 changed files with 7329 additions and 7432 deletions
Download patch file Download diff file Expand all files Collapse all files

70
source/Sound.c
View file

@ -5,48 +5,48 @@ int soundListenerX;
int soundListenerY;
void loadSound(Sound * snd, char * filename){
FILE *file = fopen(filename, "rb");
if(file != NULL){
fseek(file, 0, SEEK_END);
snd->size = ftell(file)/2;
fseek(file, 0, SEEK_SET);
snd->buffer = linearAlloc(snd->size*sizeof(u16));
fread(snd->buffer, 1, snd->size, file);
}
fclose(file);
FILE *file = fopen(filename, "rb");
if(file != NULL){
fseek(file, 0, SEEK_END);
snd->size = ftell(file)/2;
fseek(file, 0, SEEK_SET);
snd->buffer = linearAlloc(snd->size*sizeof(u16));
fread(snd->buffer, 1, snd->size, file);
}
fclose(file);
}
void playSound(Sound snd){
csndPlaySound(8, SOUND_FORMAT_16BIT | SOUND_ONE_SHOT, 44100, 1, 0, snd.buffer, snd.buffer, snd.size);
csndPlaySound(8, SOUND_FORMAT_16BIT | SOUND_ONE_SHOT, 44100, 1, 0, snd.buffer, snd.buffer, snd.size);
}
void playSoundPositioned(Sound snd, s8 level, int x, int y) {
if(level != soundListenerLevel) return;
int xd = soundListenerX - x;
int yd = soundListenerY - y;
if (xd * xd + yd * yd > 80 * 80) return;
csndPlaySound(8, SOUND_FORMAT_16BIT | SOUND_ONE_SHOT, 44100, 1, 0, snd.buffer, snd.buffer, snd.size);
if(level != soundListenerLevel) return;
int xd = soundListenerX - x;
int yd = soundListenerY - y;
if (xd * xd + yd * yd > 80 * 80) return;
csndPlaySound(8, SOUND_FORMAT_16BIT | SOUND_ONE_SHOT, 44100, 1, 0, snd.buffer, snd.buffer, snd.size);
}
void setListenerPosition(s8 level, int x, int y) {
soundListenerLevel = level;
soundListenerX = x;
soundListenerY = y;
soundListenerLevel = level;
soundListenerX = x;
soundListenerY = y;
}
void playMusic(Sound *snd){
static Sound *lastSnd;
if(lastSnd==snd) return;
lastSnd = snd;
csndPlaySound(10, SOUND_FORMAT_16BIT | SOUND_REPEAT, 44100, 1, 0, snd->buffer, snd->buffer, snd->size);
static Sound *lastSnd;
if(lastSnd==snd) return;
lastSnd = snd;
csndPlaySound(10, SOUND_FORMAT_16BIT | SOUND_REPEAT, 44100, 1, 0, snd->buffer, snd->buffer, snd->size);
}
void stopMusic() {
CSND_SetPlayState(8, 0);
CSND_SetPlayState(10, 0);
csndExecCmds(true);
csndExecCmds(true);
}
void updateMusic(int lvl, int time) {
@ -77,7 +77,7 @@ void loadSounds() {
loadSound(&snd_pickup, "romfs:/resources/pickup.raw");
loadSound(&snd_bossdeath, "romfs:/resources/bossdeath.raw");
loadSound(&snd_craft, "romfs:/resources/craft.raw");
loadSound(&music_menu, "romfs:/resources/music/menu.raw");
loadSound(&music_floor0, "romfs:/resources/music/floor0.raw");
loadSound(&music_floor1, "romfs:/resources/music/floor1.raw");
@ -87,18 +87,18 @@ void loadSounds() {
}
void freeSounds(){
linearFree(snd_playerHurt.buffer);
linearFree(snd_playerDeath.buffer);
linearFree(snd_monsterHurt.buffer);
linearFree(snd_test.buffer);
linearFree(snd_pickup.buffer);
linearFree(snd_bossdeath.buffer);
linearFree(snd_craft.buffer);
linearFree(snd_playerHurt.buffer);
linearFree(snd_playerDeath.buffer);
linearFree(snd_monsterHurt.buffer);
linearFree(snd_test.buffer);
linearFree(snd_pickup.buffer);
linearFree(snd_bossdeath.buffer);
linearFree(snd_craft.buffer);
linearFree(music_menu.buffer);
linearFree(music_floor0.buffer);
linearFree(music_floor1.buffer);
linearFree(music_floor1_night.buffer);
linearFree(music_floor23.buffer);
linearFree(music_floor4.buffer);
}
}