convert all name function from oldName to new_name

6 files changed, 69 insertions, 69 deletions

diff --git a/src/audio/audio.c b/src/audio/audio.c
index 14297af..59e0cb1 100644
--- a/src/audio/audio.c
+++ b/src/audio/audio.c
@@ -12,7 +12,7 @@ static bool_t isAudioInit = FALSE;
 /*
  * Returns state of audio
  */
-bool_t isAudioInicialized()
+bool_t audio_is_inicialized()
 {
 	return isAudioInit;
 }
@@ -20,7 +20,7 @@ bool_t isAudioInicialized()
 /*
  * Initialize audio
  */
-void initAudio()
+void audio_init()
 {
 	if (isParamFlag("--no-audio")) {
 		return;
@@ -49,7 +49,7 @@ void initAudio()
 /*
  * Quit audio
  */
-void quitAudio()
+void audio_quit()
 {
 	Mix_CloseAudio();
 	isAudioInit = TRUE;
diff --git a/src/audio/audio.h b/src/audio/audio.h
index 1f1f95b..65620e7 100644
--- a/src/audio/audio.h
+++ b/src/audio/audio.h
@@ -4,7 +4,7 @@
 
 #    include "main.h"
 
-extern bool_t isAudioInicialized();
-extern void initAudio();
-extern void quitAudio();
+extern bool_t audio_is_inicialized();
+extern void audio_init();
+extern void audio_quit();
 #endif
diff --git a/src/audio/music.c b/src/audio/music.c
index feabb90..1b526c6 100644
--- a/src/audio/music.c
+++ b/src/audio/music.c
@@ -13,13 +13,13 @@
 static list_t *listStorage;
 
 static bool_t isMusicInit = FALSE;
-static bool_t var_isMusicActive = TRUE;
+static bool_t var_music_is_active = TRUE;
 static Mix_Music *currentMusic;
 
 /*
  * Return state of music initialization
  */
-bool_t isMusicInicialized()
+bool_t music_is_inicialized()
 {
 	return isMusicInit;
 }
@@ -27,23 +27,23 @@ bool_t isMusicInicialized()
 /*
  * Initialize music
  */
-void initMusic()
+void music_init()
 {
-	if (isAudioInicialized() == FALSE) {
+	if (audio_is_inicialized() == FALSE) {
 		isMusicInit = FALSE;
 		return;
 	}
 
-	listStorage = newStorage();
+	listStorage = storage_new();
 	currentMusic = NULL;
 	isMusicInit = TRUE;
-	var_isMusicActive = TRUE;
+	var_music_is_active = TRUE;
 
 	if (isParamFlag("--no-music"))
-		setMusicActive(FALSE);
+		music_set_active(FALSE);
 
 	if (isParamFlag("--music"))
-		setMusicActive(TRUE);
+		music_set_active(TRUE);
 
 	DEBUG_MSG(_("Initializing music\n"));
 }
@@ -97,7 +97,7 @@ static void destroyMusic(void *p)
 /*
  * Add file to list with music
  */
-void addMusic(char *file, char *name, char *group)
+void music_add(char *file, char *name, char *group)
 {
 	Mix_Music *new;
 
@@ -109,15 +109,15 @@ void addMusic(char *file, char *name, char *group)
 	assert(group != NULL);
 
 	new = loadMixMusic(file);
-	addItemToStorage(listStorage, group, name, new);
+	storage_add(listStorage, group, name, new);
 }
 
 /*
  * Disable music and stop playback
  */
-void stopMusic()
+void music_stop()
 {
-	if (isMusicInit == FALSE || var_isMusicActive == FALSE) {
+	if (isMusicInit == FALSE || var_music_is_active == FALSE) {
 		return;
 	}
 
@@ -132,7 +132,7 @@ void stopMusic()
 /*
  * Play music playback
  */
-void playMusic(char *name, char *group)
+void music_play(char *name, char *group)
 {
 	static char currentMusic_group[STR_SIZE];
 	static char currentMusic_name[STR_SIZE];
@@ -144,7 +144,7 @@ void playMusic(char *name, char *group)
 		isStrInit = 1;
 	}
 
-	if (isMusicInit == FALSE || var_isMusicActive == FALSE)
+	if (isMusicInit == FALSE || var_music_is_active == FALSE)
 		return;
 
 	if (currentMusic != NULL &&
@@ -154,10 +154,10 @@ void playMusic(char *name, char *group)
 	}
 
 	if (currentMusic != NULL) {
-		stopMusic();
+		music_stop();
 	}
 
-	currentMusic = getItemFromStorage(listStorage, group, name);
+	currentMusic = storage_get(listStorage, group, name);
 	strcpy(currentMusic_group, group);
 	strcpy(currentMusic_name, name);
 
@@ -171,34 +171,34 @@ void playMusic(char *name, char *group)
 /*
  * Set music status to active/inactive
  */
-void setMusicActive(bool_t n)
+void music_set_active(bool_t n)
 {
 	static Mix_Music *music = NULL;
 
 	if (n == FALSE) {
 		music = currentMusic;
-		stopMusic();
+		music_stop();
 	}
 	if (n == TRUE) {
 		currentMusic = music;
 		playMixMusic();
 	}
 
-	var_isMusicActive = n;
+	var_music_is_active = n;
 }
 
 /*
  * Return status of music
  */
-bool_t isMusicActive()
+bool_t music_is_active()
 {
-	return var_isMusicActive;
+	return var_music_is_active;
 }
 
 /*
  * TOCOMMENT
  */
-char *getCurrentMusic()
+char *music_get_current()
 {
 	return "unknown";
 }
@@ -206,24 +206,24 @@ char *getCurrentMusic()
 /*
  * TOCOMMENT
  */
-void delAllMusicInGroup(char *group)
+void music_del_all_in_group(char *group)
 {
 	if (isMusicInit == FALSE)
 		return;
 
-	delAllItemFromStorage(listStorage, group, destroyMusic);
+	storage_del_all(listStorage, group, destroyMusic);
 }
 
 /*
  * Deactivate all what is ment for music
  */
-void quitMusic()
+void music_quit()
 {
 	if (isMusicInit == FALSE)
 		return;
 
-	stopMusic();
-	destroyStorage(listStorage, destroyMusic);
+	music_stop();
+	storage_destroy(listStorage, destroyMusic);
 	isMusicInit = FALSE;
 
 	DEBUG_MSG(_("Quitting music\n"));
diff --git a/src/audio/music.h b/src/audio/music.h
index 17e4409..cb5995d 100644
--- a/src/audio/music.h
+++ b/src/audio/music.h
@@ -17,15 +17,15 @@
    } music_t;
  */
 
-extern bool_t isMusicInicialized();
-extern void initMusic();
-extern void addMusic(char *file, char *name, char *group);
-extern void stopMusic();
-extern void playMusic(char *name, char *group);
-extern void setMusicActive(bool_t n);
-extern bool_t isMusicActive();
-extern char *getCurrentMusic();
-extern void delAllMusicInGroup(char *group);
-extern void quitMusic();
+extern bool_t music_is_inicialized();
+extern void music_init();
+extern void music_add(char *file, char *name, char *group);
+extern void music_stop();
+extern void music_play(char *name, char *group);
+extern void music_set_active(bool_t n);
+extern bool_t music_is_active();
+extern char *music_get_current();
+extern void music_del_all_in_group(char *group);
+extern void music_quit();
 #    endif
 #endif
diff --git a/src/audio/sound.c b/src/audio/sound.c
index dee6c2d..8d368a3 100644
--- a/src/audio/sound.c
+++ b/src/audio/sound.c
@@ -12,12 +12,12 @@
 
 static list_t *listStorage;
 static bool_t isSoundInit = FALSE;
-static bool_t var_isSoundActive = TRUE;
+static bool_t var_sound_is_active = TRUE;
 
 /*
  * Return status of sound
  */
-bool_t isSoundInicialized()
+bool_t sound_is_inicialized()
 {
 	return isSoundInit;
 }
@@ -25,22 +25,22 @@ bool_t isSoundInicialized()
 /*
  * Initialize sound
  */
-void initSound()
+void sound_init()
 {
-	if (isAudioInicialized() == FALSE) {
+	if (audio_is_inicialized() == FALSE) {
 		isSoundInit = FALSE;
 		return;
 	}
 
-	listStorage = newStorage();
+	listStorage = storage_new();
 	isSoundInit = TRUE;
-	var_isSoundActive = TRUE;
+	var_sound_is_active = TRUE;
 
 	if (isParamFlag("--no-sound"))
-		setSoundActive(FALSE);
+		sound_set_active(FALSE);
 
 	if (isParamFlag("--sound"))
-		setSoundActive(TRUE);
+		sound_set_active(TRUE);
 
 	DEBUG_MSG(_("Initializing sound\n"));
 
@@ -90,7 +90,7 @@ static void destroySound(void *p)
 /*
  * Add sound to list
  */
-void addSound(char *file, char *name, char *group)
+void sound_add(char *file, char *name, char *group)
 {
 	Mix_Chunk *new;
 
@@ -102,45 +102,45 @@ void addSound(char *file, char *name, char *group)
 	assert(group != NULL);
 
 	new = loadMixSound(file);
-	addItemToStorage(listStorage, group, name, new);
+	storage_add(listStorage, group, name, new);
 }
 
 /*
  * Start playback file from list
  */
-void playSound(char *name, char *group)
+void sound_play(char *name, char *group)
 {
-	if (isSoundInit == FALSE || var_isSoundActive == FALSE)
+	if (isSoundInit == FALSE || var_sound_is_active == FALSE)
 		return;
 
-	playMixSound(getItemFromStorage(listStorage, group, name));
+	playMixSound(storage_get(listStorage, group, name));
 }
 
 /*
  * Set if sound is active True/False
  */
-void setSoundActive(bool_t n)
+void sound_set_active(bool_t n)
 {
-	var_isSoundActive = n;
+	var_sound_is_active = n;
 }
 
 /*
  * Return state of sound
  */
-bool_t isSoundActive()
+bool_t sound_is_active()
 {
-	return var_isSoundActive;
+	return var_sound_is_active;
 }
 
 /*
  * Quit all sound stuff
  */
-void quitSound()
+void sound_quit()
 {
 	if (isSoundInit == FALSE)
 		return;
 
-	destroyStorage(listStorage, destroySound);
+	storage_destroy(listStorage, destroySound);
 	isSoundInit = FALSE;
 
 	DEBUG_MSG(_("Quitting sound\n"));
diff --git a/src/audio/sound.h b/src/audio/sound.h
index a5d69d4..4c61bcd 100644
--- a/src/audio/sound.h
+++ b/src/audio/sound.h
@@ -17,12 +17,12 @@
    } sound_t;
  */
 
-extern bool_t isSoundInicialized();
-extern void initSound();
-extern void addSound(char *file, char *name, char *group);
-extern void playSound(char *name, char *group);
-extern void setSoundActive(bool_t n);
-extern bool_t isSoundActive();
-extern void quitSound();
+extern bool_t sound_is_inicialized();
+extern void sound_init();
+extern void sound_add(char *file, char *name, char *group);
+extern void sound_play(char *name, char *group);
+extern void sound_set_active(bool_t n);
+extern bool_t sound_is_active();
+extern void sound_quit();
 #    endif
 #endif