- data ako obrazky, zvuky hudba sa uklada do mojho storage API ( storage.c/.h )

  a image.c sound.c music.c je iba skupina funkcii ktora vola storage API,
  teraz tam ma podstatne mensiu dupicitu kodu v hore vymenovanych zdrojakoch



git-svn-id: http://opensvn.csie.org/tuxanci_ng@58 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

4 files changed, 31 insertions, 9 deletions

diff --git a/include/image.h b/include/image.h
index cacb469..be3826d 100755
--- a/include/image.h
+++ b/include/image.h
@@ -14,12 +14,14 @@
 #define IMAGE_GROUP_USER	"user"
 #define IMAGE_GROUP_OTHER	"other"
 
+/*
 typedef struct image_struct
 {
 	char *name;
 	char *group;
 	SDL_Surface *image;
 } image_data_t;
+*/
 
 extern bool_t isImageInicialized();
 extern void initImageData();
diff --git a/include/music.h b/include/music.h
index a03732c..0ae83c4 100644
--- a/include/music.h
+++ b/include/music.h
@@ -8,25 +8,27 @@
 #include <SDL_mixer.h>
 #include "main.h"
 
-#define MUSIC_GROUP_BASE 0
-#define MUSIC_GROUP_USER 1
+#define MUSIC_GROUP_BASE "base"
+#define MUSIC_GROUP_USER "user"
 
+/*
 typedef struct music_struct
 {
 	char *name;
 	int group;
 	Mix_Music *music;
 } music_t;
+*/
 
 extern bool_t isMusicInicialized();
 extern void initMusic();
-extern void addMusic(char *file, char *name, int group);
+extern void addMusic(char *file, char *name, char *group);
 extern void stopMusic();
-extern void playMusic(char *name, int group);
+extern void playMusic(char *name, char *group);
 extern void setMusicActive(bool_t n);
 extern bool_t isMusicActive();
 extern char* getCurrentMusic();
-extern void delAllMusicInGroup(int group);
+extern void delAllMusicInGroup(char *group);
 extern void quitMusic();
 
 #endif
diff --git a/include/sound.h b/include/sound.h
index 2962437..337ef3b 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -8,20 +8,22 @@
 #include <SDL_mixer.h>
 #include "main.h"
 
-#define SOUND_GROUP_BASE 0
-#define SOUND_GROUP_USER 1
+#define SOUND_GROUP_BASE "base"
+#define SOUND_GROUP_USER "user"
 
+/*
 typedef struct sound_struct
 {
 	char *name;
 	int group;
 	Mix_Chunk *sound;
 } sound_t;
+*/
 
 extern bool_t isSoundInicialized();
 extern void initSound();
-extern void addSound(char *file, char *name, int group);
-extern void playSound(char *name, int group);
+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();
diff --git a/include/storage.h b/include/storage.h
new file mode 100644
index 0000000..a6f357d
--- /dev/null
+++ b/include/storage.h
@@ -0,0 +1,16 @@
+
+#ifndef STORAGE_H
+
+#define STORAGE_H
+
+#include "main.h"
+#include "list.h"
+
+extern list_t* newStorage();
+extern void addItemToStorage(list_t *list, char *group, char *name, void *data);
+extern void* getItemFromStorage(list_t *list, char *group, char *name);
+extern void delItemFromStorage(list_t *list, char *group, char *name, void(*f)(void *));
+extern void delAllItemFromStorage(list_t *list, char *group, void(*f)(void *));
+extern void destroyStorage(list_t *p, void(*f)(void *) );
+
+#endif