From 83f6f01dcc274d27479801e2e536cd374fae872b Mon Sep 17 00:00:00 2001 From: theoddone33 Date: Sat, 4 May 2002 04:36:56 +0000 Subject: [PATCH] More changes, took out a lot of the sound/* stuff which will bite later but I don't care. --- Makefile | 12 ------------ include/emp.h | 9 +++++++-- include/flak.h | 9 +++++++-- include/neb.h | 9 +++++++-- include/tgautils.h | 10 ++++++++-- src/nebula/neb.cpp | 10 ++++++++-- src/starfield/nebula.cpp | 10 +++++++--- src/stats/medals.cpp | 12 ++++++++++-- src/stats/stats.cpp | 10 ++++++++-- src/ui/gadget.cpp | 12 ++++++++++-- 10 files changed, 72 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index c6dfe25..bf2f3ea 100644 --- a/Makefile +++ b/Makefile @@ -160,18 +160,6 @@ SOURCES =./src/anim/animplay.cpp \ ./src/ship/shipcontrails.cpp \ ./src/ship/shipfx.cpp \ ./src/ship/shiphit.cpp \ - ./src/sound/acm.cpp \ - ./src/sound/audiostr.cpp \ - ./src/sound/ds.cpp \ - ./src/sound/ds3d.cpp \ - ./src/sound/dscap.cpp \ - ./src/sound/midifile.cpp \ - ./src/sound/rbaudio.cpp \ - ./src/sound/rsx_lib.cpp \ - ./src/sound/rtvoice.cpp \ - ./src/sound/sound.cpp \ - ./src/sound/winmidi.cpp \ - ./src/sound/winmidi_base.cpp \ ./src/starfield/nebula.cpp \ ./src/starfield/starfield.cpp \ ./src/starfield/supernova.cpp \ diff --git a/include/emp.h b/include/emp.h index 0218aa3..4fa1e7a 100644 --- a/include/emp.h +++ b/include/emp.h @@ -7,8 +7,12 @@ * Header file for managing corkscrew missiles * * $Log$ - * Revision 1.1 2002/05/03 03:28:12 root - * Initial revision + * Revision 1.2 2002/05/04 04:36:56 theoddone33 + * More changes, took out a lot of the sound/* stuff which will bite later but + * I don't care. + * + * Revision 1.1.1.1 2002/05/03 03:28:12 root + * Initial import. * * * 4 7/02/99 4:31p Dave @@ -38,6 +42,7 @@ #ifndef __FREESPACE_EMP_MISSILE_HEADER_FILE_ #define __FREESPACE_EMP_MISSILE_HEADER_FILE_ +#include "pstypes.h" // ---------------------------------------------------------------------------------------------------- // EMP EFFECT DEFINES/VARS // diff --git a/include/flak.h b/include/flak.h index 5aed6a6..9aa45c7 100644 --- a/include/flak.h +++ b/include/flak.h @@ -7,8 +7,12 @@ * flak functions * * $Log$ - * Revision 1.1 2002/05/03 03:28:12 root - * Initial revision + * Revision 1.2 2002/05/04 04:36:56 theoddone33 + * More changes, took out a lot of the sound/* stuff which will bite later but + * I don't care. + * + * Revision 1.1.1.1 2002/05/03 03:28:12 root + * Initial import. * * * 6 7/31/99 2:57p Dave @@ -27,6 +31,7 @@ // -------------------------------------------------------------------------------------------------------------------------------------- // FLAK DEFINES/VARS // +#include "pstypes.h" struct weapon; struct object; diff --git a/include/neb.h b/include/neb.h index afae8e3..f4bf3ae 100644 --- a/include/neb.h +++ b/include/neb.h @@ -7,8 +7,12 @@ * Nebula effect * * $Log$ - * Revision 1.1 2002/05/03 03:28:12 root - * Initial revision + * Revision 1.2 2002/05/04 04:36:56 theoddone33 + * More changes, took out a lot of the sound/* stuff which will bite later but + * I don't care. + * + * Revision 1.1.1.1 2002/05/03 03:28:12 root + * Initial import. * * * 16 8/30/99 5:01p Dave @@ -34,6 +38,7 @@ // -------------------------------------------------------------------------------------------------------- // NEBULA DEFINES/VARS // +#include "pstypes.h" struct ship; struct object; diff --git a/include/tgautils.h b/include/tgautils.h index bd5aa60..2aa68c6 100644 --- a/include/tgautils.h +++ b/include/tgautils.h @@ -6,8 +6,12 @@ * * * $Log$ - * Revision 1.1 2002/05/03 03:28:12 root - * Initial revision + * Revision 1.2 2002/05/04 04:36:56 theoddone33 + * More changes, took out a lot of the sound/* stuff which will bite later but + * I don't care. + * + * Revision 1.1.1.1 2002/05/03 03:28:12 root + * Initial import. * * * 3 3/20/99 3:46p Dave @@ -24,6 +28,8 @@ #ifndef __TARGA_H #define __TARGA_H +#include "pstypes.h" + // -------------------- // // Defines diff --git a/src/nebula/neb.cpp b/src/nebula/neb.cpp index 0efa12b..e5396eb 100644 --- a/src/nebula/neb.cpp +++ b/src/nebula/neb.cpp @@ -7,8 +7,12 @@ * Nebula effect * * $Log$ - * Revision 1.1 2002/05/03 03:28:10 root - * Initial revision + * Revision 1.2 2002/05/04 04:36:56 theoddone33 + * More changes, took out a lot of the sound/* stuff which will bite later but + * I don't care. + * + * Revision 1.1.1.1 2002/05/03 03:28:10 root + * Initial import. * * * 50 8/30/99 5:01p Dave @@ -71,7 +75,9 @@ #include "bmpman.h" #include "2d.h" #include "object.h" +#ifndef PLAT_UNIX #include "glide.h" +#endif #include "timer.h" #include "multi.h" #include "freespace.h" diff --git a/src/starfield/nebula.cpp b/src/starfield/nebula.cpp index 9ed2a35..b4a97f9 100644 --- a/src/starfield/nebula.cpp +++ b/src/starfield/nebula.cpp @@ -7,8 +7,12 @@ * Code to load & display nebulas * * $Log$ - * Revision 1.1 2002/05/03 03:28:10 root - * Initial revision + * Revision 1.2 2002/05/04 04:36:56 theoddone33 + * More changes, took out a lot of the sound/* stuff which will bite later but + * I don't care. + * + * Revision 1.1.1.1 2002/05/03 03:28:10 root + * Initial import. * * * 14 9/01/99 11:26p Dave @@ -233,7 +237,7 @@ int load_nebula_sub(char *filename) // throw in some randomness to the nebula vertices depth } - for (i=0; i 1 of these types of medals, then determien // which of the possible version to use based on the player's count of this medal strcpy( filename, Medals[idx].bitmap ); +#ifdef PLAT_UNIX + STUB_FUNCTION; +#else _splitpath( filename, NULL, NULL, base, NULL ); +#endif num_medals = Player_score->medals[idx]; diff --git a/src/stats/stats.cpp b/src/stats/stats.cpp index 7748341..b99f247 100644 --- a/src/stats/stats.cpp +++ b/src/stats/stats.cpp @@ -7,8 +7,12 @@ * module for running the stats screen * * $Log$ - * Revision 1.1 2002/05/03 03:28:10 root - * Initial revision + * Revision 1.2 2002/05/04 04:36:56 theoddone33 + * More changes, took out a lot of the sound/* stuff which will bite later but + * I don't care. + * + * Revision 1.1.1.1 2002/05/03 03:28:10 root + * Initial import. * * * 5 10/15/99 3:56p Jefff @@ -171,8 +175,10 @@ * $NoKeywords: $ */ +#ifndef PLAT_UNIX #include #include +#endif #include "freespace.h" #include "gamesequence.h" #include "key.h" diff --git a/src/ui/gadget.cpp b/src/ui/gadget.cpp index 5d9e328..6fd30dc 100644 --- a/src/ui/gadget.cpp +++ b/src/ui/gadget.cpp @@ -7,8 +7,12 @@ * Functions for the base gadget class * * $Log$ - * Revision 1.1 2002/05/03 03:28:11 root - * Initial revision + * Revision 1.2 2002/05/04 04:36:56 theoddone33 + * More changes, took out a lot of the sound/* stuff which will bite later but + * I don't care. + * + * Revision 1.1.1.1 2002/05/03 03:28:11 root + * Initial import. * * * 18 8/11/99 3:21p Jefff @@ -224,7 +228,11 @@ int UI_GADGET::set_bmaps(char *ani_fname, int nframes, int start_frame) for(s_idx=0; s_idx<(4-num_digits); s_idx++){ strcat(full_name, NOX("0")); } +#ifdef PLAT_UNIX + STUB_FUNCTION; +#else strcat(full_name, itoa(idx, tmp, 10)); +#endif // try and load the bitmap bmap_ids[idx] = bm_load(full_name); -- 2.39.2