cleanups
This commit is contained in:
parent
e73b0ec0a8
commit
7d39b69e83
|
@ -14,7 +14,7 @@ SYSTEMINCLUDE /epoc32/include/libc /epoc32/include/esdl /epoc32/include/mmf/plu
|
||||||
|
|
||||||
sourcepath ./src/sdl-instead
|
sourcepath ./src/sdl-instead
|
||||||
SOURCE symbian.cpp
|
SOURCE symbian.cpp
|
||||||
SOURCE graphics.c input.c game.c main.c instead.c sound.c SDL_rotozoom.c SDL_anigif.c SDL_gfxBlitFunc.c config.c themes.c menu.c util.c cache.c unzip.c ioapi.c unpack.c s60.c lfs.c
|
SOURCE graphics.c input.c game.c main.c instead.c sound.c SDL_rotozoom.c SDL_anigif.c SDL_gfxBlitFunc.c config.c themes.c menu.c util.c cache.c unzip.c ioapi.c unpack.c s60.c lfs.c idf.c
|
||||||
SOURCE snprintf.c
|
SOURCE snprintf.c
|
||||||
|
|
||||||
USERINCLUDE ./src/sdl-instead
|
USERINCLUDE ./src/sdl-instead
|
||||||
|
|
|
@ -21,8 +21,8 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "SDL_anigif.h"
|
#include "SDL_anigif.h"
|
||||||
#include "util.h"
|
#include "sdl_idf.h"
|
||||||
#include "idf.h"
|
|
||||||
extern idf_t game_idf;
|
extern idf_t game_idf;
|
||||||
|
|
||||||
/* Code from here to end of file has been adapted from XPaint: */
|
/* Code from here to end of file has been adapted from XPaint: */
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
#include "SDL_rotozoom.h"
|
#include "SDL_rotozoom.h"
|
||||||
#include "SDL_gfxBlitFunc.h"
|
#include "SDL_gfxBlitFunc.h"
|
||||||
#include "SDL_anigif.h"
|
#include "SDL_anigif.h"
|
||||||
|
#include "sdl_idf.h"
|
||||||
|
|
||||||
#define Surf(p) ((SDL_Surface *)p)
|
#define Surf(p) ((SDL_Surface *)p)
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#include "internals.h"
|
#include "internals.h"
|
||||||
#include "idf.h"
|
#include "idf.h"
|
||||||
#include "list.h"
|
#include "list.h"
|
||||||
#include <SDL/SDL_rwops.h>
|
#include <SDL_rwops.h>
|
||||||
|
|
||||||
typedef struct _idfd_t {
|
typedef struct _idfd_t {
|
||||||
unsigned long offset;
|
unsigned long offset;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#ifndef __IDF_H_INCLUDED
|
#ifndef __IDF_H_INCLUDED
|
||||||
#define __IDF_H_INCLUDED
|
#define __IDF_H_INCLUDED
|
||||||
#include <SDL_rwops.h>
|
|
||||||
|
|
||||||
struct _idf_t;
|
struct _idf_t;
|
||||||
struct _idff_t;
|
struct _idff_t;
|
||||||
|
@ -11,7 +10,6 @@ extern idf_t idf_init(const char *path);
|
||||||
extern void idf_shrink(idf_t idf);
|
extern void idf_shrink(idf_t idf);
|
||||||
extern void idf_done(idf_t idf);
|
extern void idf_done(idf_t idf);
|
||||||
|
|
||||||
extern SDL_RWops *RWFromIdf(idf_t idf, const char *fname);
|
|
||||||
extern int idf_create(const char *file, const char *path);
|
extern int idf_create(const char *file, const char *path);
|
||||||
extern idff_t idf_open(idf_t idf, const char *fname);
|
extern idff_t idf_open(idf_t idf, const char *fname);
|
||||||
|
|
||||||
|
@ -26,4 +24,4 @@ extern char *idf_gets(idff_t idf, char *b, int size);
|
||||||
extern int idf_magic(const char *fname);
|
extern int idf_magic(const char *fname);
|
||||||
extern int idf_only(idf_t idf, int fl);
|
extern int idf_only(idf_t idf, int fl);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -8,4 +8,8 @@
|
||||||
#define GAMES_PATH DATAPATH"games/"
|
#define GAMES_PATH DATAPATH"games/"
|
||||||
#define ICON_PATH DATAPATH"icon/"
|
#define ICON_PATH DATAPATH"icon/"
|
||||||
#define LANG_PATH DATAPATH"lang/"
|
#define LANG_PATH DATAPATH"lang/"
|
||||||
|
|
||||||
|
extern char *dirname(char *);
|
||||||
|
extern char *basename(char *);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
7
src/sdl-instead/sdl_idf.h
Normal file
7
src/sdl-instead/sdl_idf.h
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
#ifndef __SDL_IDF_H_INCLUDED
|
||||||
|
#define __SDL_IDF_H_INCLUDED
|
||||||
|
#include <SDL_rwops.h>
|
||||||
|
#include "idf.h"
|
||||||
|
|
||||||
|
extern SDL_RWops *RWFromIdf(idf_t idf, const char *fname);
|
||||||
|
#endif
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include <SDL.h>
|
#include <SDL.h>
|
||||||
#include <SDL_mixer.h>
|
#include <SDL_mixer.h>
|
||||||
#include "idf.h"
|
#include "sdl_idf.h"
|
||||||
|
|
||||||
#ifdef S60
|
#ifdef S60
|
||||||
int audio_rate = 11025;
|
int audio_rate = 11025;
|
||||||
|
|
|
@ -521,4 +521,4 @@ int remove_dir(const char *path)
|
||||||
closedir(d);
|
closedir(d);
|
||||||
rmdir(path);
|
rmdir(path);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
#ifndef __UTIL_H_INCLUDED
|
#ifndef __UTIL_H_INCLUDED
|
||||||
#define __UTIL_H_INCLUDED
|
#define __UTIL_H_INCLUDED
|
||||||
|
|
||||||
#include "idf.h"
|
#include "idf.h"
|
||||||
|
|
||||||
typedef int (*parser_fn)(const char *v, void *data);
|
typedef int (*parser_fn)(const char *v, void *data);
|
||||||
|
|
Loading…
Reference in a new issue