diff -uNr ./cards.cpp /home/ashridah/build/sais_source20051111-mod/src/cards.cpp --- ./cards.cpp 2002-06-03 11:10:14.000000000 +1000 +++ /home/ashridah/build/sais_source20051111-mod/src/cards.cpp 2005-11-13 18:30:34.895220848 +1100 @@ -193,4 +193,5 @@ end = 1; } -} \ No newline at end of file +} + diff -uNr ./combat.cpp /home/ashridah/build/sais_source20051111-mod/src/combat.cpp --- ./combat.cpp 2005-10-27 20:25:56.000000000 +1000 +++ /home/ashridah/build/sais_source20051111-mod/src/combat.cpp 2005-11-13 18:36:53.709632304 +1100 @@ -37,7 +37,7 @@ int32 playership; int32 sortship[MAX_COMBAT_SHIPS]; -int32 t_move, t_disp, pause; +int32 t_move, t_disp, t_pause; int32 nebula; int32 retreat; @@ -98,7 +98,7 @@ ik_inkey(); - t_move = 0; t_disp = 0; pause = 0; end = 0; rett=0; + t_move = 0; t_disp = 0; t_pause = 0; end = 0; rett=0; if (simulated) Play_Sound(WAV_MUS_SIMULATOR, 15, 1, 85); @@ -143,14 +143,14 @@ klak = klakavail; if (IsMinimized) - pause=1; + t_pause=1; if (c==32) { - if (pause==1) - pause=0; + if (t_pause==1) + t_pause=0; else - pause=1; + t_pause=1; } if (key_pressed(key_f[0])) @@ -317,11 +317,11 @@ if (mc & 1) { if (ik_mouse_x < 186) - pause = 1; + t_pause = 1; else if (ik_mouse_x > 202) - pause = -1; + t_pause = -1; else - pause = 0; + t_pause = 0; } } else if ( mc & 1 ) @@ -476,12 +476,12 @@ ik_drawbox(screen, 0, 0, 640, 480, 0); - if (pause < 1) + if (t_pause < 1) { while (t0 t_disp || (pause==1)) + if (t_move > t_disp || (t_pause==1)) { t_disp = t_move; combat_display(t_disp); diff -uNr ./combat_display.cpp /home/ashridah/build/sais_source20051111-mod/src/combat_display.cpp --- ./combat_display.cpp 2002-06-29 18:03:22.000000000 +1000 +++ /home/ashridah/build/sais_source20051111-mod/src/combat_display.cpp 2005-11-13 19:13:57.386582024 +1100 @@ -929,9 +929,9 @@ ik_dsprite(screen, 186, 456, spr_IFbutton->spr[5], 2+(COMBAT_INTERFACE_COLOR<<8)); ik_dsprite(screen, 202, 456, spr_IFbutton->spr[6], 2+(COMBAT_INTERFACE_COLOR<<8)); - ik_dsprite(screen, 177, 456, spr_IFbutton->spr[7+(pause!=1)], 2+(COMBAT_INTERFACE_COLOR<<8)); - ik_dsprite(screen, 190, 456, spr_IFbutton->spr[9+(pause!=0)], 2+(COMBAT_INTERFACE_COLOR<<8)); - ik_dsprite(screen, 199, 456, spr_IFbutton->spr[17+(pause!=-1)], 2+(COMBAT_INTERFACE_COLOR<<8)); + ik_dsprite(screen, 177, 456, spr_IFbutton->spr[7+(t_pause!=1)], 2+(COMBAT_INTERFACE_COLOR<<8)); + ik_dsprite(screen, 190, 456, spr_IFbutton->spr[9+(t_pause!=0)], 2+(COMBAT_INTERFACE_COLOR<<8)); + ik_dsprite(screen, 199, 456, spr_IFbutton->spr[17+(t_pause!=-1)], 2+(COMBAT_INTERFACE_COLOR<<8)); // race portraits for (x = 1; x < player.num_ships; x++) diff -uNr ./combat.h /home/ashridah/build/sais_source20051111-mod/src/combat.h --- ./combat.h 2003-02-23 20:06:22.000000000 +1100 +++ /home/ashridah/build/sais_source20051111-mod/src/combat.h 2005-11-13 18:36:00.071786496 +1100 @@ -398,7 +398,7 @@ extern int32 playership; extern int32 sortship[MAX_COMBAT_SHIPS]; -extern int32 t_move, t_disp, pause; +extern int32 t_move, t_disp, t_pause; extern int32 nebula; extern int32 retreat; diff -uNr ./combat_sim.cpp /home/ashridah/build/sais_source20051111-mod/src/combat_sim.cpp --- ./combat_sim.cpp 2002-06-29 18:09:00.000000000 +1000 +++ /home/ashridah/build/sais_source20051111-mod/src/combat_sim.cpp 2005-11-13 18:32:01.341079080 +1100 @@ -367,4 +367,5 @@ del_image(bg); return end-1; -} \ No newline at end of file +} + diff -uNr ./endgame.cpp /home/ashridah/build/sais_source20051111-mod/src/endgame.cpp --- ./endgame.cpp 2002-06-30 20:02:42.000000000 +1000 +++ /home/ashridah/build/sais_source20051111-mod/src/endgame.cpp 2005-11-13 18:32:44.796472856 +1100 @@ -537,4 +537,5 @@ fputc(0, fil); fputc(0, fil); fputc(0, fil); fwrite(scores, sizeof(t_score), num_scores, fil); fclose(fil); -} \ No newline at end of file +} + diff -uNr ./endgame.h /home/ashridah/build/sais_source20051111-mod/src/endgame.h --- ./endgame.h 2001-11-22 21:45:10.000000000 +1100 +++ /home/ashridah/build/sais_source20051111-mod/src/endgame.h 2005-11-13 18:31:53.111330192 +1100 @@ -39,4 +39,5 @@ void game_over(); void endgame_init(); -void endgame_deinit(); \ No newline at end of file +void endgame_deinit(); + diff -uNr ./gfx.cpp /home/ashridah/build/sais_source20051111-mod/src/gfx.cpp --- ./gfx.cpp 2003-02-18 20:48:04.000000000 +1100 +++ /home/ashridah/build/sais_source20051111-mod/src/gfx.cpp 2005-11-13 18:33:27.338005560 +1100 @@ -772,4 +772,5 @@ ik_drawline(screen, ik_mouse_x+191, ik_mouse_y-96, ik_mouse_x+191, ik_mouse_y+95, 178, 0, 255, 0); */ free_sprite(mag); -} \ No newline at end of file +} + diff -uNr ./interface.cpp /home/ashridah/build/sais_source20051111-mod/src/interface.cpp --- ./interface.cpp 2002-10-02 22:29:24.000000000 +1000 +++ /home/ashridah/build/sais_source20051111-mod/src/interface.cpp 2005-11-13 18:33:44.566386448 +1100 @@ -705,4 +705,5 @@ } */ tut_seen[n] = 1; -} \ No newline at end of file +} + diff -uNr ./is_fileio.cpp /home/ashridah/build/sais_source20051111-mod/src/is_fileio.cpp --- ./is_fileio.cpp 2003-02-18 21:08:04.000000000 +1100 +++ /home/ashridah/build/sais_source20051111-mod/src/is_fileio.cpp 2005-11-13 18:34:01.986738152 +1100 @@ -182,4 +182,5 @@ } fprintf(logfile, dl); -} \ No newline at end of file +} + diff -uNr ./is_fileio.h /home/ashridah/build/sais_source20051111-mod/src/is_fileio.h --- ./is_fileio.h 2002-06-03 11:04:30.000000000 +1000 +++ /home/ashridah/build/sais_source20051111-mod/src/is_fileio.h 2005-11-13 18:30:42.789020808 +1100 @@ -6,4 +6,5 @@ extern FILE *logfile; extern int last_logdate; -extern char moddir[256]; \ No newline at end of file +extern char moddir[256]; + diff -uNr ./main.cpp /home/ashridah/build/sais_source20051111-mod/src/main.cpp --- ./main.cpp 2005-11-05 15:48:30.000000000 +1100 +++ /home/ashridah/build/sais_source20051111-mod/src/main.cpp 2005-11-13 18:35:13.429877144 +1100 @@ -2,8 +2,8 @@ // INCLUDES // ---------------- -#include // include important C/C++ stuff -#include +#include // include important C/C++ stuff +//#include #include #include #include @@ -11,7 +11,7 @@ #include #include #include -#include +//#include #include #include #include @@ -961,4 +961,4 @@ return end-1; else return 0; -} \ No newline at end of file +} diff -uNr ./Makefile /home/ashridah/build/sais_source20051111-mod/src/Makefile --- ./Makefile 1970-01-01 10:00:00.000000000 +1000 +++ /home/ashridah/build/sais_source20051111-mod/src/Makefile 2005-11-13 19:14:57.539437400 +1100 @@ -0,0 +1,29 @@ +CC=gcc +CXX=g++ +LD=ld +CFLAGS=`sdl-config --cflags` -ggdb +LDFLAGS=`sdl-config --libs` -lSDL_mixer +OBJS=cards.o endgame.o modconfig.o starmap_encounters.o \ +w32_gfx.o combat_display.o font.o sdl_iface.o starmap_init.o \ +w32_sound.o combat_init.o gfx.o sdl_main.o starmap_inventory.o \ +combat.o interface.o sound.o starmap.o combat_sim.o \ +is_fileio.o sprite_init.o startgame.o combat_weapons.o main.o \ +sprites.o textstr.o +DEPS=cards.h gfx.h is_fileio.h starmap.h typedefs.h \ +combat.h iface_globals.h resource.h startgame.h \ +endgame.h interface.h snd.h textstr.h + + +all: strange + +strange: $(OBJS) + g++ -o strange $(LDFLAGS) $(OBJS) + +%.o: %.cpp $(DEPS) + $(CXX) -c -o $@ $< $(CFLAGS) + +install: strange + cp strange ../demo/ + +clean: + rm -f $(OBJS) strange core diff -uNr ./modconfig.cpp /home/ashridah/build/sais_source20051111-mod/src/modconfig.cpp --- ./modconfig.cpp 2005-10-30 18:22:48.000000000 +1100 +++ /home/ashridah/build/sais_source20051111-mod/src/modconfig.cpp 2005-11-13 18:44:19.801815984 +1100 @@ -1,7 +1,7 @@ #ifndef DEMO_VERSION #include -#include +//#include #include #include #include @@ -32,16 +32,17 @@ int x; int y; int handle; +#ifdef WIN32ISM _finddata_t find; +#endif char tmps[256]; FILE *fil; moddir[0] = 0; - // allocate memory for mod names moddirs = (t_moddir*)calloc(MAX_MODDIRS, sizeof(t_moddir)); n_moddirs = 0; - +#ifdef WIN32ISM // read mod names handle = _findfirst("mods/*.*", &find); if (handle != -1) @@ -81,7 +82,7 @@ } } } - +#endif fil = myopen("graphics/palette.dat", "rb"); fread(globalpal, 1, 768, fil); fclose(fil); diff -uNr ./sdl_iface.cpp /home/ashridah/build/sais_source20051111-mod/src/sdl_iface.cpp --- ./sdl_iface.cpp 2005-10-30 18:15:06.000000000 +1100 +++ /home/ashridah/build/sais_source20051111-mod/src/sdl_iface.cpp 2005-11-13 18:47:21.467198648 +1100 @@ -8,11 +8,11 @@ // INCLUDES /////////////////////////////////////////////// #define WIN32_LEAN_AND_MEAN -#include // include important windows stuff -#include -#include -#include // include important C/C++ stuff -#include +//#include // include important windows stuff +//#include +//#include +#include // include important C/C++ stuff +//#include #include #include #include @@ -20,7 +20,7 @@ #include #include #include -#include +//#include #include #include diff -uNr ./sound.cpp /home/ashridah/build/sais_source20051111-mod/src/sound.cpp --- ./sound.cpp 2002-01-20 16:41:00.000000000 +1100 +++ /home/ashridah/build/sais_source20051111-mod/src/sound.cpp 2005-11-13 18:48:48.568957168 +1100 @@ -251,4 +251,5 @@ Load_WAV("sounds/music/hiscore.wav", WAV_MUS_HISCORE); Load_WAV("sounds/music/simulator.wav", WAV_MUS_SIMULATOR); } -#endif \ No newline at end of file +#endif + diff -uNr ./sprites.cpp /home/ashridah/build/sais_source20051111-mod/src/sprites.cpp --- ./sprites.cpp 2002-10-19 18:10:46.000000000 +1000 +++ /home/ashridah/build/sais_source20051111-mod/src/sprites.cpp 2005-11-13 18:51:22.165606928 +1100 @@ -10,7 +10,7 @@ #include #include #include -#include +//#include #include "typedefs.h" #include "iface_globals.h" @@ -146,7 +146,9 @@ t_ik_spritepak *load_sprites(char *fname) { // NOTE: load_sprites loads default .SPR, and FRAMES from the mod - struct _finddata_t find; +#ifdef WIN32ISM + struct _finddata_t find; +#endif long fhandle; int fi; int fnum; @@ -169,6 +171,7 @@ for (x = 0; x < 256; x++) rep[x] = 0; max = 0; +#ifdef WIN32ISM if (strlen(moddir)) { sprintf(spritedir, "%s%s", moddir, fname); @@ -193,7 +196,7 @@ _findclose(fhandle); } } - +#endif fil=fopen(fname,"rb"); // don't use myopen here if (!fil) return NULL; diff -uNr ./starmap.cpp /home/ashridah/build/sais_source20051111-mod/src/starmap.cpp --- ./starmap.cpp 2004-04-01 10:14:28.000000000 +1000 +++ /home/ashridah/build/sais_source20051111-mod/src/starmap.cpp 2005-11-13 18:52:30.439227760 +1100 @@ -2467,4 +2467,5 @@ if (must_quit) must_quit = 0; -} \ No newline at end of file +} + diff -uNr ./starmap_encounters.cpp /home/ashridah/build/sais_source20051111-mod/src/starmap_encounters.cpp --- ./starmap_encounters.cpp 2003-03-19 22:38:00.000000000 +1100 +++ /home/ashridah/build/sais_source20051111-mod/src/starmap_encounters.cpp 2005-11-13 19:00:42.772381744 +1100 @@ -1517,4 +1517,5 @@ player.death = 6; } } -#endif \ No newline at end of file +#endif + diff -uNr ./starmap_init.cpp /home/ashridah/build/sais_source20051111-mod/src/starmap_init.cpp --- ./starmap_init.cpp 2003-03-19 22:39:04.000000000 +1100 +++ /home/ashridah/build/sais_source20051111-mod/src/starmap_init.cpp 2005-11-13 18:52:53.943654544 +1100 @@ -1903,4 +1903,5 @@ { num_racefleets = 0; // free(racefleets); -} \ No newline at end of file +} + diff -uNr ./starmap_inventory.cpp /home/ashridah/build/sais_source20051111-mod/src/starmap_inventory.cpp --- ./starmap_inventory.cpp 2003-03-19 22:39:38.000000000 +1100 +++ /home/ashridah/build/sais_source20051111-mod/src/starmap_inventory.cpp 2005-11-13 18:54:00.583523744 +1100 @@ -1903,4 +1903,5 @@ } return 0; -} \ No newline at end of file +} + diff -uNr ./startgame.cpp /home/ashridah/build/sais_source20051111-mod/src/startgame.cpp --- ./startgame.cpp 2002-09-25 21:21:08.000000000 +1000 +++ /home/ashridah/build/sais_source20051111-mod/src/startgame.cpp 2005-11-13 18:54:26.520580712 +1100 @@ -431,4 +431,5 @@ return; fwrite(&settings, sizeof(t_gamesettings), 1, cfg); fclose(cfg); -} \ No newline at end of file +} + diff -uNr ./textstr.cpp /home/ashridah/build/sais_source20051111-mod/src/textstr.cpp --- ./textstr.cpp 2002-06-03 11:10:14.000000000 +1000 +++ /home/ashridah/build/sais_source20051111-mod/src/textstr.cpp 2005-11-13 18:54:52.443639808 +1100 @@ -50,4 +50,5 @@ void textstrings_deinit() { free(textbuffer); -} \ No newline at end of file +} + diff -uNr ./typedefs.h /home/ashridah/build/sais_source20051111-mod/src/typedefs.h --- ./typedefs.h 1970-01-01 10:00:00.000000000 +1000 +++ /home/ashridah/build/sais_source20051111-mod/src/typedefs.h 2005-11-05 15:20:54.000000000 +1100 @@ -0,0 +1,18 @@ +/* + +The basic datatypes + +*/ + +#define DEMO_VERSION + + +typedef signed char int8; +typedef unsigned char uint8; +typedef signed short int16; +typedef unsigned short uint16; +typedef signed int int32; +typedef unsigned int uint32; +typedef float float32; +typedef double float64; + diff -uNr ./Typedefs.h /home/ashridah/build/sais_source20051111-mod/src/Typedefs.h --- ./Typedefs.h 2005-11-05 15:20:54.000000000 +1100 +++ /home/ashridah/build/sais_source20051111-mod/src/Typedefs.h 1970-01-01 10:00:00.000000000 +1000 @@ -1,18 +0,0 @@ -/* - -The basic datatypes - -*/ - -#define DEMO_VERSION - - -typedef signed char int8; -typedef unsigned char uint8; -typedef signed short int16; -typedef unsigned short uint16; -typedef signed int int32; -typedef unsigned int uint32; -typedef float float32; -typedef double float64; - diff -uNr ./w32_gfx.cpp /home/ashridah/build/sais_source20051111-mod/src/w32_gfx.cpp --- ./w32_gfx.cpp 2005-11-05 15:41:06.000000000 +1100 +++ /home/ashridah/build/sais_source20051111-mod/src/w32_gfx.cpp 2005-11-13 18:57:01.416033024 +1100 @@ -7,11 +7,11 @@ #define WIN32_LEAN_AND_MEAN -#include // include important windows stuff -#include -#include -#include // include important C/C++ stuff -#include +//#include // include important windows stuff +//#include +//#include +#include // include important C/C++ stuff +//#include #include #include #include @@ -19,7 +19,7 @@ #include #include #include -#include +//#include #include #include @@ -36,7 +36,7 @@ // GLOBALS extern SDL_Surface *sdlsurf; -UCHAR *drawbuffer; // video buffer +//UCHAR *drawbuffer; // video buffer int drawpitch; // line pitch #ifdef MOVIE @@ -153,4 +153,4 @@ // implement windowed/fullscreen switch here? */ return 0; -} \ No newline at end of file +} diff -uNr ./w32_sound.cpp /home/ashridah/build/sais_source20051111-mod/src/w32_sound.cpp --- ./w32_sound.cpp 2005-10-30 18:14:42.000000000 +1100 +++ /home/ashridah/build/sais_source20051111-mod/src/w32_sound.cpp 2005-11-13 18:58:06.053206680 +1100 @@ -2,12 +2,12 @@ #define INITGUID -#include // include important windows stuff -#include -#include -#include -#include // include important C/C++ stuff -#include +//#include // include important windows stuff +//#include +//#include +//#include +#include // include important C/C++ stuff +//#include #include #include #include @@ -15,12 +15,12 @@ #include #include #include -#include +//#include #include #include #include -#include +//#include #include "typedefs.h" #include "iface_globals.h" @@ -264,4 +264,5 @@ int Get_Sound_Rate(int id) { return 22050; -} \ No newline at end of file +} +