diff -u -r -N fanwor-orig/src/Makefile fanwor/src/Makefile --- fanwor-orig/src/Makefile Mon Jun 26 13:24:56 2000 +++ fanwor/src/Makefile Wed Sep 20 22:34:45 2000 @@ -17,7 +17,7 @@ ARCHDIR=./arch/$(ARCH) -CFLAGS=-I. -I./arch/$(ARCH) $(CFL_$(ARCH)) +CFLAGS=-I. -I./arch/$(ARCH) -I./arch/include $(CFL_$(ARCH)) LIBS = $(LIBS_$(ARCH)) diff -u -r -N fanwor-orig/src/arch/atari/fwatari.h fanwor/src/arch/atari/fwatari.h --- fanwor-orig/src/arch/atari/fwatari.h Wed Dec 31 19:00:00 1969 +++ fanwor/src/arch/atari/fwatari.h Wed Sep 20 22:09:13 2000 @@ -0,0 +1,38 @@ +/* *** fwatari.h - Variables and prototypes specific to atari arch *** */ +/* *** Written and (c) by Thomas Huth, 1999 *** */ + +#ifndef _FWATARI_H +#define _FWATARI_H + +#include +#include + +/* fwgraf.c */ +void drwindow(GRECT *xywh); +void setpal(unsigned short palette[][3]); + +extern int bipp; +extern MFDB scrnmfdb; +extern MFDB offscr; +extern MFDB groundfdb; +extern MFDB spritefdb; +extern MFDB spritemask; +extern unsigned short new_pal[256][3]; + +/* fwgui.c */ +//#define WINDOWGADGETS (CLOSER|/*FULLER|*/MOVER|NAME|INFO) +extern int WINDOWGADGETS; + +extern int ap_id; +extern int vhndl; +extern int deskx, desky, deskw, deskh; +extern int wihndl; +extern GRECT wi; +extern OBJECT *menudlg; +extern int mausx, mausy, mausk, klicks; +extern int kstate, key; +extern short mb_pressed; +extern int msgbuf[8]; +extern short deskclip[4]; + +#endif diff -u -r -N fanwor-orig/src/arch/atari/fwgraf.c fanwor/src/arch/atari/fwgraf.c --- fanwor-orig/src/arch/atari/fwgraf.c Sun Feb 27 09:30:50 2000 +++ fanwor/src/arch/atari/fwgraf.c Wed Sep 20 22:42:06 2000 @@ -19,6 +19,7 @@ #include "fanwor.h" #include "fwguiini.h" #include "fwgui.h" +#incldue "fwatari.h" /* **Variables:** */ diff -u -r -N fanwor-orig/src/arch/atari/fwgui.c fanwor/src/arch/atari/fwgui.c --- fanwor-orig/src/arch/atari/fwgui.c Sat Feb 26 13:25:22 2000 +++ fanwor/src/arch/atari/fwgui.c Wed Sep 20 22:41:48 2000 @@ -21,6 +21,7 @@ #include "fwgraf.h" #include "fanwor.h" #include "fwmusic.h" +#include "fwatari.h" diff -u -r -N fanwor-orig/src/arch/atari/fwguiini.c fanwor/src/arch/atari/fwguiini.c --- fanwor-orig/src/arch/atari/fwguiini.c Sun Feb 27 09:30:24 2000 +++ fanwor/src/arch/atari/fwguiini.c Wed Sep 20 22:40:57 2000 @@ -16,6 +16,7 @@ #include "fwgraf.h" #include "fwmain.h" #include "fanwor.h" +#include "fwatari.h" #ifndef FALSE #define FALSE 0 diff -u -r -N fanwor-orig/src/arch/atari/fwmusic.c fanwor/src/arch/atari/fwmusic.c --- fanwor-orig/src/arch/atari/fwmusic.c Sat Feb 26 08:01:56 2000 +++ fanwor/src/arch/atari/fwmusic.c Wed Sep 20 22:39:56 2000 @@ -12,6 +12,7 @@ #include #include "fwgui.h" +#include "fwatari.h" /* ########### MOD Definitionen und Strukturen ############ */ diff -u -r -N fanwor-orig/src/arch/include/fwgraf.h fanwor/src/arch/include/fwgraf.h --- fanwor-orig/src/arch/include/fwgraf.h Wed Dec 31 19:00:00 1969 +++ fanwor/src/arch/include/fwgraf.h Wed Sep 20 22:04:02 2000 @@ -0,0 +1,15 @@ +/* *** fwgraf.h - Variables and prototypes of fwgraf.c *** */ +/* *** Written and (c) by Thomas Huth, 1999 *** */ + +#ifndef _FWGRAF_H +#define _FWGRAF_H + +void drawsprites(); +void clearsprite(short nr); +void drawblock(short xpos, short ypos, short num); +void offscr2win(short xpos, short ypos, short width, short height); +void write_hp_gold(); +int showpicture(char *name); + +#endif + diff -u -r -N fanwor-orig/src/arch/include/fwgui.h fanwor/src/arch/include/fwgui.h --- fanwor-orig/src/arch/include/fwgui.h Wed Dec 31 19:00:00 1969 +++ fanwor/src/arch/include/fwgui.h Wed Sep 20 22:04:50 2000 @@ -0,0 +1,13 @@ + +#ifndef _FWGUI_H +#define _FWGUI_H + +void event_handler(); +int choicedlg(char *txt, char *buts, int defb); +void alertdlg(char *alstr); +void errfatldlg(char *errstr); +void waitms(short ms); +void mesages(void); + + +#endif diff -u -r -N fanwor-orig/src/arch/include/fwguiini.h fanwor/src/arch/include/fwguiini.h --- fanwor-orig/src/arch/include/fwguiini.h Wed Dec 31 19:00:00 1969 +++ fanwor/src/arch/include/fwguiini.h Wed Sep 20 21:56:09 2000 @@ -0,0 +1,12 @@ + +#ifndef _FWGUIINI_H +#define _FWGUIINI_H + +int initGUI(void); +void exitGUI(void); +int open_window(void); +void close_window(void); +long initgraf(void); +void deinitgraf(void); + +#endif diff -u -r -N fanwor-orig/src/arch/include/fwmusic.h fanwor/src/arch/include/fwmusic.h --- fanwor-orig/src/arch/include/fwmusic.h Wed Dec 31 19:00:00 1969 +++ fanwor/src/arch/include/fwmusic.h Wed Sep 20 21:56:09 2000 @@ -0,0 +1,34 @@ +/* **** Prototypen & defines für fwmusic.c **** */ + +#ifndef _FWMUSIC_H +#define _FWMUSIC_H + +#define S_SWORD 0 +#define S_TAKEITEM 1 +#define S_SUCCESS 2 + +#if 0 +typedef struct +{ + char *name; + void *start; + void *end; + void *dosnd; +} THSAMPLE; + +extern THSAMPLE samples[]; +#endif + +extern short sndpsgflag; +extern short sndsamflag; +extern short sndmodflag; +extern int ptyp; +extern short playflag; + +int mod_init(void); +int mod_play(const char *mname); +int mod_stop(void); +long sound_init(void); +void sound_play(short snr); + +#endif /* _FWMUSIC_H */ diff -u -r -N fanwor-orig/src/arch/sdl/fwgraf.c fanwor/src/arch/sdl/fwgraf.c --- fanwor-orig/src/arch/sdl/fwgraf.c Tue Jun 27 12:08:14 2000 +++ fanwor/src/arch/sdl/fwgraf.c Wed Sep 20 22:37:56 2000 @@ -13,6 +13,7 @@ #include "fwmain.h" #include "fwguiini.h" #include "fwgui.h" +#include "fwsdl.h" #define min(a,b) ((a)<(b)?(a):(b)) diff -u -r -N fanwor-orig/src/arch/sdl/fwgui.c fanwor/src/arch/sdl/fwgui.c --- fanwor-orig/src/arch/sdl/fwgui.c Mon Jun 26 13:55:12 2000 +++ fanwor/src/arch/sdl/fwgui.c Wed Sep 20 22:32:47 2000 @@ -13,6 +13,7 @@ #include "fwgui.h" #include "fwgraf.h" #include "fwmusic.h" +#include "fwsdl.h" diff -u -r -N fanwor-orig/src/arch/sdl/fwguiini.c fanwor/src/arch/sdl/fwguiini.c --- fanwor-orig/src/arch/sdl/fwguiini.c Tue Jun 27 12:09:08 2000 +++ fanwor/src/arch/sdl/fwguiini.c Wed Sep 20 22:33:29 2000 @@ -10,6 +10,7 @@ #include "fwgui.h" #include "fwgraf.h" #include "fwmain.h" +#include "fwsdl.h" #ifndef FALSE #define FALSE 0 diff -u -r -N fanwor-orig/src/arch/sdl/fwsdl.h fanwor/src/arch/sdl/fwsdl.h --- fanwor-orig/src/arch/sdl/fwsdl.h Wed Dec 31 19:00:00 1969 +++ fanwor/src/arch/sdl/fwsdl.h Wed Sep 20 22:33:48 2000 @@ -0,0 +1,16 @@ +/* *** fwsdl.h - Variables and prototypes specific to sdl arch *** */ +/* *** Written and (c) by Thomas Huth, 1999 *** */ + +#ifndef _FWSDL_H +#define _FWSDL_H + +#include + +extern SDL_Surface *sdlscrn; +extern SDL_Surface *offscrn; +extern SDL_Surface *groundgfx; +extern SDL_Surface *spritegfx; +extern SDL_Surface *fontgfx; + +#endif +