ref: 0e3d9e43d0f3e6cdc0021beb560fac4da585dca5
parent: c11b0e1bad9be37d91d0d8682a6b1df07abd1e87
author: Tanguy Fautre <[email protected]>
date: Sat Feb 22 10:39:33 EST 2020
Fix tons of warnings on MSVC. Distribute header includes rather than including everything in a few key headers.
--- a/Engine/src/cache.c
+++ b/Engine/src/cache.c
@@ -5,6 +5,7 @@
* This file has been modified from Ken Silverman's original release
*/
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
--- a/Engine/src/engine.c
+++ b/Engine/src/engine.c
@@ -9,22 +9,20 @@
#define ENGINE
-#include <string.h>
+#if WIN32
+#include "io.h"
+#endif
+#include <fcntl.h>
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
-#include <fcntl.h>
+#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include "platform.h"
-#if !PLATFORM_MACOSX
-#include <malloc.h>
-#endif
-
+#include "platform.h"
#include "build.h"
-
#include "engine.h"
#include "tiles.h"
@@ -8185,7 +8183,7 @@
{/* Allocate palookup buffer */
if ((palookup[palnum] = (uint8_t *)malloc(numpalookups<<8)) == NULL)
- allocache((int32_t *)&palookup[palnum],numpalookups<<8,&permanentlock);
+ allocache(&palookup[palnum],numpalookups<<8,&permanentlock);
}
if (dastat == 0) return;
--- a/Engine/src/filesystem.c
+++ b/Engine/src/filesystem.c
@@ -6,6 +6,17 @@
// Copyright (c) 2012 fabien sanglard. All rights reserved.
//
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#if WIN32
+ #include <fcntl.h>
+ #include <io.h>
+ #include <sys/stat.h>
+#endif
+
#include "filesystem.h"
#include "platform.h"
@@ -12,6 +23,8 @@
#include "cache.h"
#include "fixedPoint_math.h"
#include "../../Game/src/global.h"
+
+
char game_dir[512];
--- a/Engine/src/filesystem.h
+++ b/Engine/src/filesystem.h
@@ -9,10 +9,8 @@
#ifndef Duke3D_filesystem_h
#define Duke3D_filesystem_h
-#include "stdio.h"
-#include "platform.h"
-
-
+#include <stdint.h>
+#include <stdio.h>
#define MAXGROUPFILES 4 /* Warning: Fix groupfil if this is changed */
--- a/Engine/src/mmulti.c
+++ b/Engine/src/mmulti.c
@@ -5,12 +5,12 @@
* This file has been modified from Ken Silverman's original release
*/
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <ctype.h>
-#include <time.h>
#include "mmulti_unstable.h"
--- a/Engine/src/mmulti_stable.cpp
+++ b/Engine/src/mmulti_stable.cpp
@@ -217,7 +217,6 @@
{long i;
gcomtype *retval;
- int k;
// DO NOT DO THIS - it screws up the networking
//srand(enet_time_get_raw());
--- a/Engine/src/platform.h
+++ b/Engine/src/platform.h
@@ -1,6 +1,8 @@
#ifndef _INCLUDE_PLATFORM_H_
#define _INCLUDE_PLATFORM_H_
+#include <stdint.h>
+
#if (defined WIN32)
#include "win32_compat.h"
#elif (defined UNIX)
--- a/Engine/src/sdl_util.h
+++ b/Engine/src/sdl_util.h
@@ -10,6 +10,7 @@
#pragma once
+#include <assert.h>
#include <SDL2/SDL.h>
#include "build.h"
--- a/Engine/src/tiles.c
+++ b/Engine/src/tiles.c
@@ -6,6 +6,9 @@
// Copyright (c) 2012 fabien sanglard. All rights reserved.
//
+#include <stdlib.h>
+#include <string.h>
+
#include "tiles.h"
#include "engine.h"
#include "draw.h"
--- a/Engine/src/win32_compat.h
+++ b/Engine/src/win32_compat.h
@@ -18,23 +18,6 @@
#ifndef _INCLUDE_WIN32_COMPAT_H_
#define _INCLUDE_WIN32_COMPAT_H_
-#include <stdio.h>
-
-#if (!defined _MSC_VER)
- #include <unistd.h>
-#else
- #include <fcntl.h>
- #include <sys/stat.h>
-#endif
-
-#include <stdlib.h>
-#include <io.h>
-#include <direct.h>
-#include <conio.h>
-#include <dos.h>
-#include <assert.h>
-#include <string.h>
-
#ifndef max
#define max(x, y) (((x) > (y)) ? (x) : (y))
#endif
@@ -57,10 +40,7 @@
#define S_IRDWR _S_IRDWR
#endif /* defined _MSC_VER */
-#define snprintf _snprintf
#define strncasecmp strnicmp
-
-#include <inttypes.h>
#endif
--- a/Game/src/actors.c
+++ b/Game/src/actors.c
@@ -25,6 +25,10 @@
//-------------------------------------------------------------------------
#include "duke3d.h"
+#include "audiolib/fx_man.h"
+#include "engine.h"
+#include "soundefs.h"
+#include "sounds.h"
extern int32_t numenvsnds;
uint8_t actor_tog;
--- a/Game/src/audiolib/_multivc.h
+++ b/Game/src/audiolib/_multivc.h
@@ -94,34 +94,34 @@
struct VoiceNode *prev;
wavedata wavetype;
- char bits;
+ uint8_t bits;
playbackstatus ( *GetSound )( struct VoiceNode *voice );
- void ( *mix )( unsigned long position, unsigned long rate,
- uint8_t *start, unsigned long length );
+ void ( *mix )( uint32_t position, uint32_t rate,
+ uint8_t *start, uint32_t length );
uint8_t *NextBlock;
uint8_t *LoopStart;
uint8_t *LoopEnd;
unsigned LoopCount;
- unsigned long LoopSize;
- unsigned long BlockLength;
+ uint32_t LoopSize;
+ uint32_t BlockLength;
- unsigned long PitchScale;
- unsigned long FixedPointBufferSize;
+ uint32_t PitchScale;
+ uint32_t FixedPointBufferSize;
uint8_t *sound;
- unsigned long length;
+ uint32_t length;
uint32_t SamplingRate;
- unsigned long RateScale;
- unsigned long position;
+ uint32_t RateScale;
+ uint32_t position;
int Playing;
int handle;
int priority;
- void ( *DemandFeed )( char **ptr, uint32_t *length );
+ void ( *DemandFeed )( uint8_t **ptr, uint32_t *length );
int LeftVolume;
int RightVolume;
@@ -130,7 +130,7 @@
int GPos;
int GVal[4];
- unsigned long callbackval;
+ uint32_t callbackval;
} VoiceNode;
@@ -142,12 +142,12 @@
typedef struct
{- unsigned char left;
- unsigned char right;
+ uint8_t left;
+ uint8_t right;
} Pan;
typedef signed short MONO16;
-typedef signed char MONO8;
+typedef int8_t MONO8;
typedef struct
{@@ -167,17 +167,17 @@
{// MONO8 left;
// MONO8 right;
- char left;
- char right;
+ uint8_t left;
+ uint8_t right;
} STEREO8;
typedef struct
{- char RIFF[ 4 ];
- unsigned long file_size;
- char WAVE[ 4 ];
- char fmt[ 4 ];
- unsigned long format_size;
+ uint8_t RIFF[ 4 ];
+ uint32_t file_size;
+ uint8_t WAVE[ 4 ];
+ uint8_t fmt[ 4 ];
+ uint32_t format_size;
} riff_header;
typedef struct
@@ -184,8 +184,8 @@
{unsigned short wFormatTag;
unsigned short nChannels;
- unsigned long nSamplesPerSec;
- unsigned long nAvgBytesPerSec;
+ uint32_t nSamplesPerSec;
+ uint32_t nAvgBytesPerSec;
unsigned short nBlockAlign;
unsigned short nBitsPerSample;
} format_header;
@@ -192,14 +192,14 @@
typedef struct
{- char DATA[ 4 ];
- unsigned long size;
+ uint8_t DATA[ 4 ];
+ uint32_t size;
} data_header;
typedef MONO8 VOLUME8[ 256 ];
typedef MONO16 VOLUME16[ 256 ];
-// typedef char HARSH_CLIP_TABLE_8[ MV_NumVoices * 256 ];
+// typedef uint8_t HARSH_CLIP_TABLE_8[ MV_NumVoices * 256 ];
//static void MV_Mix( VoiceNode *voice);
//static void MV_PlayVoice( VoiceNode *voice );
@@ -223,7 +223,7 @@
void MV_SetVoiceMixMode( VoiceNode *voice );
-//static void MV_SetVoicePitch( VoiceNode *voice, unsigned long rate, int pitchoffset );
+//static void MV_SetVoicePitch( VoiceNode *voice, uint32_t rate, int pitchoffset );
//static void MV_CalcVolume( int MaxLevel );
//static void MV_CalcPanTable( void );
@@ -230,55 +230,55 @@
void ClearBuffer_DW( void *ptr, unsigned data, int length );
/*
-void MV_Mix8BitMono( unsigned long position, unsigned long rate,
- const char *start, unsigned long length );
+void MV_Mix8BitMono( uint32_t position, uint32_t rate,
+ const uint8_t *start, uint32_t length );
-void MV_Mix8BitStereo( unsigned long position,
- unsigned long rate, const char *start, unsigned long length );
+void MV_Mix8BitStereo( uint32_t position,
+ uint32_t rate, const uint8_t *start, uint32_t length );
-void MV_Mix16BitMono( unsigned long position,
- unsigned long rate, const char *start, unsigned long length );
+void MV_Mix16BitMono( uint32_t position,
+ uint32_t rate, const uint8_t *start, uint32_t length );
-void MV_Mix16BitStereo( unsigned long position,
- unsigned long rate, const char *start, unsigned long length );
+void MV_Mix16BitStereo( uint32_t position,
+ uint32_t rate, const uint8_t *start, uint32_t length );
-void MV_Mix16BitMono16( unsigned long position,
- unsigned long rate, const char *start, unsigned long length );
+void MV_Mix16BitMono16( uint32_t position,
+ uint32_t rate, const uint8_t *start, uint32_t length );
-void MV_Mix8BitMono16( unsigned long position, unsigned long rate,
- const char *start, unsigned long length );
+void MV_Mix8BitMono16( uint32_t position, uint32_t rate,
+ const uint8_t *start, uint32_t length );
-void MV_Mix8BitStereo16( unsigned long position,
- unsigned long rate, const char *start, unsigned long length );
+void MV_Mix8BitStereo16( uint32_t position,
+ uint32_t rate, const uint8_t *start, uint32_t length );
-void MV_Mix16BitStereo16( unsigned long position,
- unsigned long rate, const char *start, unsigned long length );
+void MV_Mix16BitStereo16( uint32_t position,
+ uint32_t rate, const uint8_t *start, uint32_t length );
*/
-void MV_MixFPMono8( unsigned long position, unsigned long rate,
- const char *start, unsigned long length );
+void MV_MixFPMono8( uint32_t position, uint32_t rate,
+ const uint8_t *start, uint32_t length );
-void MV_MixFPMono16( unsigned long position, unsigned long rate,
- const char *start, unsigned long length );
+void MV_MixFPMono16( uint32_t position, uint32_t rate,
+ const uint8_t *start, uint32_t length );
-void MV_MixFPStereo8( unsigned long position, unsigned long rate,
- const char *start, unsigned long length );
+void MV_MixFPStereo8( uint32_t position, uint32_t rate,
+ const uint8_t *start, uint32_t length );
-void MV_MixFPStereo16( unsigned long position, unsigned long rate,
- const char *start, unsigned long length );
+void MV_MixFPStereo16( uint32_t position, uint32_t rate,
+ const uint8_t *start, uint32_t length );
void MV_FPReverb(int volume);
void MV_FPReverbFree(void);
-void MV_16BitDownmix(char *dest, int count);
+void MV_16BitDownmix(uint8_t *dest, int count);
-void MV_8BitDownmix(char *dest, int count);
+void MV_8BitDownmix(uint8_t *dest, int count);
/*
-void MV_16BitReverbFast( const char *src, char *dest, int count, int shift );
+void MV_16BitReverbFast( const uint8_t *src, uint8_t *dest, int count, int shift );
-void MV_8BitReverbFast( const signed char *src, signed char *dest, int count, int shift );
+void MV_8BitReverbFast( const int8_t *src, int8_t *dest, int count, int shift );
*/
#endif
--- a/Game/src/audiolib/multivoc.c
+++ b/Game/src/audiolib/multivoc.c
@@ -102,7 +102,7 @@
/*static*/ int MV_MixPage = 0;
static int MV_VoiceHandle = MV_MinVoiceHandle;
-static void ( *MV_CallBackFunc )( unsigned long ) = NULL;
+static void ( *MV_CallBackFunc )( int32_t ) = NULL;
static void ( *MV_RecordFunc )( char *ptr, int length ) = NULL;
static void ( *MV_MixFunction )( VoiceNode *voice);
@@ -1097,7 +1097,6 @@
{VoiceNode *voice;
VoiceNode *node;
- unsigned flags;
// Check if we have any free voices
if ( !LL_Empty( &VoicePool, next, prev ) )
@@ -1572,7 +1571,6 @@
{VoiceNode *voice;
VoiceNode *next;
- unsigned flags;
DSL_StopPlayback();
--- a/Game/src/audiolib/mv_mix.c
+++ b/Game/src/audiolib/mv_mix.c
@@ -392,7 +392,7 @@
}
void MV_MixFPStereo8( uint32_t position,
- uint32_t rate, const char *start, uint32_t length )
+ uint32_t rate, const uint8_t *start, uint32_t length )
{const unsigned char *src;
double *dest;
@@ -422,7 +422,7 @@
}
void MV_MixFPMono16( uint32_t position,
- uint32_t rate, const char *start, uint32_t length )
+ uint32_t rate, const uint8_t *start, uint32_t length )
{const short *src;
double *dest;
@@ -448,7 +448,7 @@
}
void MV_MixFPStereo16( uint32_t position,
- uint32_t rate, const char *start, uint32_t length )
+ uint32_t rate, const uint8_t *start, uint32_t length )
{const short *src;
double *dest;
--- a/Game/src/audiolib/mvreverb.c
+++ b/Game/src/audiolib/mvreverb.c
@@ -257,7 +257,7 @@
SDL_mutexV(reverbMutex);
}
-void MV_16BitDownmix(char *dest, int count)
+void MV_16BitDownmix(uint8_t *dest, int count)
{int i;
@@ -272,7 +272,7 @@
}
}
-void MV_8BitDownmix(char *dest, int count)
+void MV_8BitDownmix(uint8_t*dest, int count)
{int i;
@@ -285,7 +285,7 @@
}
}
-void MV_16BitReverbFast( const char *src, char *dest, int count, int shift )
+void MV_16BitReverbFast( const uint8_t*src, uint8_t*dest, int count, int shift )
{int i;
@@ -297,7 +297,7 @@
}
}
-void MV_8BitReverbFast( const signed char *src, signed char *dest, int count, int shift )
+void MV_8BitReverbFast( const int8_t *src, int8_t *dest, int count, int shift )
{int i;
--- a/Game/src/config.c
+++ b/Game/src/config.c
@@ -28,10 +28,18 @@
#include <string.h>
#include <stdlib.h>
#include <time.h>
+
#include "duke3d.h"
-#include "scriplib.h"
+#include "audiolib/sndcards.h"
#include "build.h"
-
+#include "config.h"
+#include "control.h"
+#include "engine.h"
+#include "file_lib.h"
+#include "function.h"
+#include "keyboard.h"
+#include "scriplib.h"
+#include "util_lib.h"
// we load this in to get default button and key assignments
// as well as setting up function mappings
--- a/Game/src/console.c
+++ b/Game/src/console.c
@@ -1,11 +1,17 @@
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
#include "duke3d.h"
#include "console.h"
+#include "control.h"
#include "cvars.h"
#include "cvar_defs.h"
-#include <stdarg.h>
-
-// For autoexec.cfg
-#include <stdio.h>
+#include "engine.h"
+#include "names.h"
+#include "function.h"
#define MAX_STRING_LENGTH 64
#define MAX_CONSOLE_STRING_LENGTH 70
--- a/Game/src/control.c
+++ b/Game/src/control.c
@@ -23,10 +23,17 @@
Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
*/
//-------------------------------------------------------------------------
+#include <stdio.h>
+#include <string.h>
+
#include "duke3d.h"
+#include "config.h"
#include "control.h"
-#include "mouse.h"
+#include "display.h"
+#include "engine.h"
+#include "function.h"
#include "joystick.h"
+#include "mouse.h"
//***************************************************************************
//
--- a/Game/src/control.h
+++ b/Game/src/control.h
@@ -32,6 +32,9 @@
#ifndef _control_public
#define _control_public
+
+#include "keyboard.h"
+
#ifdef __cplusplus
extern "C" {#endif
--- a/Game/src/cvar_defs.c
+++ b/Game/src/cvar_defs.c
@@ -1,24 +1,21 @@
#include <stdlib.h>
+//We need a way to access duke to change the level
+#include "duke3d.h"
+
+#include "audiolib/music.h"
#include "cvars.h"
#include "cvar_defs.h"
#include "console.h"
+#include "control.h"
+#include "engine.h"
// Required for certain cvars
-#include "../../Game/src/types.h"
-#include "build.h"
#include "funct.h"
-//We need a way to access duke to change the level
-#include "duke3d.h"
-
-
-//We need to access debug soundinfo
-#include "sounddebugdefs.h"
-
-#include "joystick.h"
-
-#include "audiolib/music.h"
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
// Bind our Cvars at startup. You can still add bindings after this call, but
// it is recommanded that you bind your default CVars here.
--- a/Game/src/duke3d.h
+++ b/Game/src/duke3d.h
@@ -124,26 +124,8 @@
struct player_struct;
#include "../../Game/src/types.h"
-#include "file_lib.h"
-#include "develop.h"
#include "gamedefs.h"
-#include "keyboard.h"
-#include "util_lib.h"
-#include "function.h"
-#include "audiolib/fx_man.h"
-#include "config.h"
-#include "sounds.h"
-#include "control.h"
-#include "_rts.h"
-#include "rts.h"
-#include "soundefs.h"
-#include "audiolib/music.h"
-
-#include "names.h"
-
-#include "../../Engine/src/engine.h"
-#include "fixedPoint_math.h"
//#define TICRATE (120)
//#define TICSPERFRAME (TICRATE/26)
--- a/Game/src/game.c
+++ b/Game/src/game.c
@@ -24,10 +24,15 @@
*/
//-------------------------------------------------------------------------
+#include <stdio.h>
#include <time.h>
+#include <stdlib.h>
#ifdef _WIN32
- #include <windows.h>
+ #include <conio.h>
+ #include <direct.h>
+ #include <fcntl.h>
+ #include <windows.h>
#elif defined(__APPLE__)
#include "SDL.h"
#endif
@@ -34,28 +39,26 @@
#include "types.h"
-#include "develop.h"
-#include "scriplib.h"
+#include "duke3d.h"
+#include "audiolib/fx_man.h"
+#include "audiolib/music.h"
+#include "audiolib/sndcards.h"
+#include "config.h"
+#include "console.h"
+#include "engine.h"
#include "file_lib.h"
#include "gamedefs.h"
+#include "global.h"
#include "keyboard.h"
#include "util_lib.h"
#include "function.h"
#include "control.h"
#include "sounds.h"
-#include "config.h"
-#include "audiolib/sndcards.h"
+#include "soundefs.h"
-#include "duke3d.h"
-
-#include "console.h"
-#include "cvars.h"
-#include "cvar_defs.h"
-
#include <sys/types.h>
#include <sys/stat.h>
-#include "global.h"
#define MINITEXT_BLUE 0
--- a/Game/src/gamedef.c
+++ b/Game/src/gamedef.c
@@ -24,8 +24,19 @@
*/
//-------------------------------------------------------------------------
-#include "duke3d.h"
+#if WIN32
+ #include <conio.h>
+#endif
+
#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "duke3d.h"
+#include "engine.h"
+#include "keyboard.h"
+#include "soundefs.h"
extern short otherp;
--- a/Game/src/global.c
+++ b/Game/src/global.c
@@ -24,14 +24,23 @@
*/
//-------------------------------------------------------------------------
+#if WIN32
+ #include <fcntl.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
-#include <time.h>
-#include <errno.h>
-#include "global.h"
+
#include "duke3d.h"
+#include "global.h"
+#include "names.h"
+#include "platform.h"
+#include "util_lib.h"
+
+#include <errno.h>
+#include <time.h>
char *mymembuf;
uint8_t MusicPtr[72000];
--- a/Game/src/keyboard.c
+++ b/Game/src/keyboard.c
@@ -24,7 +24,12 @@
*/
//-------------------------------------------------------------------------
+#include <stdio.h>
+#include <string.h>
+
#include "duke3d.h"
+#include "control.h"
+#include "display.h"
#include "keyboard.h"
/*
--- a/Game/src/menues.c
+++ b/Game/src/menues.c
@@ -24,16 +24,28 @@
*/
//-------------------------------------------------------------------------
+#if WIN32
+ #include <fcntl.h>
+#endif
+
+#include <SDL2/SDL.h>
+
#include "duke3d.h"
-#include "mouse.h"
+#include "audiolib/fx_man.h"
+#include "audiolib/music.h"
#include "animlib.h"
+#include "config.h"
#include "control.h"
-
+#include "display.h"
+#include "engine.h"
#include "filesystem.h"
-#include "SDL2/SDL.h"
+#include "function.h"
+#include "mouse.h"
#include "premap.h"
-#include "display.h"
+#include "sounds.h"
+#include "soundefs.h"
+
extern SDL_Surface *surface;
extern short inputloc;
extern int recfilep;
@@ -222,7 +234,7 @@
short k, music_changed;
char fn[] = "game0.sav";
char mpfn[] = "gameA_00.sav";
- char* fnptr, scriptptrs[MAXSCRIPTSIZE];
+ char* fnptr;
int32_t fil, bv, i, x;
int32 nump;
int32 ptrbuf[MAXTILES];
@@ -543,7 +555,7 @@
int32_t i;
char fn[] = "game0.sav";
char mpfn[] = "gameA_00.sav";
- char* fnptr, scriptptrs[MAXSCRIPTSIZE];
+ char* fnptr;
FILE* fil;
int32_t bv = BYTEVERSION;
char fullpathsavefilename[16];
--- a/Game/src/midi/sdl_midi.c
+++ b/Game/src/midi/sdl_midi.c
@@ -6,10 +6,12 @@
// Copyright (c) 2012 fabien sanglard. All rights reserved.
//
-#include "../audiolib/music.h"
#include <SDL2/SDL.h>
#include <SDL2/SDL_mixer.h>
#include <stdio.h>
+
+#include "../audiolib/music.h"
+#include "engine.h"
/*
Because the music is stored in a GRP file that is never fully loaded in RAM
--- a/Game/src/names.h
+++ b/Game/src/names.h
@@ -24,6 +24,8 @@
*/
//-------------------------------------------------------------------------
+#pragma once
+
#define SECTOREFFECTOR 1
#define ACTIVATOR 2
#define TOUCHPLATE 3
--- a/Game/src/player.c
+++ b/Game/src/player.c
@@ -26,7 +26,16 @@
// Savage Baggage Masters
+#include <stdlib.h>
+
#include "duke3d.h"
+#include "audiolib/fx_man.h"
+#include "config.h"
+#include "control.h"
+#include "engine.h"
+#include "function.h"
+#include "sounds.h"
+#include "soundefs.h"
int32 turnheldtime; //MED
int32 lastcontroltime; //MED
--- a/Game/src/premap.c
+++ b/Game/src/premap.c
@@ -24,10 +24,19 @@
*/
//-------------------------------------------------------------------------
+#include <stdlib.h>
+#include <string.h>
+
#include "duke3d.h"
+#include "audiolib/fx_man.h"
+#include "audiolib/music.h"
+#include "engine.h"
#include "filesystem.h"
+#include "file_lib.h"
#include "game.h"
-
+#include "keyboard.h"
+#include "names.h"
+#include "sounds.h"
extern uint8_t everyothertime;
short which_palookup = 9;
--- a/Game/src/rts.c
+++ b/Game/src/rts.c
@@ -24,9 +24,17 @@
*/
//-------------------------------------------------------------------------
+#include <malloc.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
#include "duke3d.h"
+#include "_rts.h"
+#include "cache.h"
#include "global.h"
-#include <malloc.h>
+#include "file_lib.h"
+#include "util_lib.h"
//=============
// STATICS
--- a/Game/src/sector.c
+++ b/Game/src/sector.c
@@ -25,6 +25,13 @@
//-------------------------------------------------------------------------
#include "duke3d.h"
+#include "audiolib/fx_man.h"
+#include "audiolib/music.h"
+#include "fixedPoint_math.h"
+#include "engine.h"
+#include "keyboard.h"
+#include "sounds.h"
+#include "soundefs.h"
// PRIMITIVE
--- a/Game/src/soundefs.h
+++ b/Game/src/soundefs.h
@@ -24,734 +24,9 @@
*/
//-------------------------------------------------------------------------
-#define SECTOREFFECTOR 1
-#define ACTIVATOR 2
-#define TOUCHPLATE 3
-#define ACTIVATORLOCKED 4
-#define MUSICANDSFX 5
-#define LOCATORS 6
-#define CYCLER 7
-#define MASTERSWITCH 8
-#define RESPAWN 9
-#define GPSPEED 10
-#define ARROW 20
-#define FIRSTGUNSPRITE 21
-#define CHAINGUNSPRITE 22
-#define RPGSPRITE 23
-#define FREEZESPRITE 24
-#define SHRINKERSPRITE 25
-#define HEAVYHBOMB 26
-#define TRIPBOMBSPRITE 27
-#define SHOTGUNSPRITE 28
-#define DEVISTATORSPRITE 29
-#define HEALTHBOX 30
-#define AMMOBOX 31
-#define INVENTORYBOX 33
-#define FREEZEAMMO 37
-#define AMMO 40
-#define BATTERYAMMO 41
-#define DEVISTATORAMMO 42
-#define RPGAMMO 44
-#define GROWAMMO 45
-#define CRYSTALAMMO 46
-#define HBOMBAMMO 47
-#define AMMOLOTS 48
-#define SHOTGUNAMMO 49
-#define COLA 51
-#define SIXPAK 52
-#define FIRSTAID 53
-#define SHIELD 54
-#define STEROIDS 55
-#define AIRTANK 56
-#define JETPACK 57
-#define HEATSENSOR 59
-#define ACCESSCARD 60
-#define BOOTS 61
-#define MIRRORBROKE 70
-#define CLOUDYOCEAN 78
-#define CLOUDYSKIES 79
-#define MOONSKY1 80
-#define MOONSKY2 81
-#define MOONSKY3 82
-#define MOONSKY4 83
-#define BIGORBIT1 84
-#define BIGORBIT2 85
-#define BIGORBIT3 86
-#define BIGORBIT4 87
-#define BIGORBIT5 88
-#define LA 89
-#define REDSKY1 98
-#define REDSKY2 99
-#define ATOMICHEALTH 100
-#define TECHLIGHT2 120
-#define TECHLIGHTBUST2 121
-#define TECHLIGHT4 122
-#define TECHLIGHTBUST4 123
-#define WALLLIGHT4 124
-#define WALLLIGHTBUST4 125
-#define ACCESSSWITCH 130
-#define SLOTDOOR 132
-#define LIGHTSWITCH 134
-#define SPACEDOORSWITCH 136
-#define SPACELIGHTSWITCH 138
-#define FRANKENSTINESWITCH 140
-#define NUKEBUTTON 142
-#define MULTISWITCH 146
-#define DOORTILE5 150
-#define DOORTILE6 151
-#define DOORTILE1 152
-#define DOORTILE2 153
-#define DOORTILE3 154
-#define DOORTILE4 155
-#define DOORTILE7 156
-#define DOORTILE8 157
-#define DOORTILE9 158
-#define DOORTILE10 159
-#define DOORSHOCK 160
-#define DIPSWITCH 162
-#define DIPSWITCH2 164
-#define TECHSWITCH 166
-#define DIPSWITCH3 168
-#define ACCESSSWITCH2 170
-#define REFLECTWATERTILE 180
-#define FLOORSLIME 200
-#define BIGFORCE 230
-#define EPISODE 247
-#define MASKWALL9 255
-#define W_LIGHT 260
-#define SCREENBREAK1 263
-#define SCREENBREAK2 264
-#define SCREENBREAK3 265
-#define SCREENBREAK4 266
-#define SCREENBREAK5 267
-#define SCREENBREAK6 268
-#define SCREENBREAK7 269
-#define SCREENBREAK8 270
-#define SCREENBREAK9 271
-#define SCREENBREAK10 272
-#define SCREENBREAK11 273
-#define SCREENBREAK12 274
-#define SCREENBREAK13 275
-#define MASKWALL1 285
-#define W_TECHWALL1 293
-#define W_TECHWALL2 297
-#define W_TECHWALL15 299
-#define W_TECHWALL3 301
-#define W_TECHWALL4 305
-#define W_TECHWALL10 306
-#define W_TECHWALL16 307
-#define WATERTILE2 336
-#define BPANNEL1 341
-#define PANNEL1 342
-#define PANNEL2 343
-#define WATERTILE 344
-#define STATIC 351
-#define W_SCREENBREAK 357
-#define W_HITTECHWALL3 360
-#define W_HITTECHWALL4 361
-#define W_HITTECHWALL2 362
-#define W_HITTECHWALL1 363
-#define MASKWALL10 387
-#define MASKWALL11 391
-#define DOORTILE22 395
-#define FANSPRITE 407
-#define FANSPRITEBROKE 411
-#define FANSHADOW 412
-#define FANSHADOWBROKE 416
-#define DOORTILE18 447
-#define DOORTILE19 448
-#define DOORTILE20 449
-// #define SPACESHUTTLE 487
-#define SATELLITE 489
-#define VIEWSCREEN2 499
-#define VIEWSCREENBROKE 501
-#define VIEWSCREEN 502
-#define GLASS 503
-#define GLASS2 504
-#define STAINGLASS1 510
-#define MASKWALL5 514
-#define SATELITE 516
-#define FUELPOD 517
-#define SLIMEPIPE 538
-#define CRACK1 546
-#define CRACK2 547
-#define CRACK3 548
-#define CRACK4 549
-#define FOOTPRINTS 550
-#define DOMELITE 551
-#define CAMERAPOLE 554
-#define CHAIR1 556
-#define CHAIR2 557
-#define BROKENCHAIR 559
-#define MIRROR 560
-#define WATERFOUNTAIN 563
-#define WATERFOUNTAINBROKE 567
-#define FEMMAG1 568
-#define TOILET 569
-#define STALL 571
-#define STALLBROKE 573
-#define FEMMAG2 577
-#define REACTOR2 578
-#define REACTOR2BURNT 579
-#define REACTOR2SPARK 580
-#define GRATE1 595
-#define BGRATE1 596
-#define SOLARPANNEL 602
-#define NAKED1 603
-#define ANTENNA 607
-#define MASKWALL12 609
-#define TOILETBROKE 615
-#define PIPE2 616
-#define PIPE1B 617
-#define PIPE3 618
-#define PIPE1 619
-#define CAMERA1 621
-#define BRICK 626
-#define SPLINTERWOOD 630
-#define PIPE2B 633
-#define BOLT1 634
-#define W_NUMBERS 640
-#define WATERDRIP 660
-#define WATERBUBBLE 661
-#define WATERBUBBLEMAKER 662
-#define W_FORCEFIELD 663
-#define VACUUM 669
-#define FOOTPRINTS2 672
-#define FOOTPRINTS3 673
-#define FOOTPRINTS4 674
-#define EGG 675
-#define SCALE 678
-#define CHAIR3 680
-#define CAMERALIGHT 685
-#define MOVIECAMERA 686
-#define IVUNIT 689
-#define POT1 694
-#define POT2 695
-#define POT3 697
-#define PIPE3B 700
-#define WALLLIGHT3 701
-#define WALLLIGHTBUST3 702
-#define WALLLIGHT1 703
-#define WALLLIGHTBUST1 704
-#define WALLLIGHT2 705
-#define WALLLIGHTBUST2 706
-#define LIGHTSWITCH2 712
-#define WAITTOBESEATED 716
-#define DOORTILE14 717
-#define STATUE 753
-#define MIKE 762
-#define VASE 765
-#define SUSHIPLATE1 768
-#define SUSHIPLATE2 769
-#define SUSHIPLATE3 774
-#define SUSHIPLATE4 779
-#define DOORTILE16 781
-#define SUSHIPLATE5 792
-#define OJ 806
-#define MASKWALL13 830
-#define HURTRAIL 859
-#define POWERSWITCH1 860
-#define LOCKSWITCH1 862
-#define POWERSWITCH2 864
-#define ATM 867
-#define STATUEFLASH 869
-#define ATMBROKE 888
-#define BIGHOLE2 893
-#define STRIPEBALL 901
-#define QUEBALL 902
-#define POCKET 903
-#define WOODENHORSE 904
-#define TREE1 908
-#define TREE2 910
-#define CACTUS 911
-#define MASKWALL2 913
-#define MASKWALL3 914
-#define MASKWALL4 915
-#define FIREEXT 916
-#define TOILETWATER 921
-#define NEON1 925
-#define NEON2 926
-#define CACTUSBROKE 939
-#define BOUNCEMINE 940
-#define BROKEFIREHYDRENT 950
-#define BOX 951
-#define BULLETHOLE 952
-#define BOTTLE1 954
-#define BOTTLE2 955
-#define BOTTLE3 956
-#define BOTTLE4 957
-#define FEMPIC5 963
-#define FEMPIC6 964
-#define FEMPIC7 965
-#define HYDROPLANT 969
-#define OCEANSPRITE1 971
-#define OCEANSPRITE2 972
-#define OCEANSPRITE3 973
-#define OCEANSPRITE4 974
-#define OCEANSPRITE5 975
-#define GENERICPOLE 977
-#define CONE 978
-#define HANGLIGHT 979
-#define HYDRENT 981
-#define MASKWALL14 988
-#define TIRE 990
-#define PIPE5 994
-#define PIPE6 995
-#define PIPE4 996
-#define PIPE4B 997
-#define BROKEHYDROPLANT 1003
-#define PIPE5B 1005
-#define NEON3 1007
-#define NEON4 1008
-#define NEON5 1009
-#define BOTTLE5 1012
-#define BOTTLE6 1013
-#define BOTTLE8 1014
-#define SPOTLITE 1020
-#define HANGOOZ 1022
-#define MASKWALL15 1024
-#define BOTTLE7 1025
-#define HORSEONSIDE 1026
-#define GLASSPIECES 1031
-#define HORSELITE 1034
-#define DONUTS 1045
-#define NEON6 1046
-#define MASKWALL6 1059
-#define CLOCK 1060
-#define RUBBERCAN 1062
-#define BROKENCLOCK 1067
-#define PLUG 1069
-#define OOZFILTER 1079
-#define FLOORPLASMA 1082
-#define REACTOR 1088
-#define REACTORSPARK 1092
-#define REACTORBURNT 1096
-#define DOORTILE15 1102
-#define HANDSWITCH 1111
-#define CIRCLEPANNEL 1113
-#define CIRCLEPANNELBROKE 1114
-#define PULLSWITCH 1122
-#define MASKWALL8 1124
-#define BIGHOLE 1141
-#define ALIENSWITCH 1142
-#define DOORTILE21 1144
-#define HANDPRINTSWITCH 1155
-#define BOTTLE10 1157
-#define BOTTLE11 1158
-#define BOTTLE12 1159
-#define BOTTLE13 1160
-#define BOTTLE14 1161
-#define BOTTLE15 1162
-#define BOTTLE16 1163
-#define BOTTLE17 1164
-#define BOTTLE18 1165
-#define BOTTLE19 1166
-#define DOORTILE17 1169
-#define MASKWALL7 1174
-#define JAILBARBREAK 1175
-#define DOORTILE11 1178
-#define DOORTILE12 1179
-#define VENDMACHINE 1212
-#define VENDMACHINEBROKE 1214
-#define COLAMACHINE 1215
-#define COLAMACHINEBROKE 1217
-#define CRANEPOLE 1221
-#define CRANE 1222
-#define BARBROKE 1225
-#define BLOODPOOL 1226
-#define NUKEBARREL 1227
-#define NUKEBARRELDENTED 1228
-#define NUKEBARRELLEAKED 1229
-#define CANWITHSOMETHING 1232
-#define MONEY 1233
-#define BANNER 1236
-#define EXPLODINGBARREL 1238
-#define EXPLODINGBARREL2 1239
-#define FIREBARREL 1240
-#define SEENINE 1247
-#define SEENINEDEAD 1248
-#define STEAM 1250
-#define CEILINGSTEAM 1255
-#define PIPE6B 1260
-#define TRANSPORTERBEAM 1261
-#define RAT 1267
-#define TRASH 1272
-#define FEMPIC1 1280
-#define FEMPIC2 1289
-#define BLANKSCREEN 1293
-#define PODFEM1 1294
-#define FEMPIC3 1298
-#define FEMPIC4 1306
-#define FEM1 1312
-#define FEM2 1317
-#define FEM3 1321
-#define FEM5 1323
-#define BLOODYPOLE 1324
-#define FEM4 1325
-#define FEM6 1334
-#define FEM6PAD 1335
-#define FEM8 1336
-#define HELECOPT 1346
-#define FETUSJIB 1347
-#define HOLODUKE 1348
-#define SPACEMARINE 1353
-#define INDY 1355
-#define FETUS 1358
-#define FETUSBROKE 1359
-#define MONK 1352
-#define LUKE 1354
-#define COOLEXPLOSION1 1360
-#define WATERSPLASH2 1380
-#define FIREVASE 1390
-#define SCRATCH 1393
-#define FEM7 1395
-#define APLAYERTOP 1400
-#define APLAYER 1405
-#define PLAYERONWATER 1420
-#define DUKELYINGDEAD 1518
-#define DUKETORSO 1520
-#define DUKEGUN 1528
-#define DUKELEG 1536
-#define SHARK 1550
-#define BLOOD 1620
-#define FIRELASER 1625
-#define TRANSPORTERSTAR 1630
-#define SPIT 1636
-#define LOOGIE 1637
-#define FIST 1640
-#define FREEZEBLAST 1641
-#define DEVISTATORBLAST 1642
-#define SHRINKSPARK 1646
-#define TONGUE 1647
-#define MORTER 1650
-#define SHRINKEREXPLOSION 1656
-#define RADIUSEXPLOSION 1670
-#define FORCERIPPLE 1671
-#define LIZTROOP 1680
-#define LIZTROOPRUNNING 1681
-#define LIZTROOPSTAYPUT 1682
-#define LIZTOP 1705
-#define LIZTROOPSHOOT 1715
-#define LIZTROOPJETPACK 1725
-#define LIZTROOPDSPRITE 1734
-#define LIZTROOPONTOILET 1741
-#define LIZTROOPJUSTSIT 1742
-#define LIZTROOPDUCKING 1744
-#define HEADJIB1 1768
-#define ARMJIB1 1772
-#define LEGJIB1 1776
-#define CANNONBALL 1817
-#define OCTABRAIN 1820
-#define OCTABRAINSTAYPUT 1821
-#define OCTATOP 1845
-#define OCTADEADSPRITE 1855
-#define INNERJAW 1860
-#define DRONE 1880
-#define EXPLOSION2 1890
-#define COMMANDER 1920
-#define COMMANDERSTAYPUT 1921
-#define RECON 1960
-#define TANK 1975
-#define PIGCOP 2000
-#define PIGCOPSTAYPUT 2001
-#define PIGCOPDIVE 2045
-#define PIGCOPDEADSPRITE 2060
-#define PIGTOP 2061
-#define LIZMAN 2120
-#define LIZMANSTAYPUT 2121
-#define LIZMANSPITTING 2150
-#define LIZMANFEEDING 2160
-#define LIZMANJUMP 2165
-#define LIZMANDEADSPRITE 2185
-#define FECES 2200
-#define LIZMANHEAD1 2201
-#define LIZMANARM1 2205
-#define LIZMANLEG1 2209
-#define EXPLOSION2BOT 2219
-#define USERWEAPON 2235
-#define HEADERBAR 2242
-#define JIBS1 2245
-#define JIBS2 2250
-#define JIBS3 2255
-#define JIBS4 2260
-#define JIBS5 2265
-#define BURNING 2270
-#define FIRE 2271
-#define JIBS6 2286
-#define BLOODSPLAT1 2296
-#define BLOODSPLAT3 2297
-#define BLOODSPLAT2 2298
-#define BLOODSPLAT4 2299
-#define OOZ 2300
-#define OOZ2 2309
-#define WALLBLOOD1 2301
-#define WALLBLOOD2 2302
-#define WALLBLOOD3 2303
-#define WALLBLOOD4 2304
-#define WALLBLOOD5 2305
-#define WALLBLOOD6 2306
-#define WALLBLOOD7 2307
-#define WALLBLOOD8 2308
-#define BURNING2 2310
-#define FIRE2 2311
-#define CRACKKNUCKLES 2324
-#define SMALLSMOKE 2329
-#define SMALLSMOKEMAKER 2330
-#define FLOORFLAME 2333
-#define ROTATEGUN 2360
-#define GREENSLIME 2370
-#define WATERDRIPSPLASH 2380
-#define SCRAP6 2390
-#define SCRAP1 2400
-#define SCRAP2 2404
-#define SCRAP3 2408
-#define SCRAP4 2412
-#define SCRAP5 2416
-#define ORGANTIC 2420
-#define BETAVERSION 2440
-#define PLAYERISHERE 2442
-#define PLAYERWASHERE 2443
-#define SELECTDIR 2444
-#define F1HELP 2445
-#define NOTCHON 2446
-#define NOTCHOFF 2447
-#define GROWSPARK 2448
-#define DUKEICON 2452
-#define BADGUYICON 2453
-#define FOODICON 2454
-#define GETICON 2455
-#define MENUSCREEN 2456
-#define MENUBAR 2457
-#define KILLSICON 2458
-#define FIRSTAID_ICON 2460
-#define HEAT_ICON 2461
-#define BOTTOMSTATUSBAR 2462
-#define BOOT_ICON 2463
-#define FRAGBAR 2465
-#define JETPACK_ICON 2467
-#define AIRTANK_ICON 2468
-#define STEROIDS_ICON 2469
-#define HOLODUKE_ICON 2470
-#define ACCESS_ICON 2471
-#define DIGITALNUM 2472
-#define DUKECAR 2491
-#define CAMCORNER 2482
-#define CAMLIGHT 2484
-#define LOGO 2485
-#define TITLE 2486
-#define NUKEWARNINGICON 2487
-#define MOUSECURSOR 2488
-#define SLIDEBAR 2489
-#define DREALMS 2492
-#define BETASCREEN 2493
-#define WINDOWBORDER1 2494
-#define TEXTBOX 2495
-#define WINDOWBORDER2 2496
-#define DUKENUKEM 2497
-#define THREEDEE 2498
-#define INGAMEDUKETHREEDEE 2499
-#define TENSCREEN 2500
-#define PLUTOPAKSPRITE 2501
-#define DEVISTATOR 2510
-#define KNEE 2521
-#define CROSSHAIR 2523
-#define FIRSTGUN 2524
-#define FIRSTGUNRELOAD 2528
-#define FALLINGCLIP 2530
-#define CLIPINHAND 2531
-#define HAND 2532
-#define SHELL 2533
-#define SHOTGUNSHELL 2535
-#define CHAINGUN 2536
-#define RPGGUN 2544
-#define RPGMUZZLEFLASH 2545
-#define FREEZE 2548
-#define CATLITE 2552
-#define SHRINKER 2556
-#define HANDHOLDINGLASER 2563
-#define TRIPBOMB 2566
-#define LASERLINE 2567
-#define HANDHOLDINGACCESS 2568
-#define HANDREMOTE 2570
-#define HANDTHROW 2573
-#define TIP 2576
-#define GLAIR 2578
-#define SCUBAMASK 2581
-#define SPACEMASK 2584
-#define FORCESPHERE 2590
-#define SHOTSPARK1 2595
-#define RPG 2605
-#define LASERSITE 2612
-#define SHOTGUN 2613
-#define BOSS1 2630
-#define BOSS1STAYPUT 2631
-#define BOSS1SHOOT 2660
-#define BOSS1LOB 2670
-#define BOSSTOP 2696
-#define BOSS2 2710
-#define BOSS3 2760
-#define SPINNINGNUKEICON 2813
-#define BIGFNTCURSOR 2820
-#define SMALLFNTCURSOR 2821
-#define STARTALPHANUM 2822
-#define ENDALPHANUM 2915
-#define BIGALPHANUM 2940
-#define BIGPERIOD 3002
-#define BIGCOMMA 3003
-#define BIGX 3004
-#define BIGQ 3005
-#define BIGSEMI 3006
-#define BIGCOLIN 3007
-#define THREEBYFIVE 3010
-#define BIGAPPOS 3022
-#define BLANK 3026
-#define MINIFONT 3072
-#define BUTTON1 3164
-#define GLASS3 3187
-#define RESPAWNMARKERRED 3190
-#define RESPAWNMARKERYELLOW 3200
-#define RESPAWNMARKERGREEN 3210
-#define BONUSSCREEN 3240
-#define VIEWBORDER 3250
-#define VICTORY1 3260
-#define ORDERING 3270
-#define TEXTSTORY 3280
-#define LOADSCREEN 3281
-#define BORNTOBEWILDSCREEN 3370
-#define BLIMP 3400
-#define FEM9 3450
-#define FOOTPRINT 3701
-#define POOP 4094
-#define FRAMEEFFECT1 4095
-// FIX_00037: steroids trigger a too many sprite respawn in 1.3 and 1.3d.
-#define FRAMEEFFECT1_13CON 3999 // Needed to ensure 1.3/1.3d compliance --mk
-#define PANNEL3 4099
-#define SCREENBREAK19 4125
-#define W_TECHWALL11 4130
-#define W_TECHWALL12 4131
-#define W_TECHWALL13 4132
-#define W_TECHWALL14 4133
-#define SCREENBREAK14 4120
-#define SCREENBREAK15 4123
-#define SCREENBREAK16 4127
-#define SCREENBREAK17 4128
-#define SCREENBREAK18 4129
-#define W_TECHWALL5 4134
-#define W_TECHWALL6 4136
-#define W_TECHWALL7 4138
-#define W_TECHWALL8 4140
-#define W_TECHWALL9 4142
-#define BPANNEL3 4100
-#define MIMON 4120
-#define W_HITTECHWALL16 4144
-#define W_HITTECHWALL10 4145
-#define W_HITTECHWALL15 4147
-#define W_MILKSHELF 4181
-#define W_MILKSHELFBROKE 4203
-#define PURPLELAVA 4240
-#define LAVABUBBLE 4340
-#define DUKECUTOUT 4352
-#define TARGET 4359
-#define GUNPOWDERBARREL 4360
-#define DUCK 4361
-#define HATRACK 4367
-#define DESKLAMP 4370
-#define COFFEEMACHINE 4372
-#define CUPS 4373
-#define GAVALS 4374
-#define GAVALS2 4375
-#define POLICELIGHTPOLE 4377
-#define FLOORBASKET 4388
-#define PUKE 4389
-#define DOORTILE23 4391
-#define TOPSECRET 4396
-#define SPEAKER 4397
-#define TEDDYBEAR 4400
-#define ROBOTDOG 4402
-#define ROBOTPIRATE 4404
-#define ROBOTMOUSE 4407
-#define MAIL 4410
-#define MAILBAG 4413
-#define HOTMEAT 4427
-#define COFFEEMUG 4438
-#define DONUTS2 4440
-#define TRIPODCAMERA 4444
-#define METER 4453
-#define DESKPHONE 4454
-#define GUMBALLMACHINE 4458
-#define GUMBALLMACHINEBROKE 4459
-#define PAPER 4460
-#define MACE 4464
-#define GENERICPOLE2 4465
-#define XXXSTACY 4470
-#define WETFLOOR 4495
-#define BROOM 4496
-#define MOP 4497
-#define PIRATE1A 4510
-#define PIRATE4A 4511
-#define PIRATE2A 4512
-#define PIRATE5A 4513
-#define PIRATE3A 4514
-#define PIRATE6A 4515
-#define PIRATEHALF 4516
-#define CHESTOFGOLD 4520
-#define SIDEBOLT1 4525
-#define FOODOBJECT1 4530
-#define FOODOBJECT2 4531
-#define FOODOBJECT3 4532
-#define FOODOBJECT4 4533
-#define FOODOBJECT5 4534
-#define FOODOBJECT6 4535
-#define FOODOBJECT7 4536
-#define FOODOBJECT8 4537
-#define FOODOBJECT9 4538
-#define FOODOBJECT10 4539
-#define FOODOBJECT11 4540
-#define FOODOBJECT12 4541
-#define FOODOBJECT13 4542
-#define FOODOBJECT14 4543
-#define FOODOBJECT15 4544
-#define FOODOBJECT16 4545
-#define FOODOBJECT17 4546
-#define FOODOBJECT18 4547
-#define FOODOBJECT19 4548
-#define FOODOBJECT20 4549
-#define HEADLAMP 4550
-#define TAMPON 4557
-#define SKINNEDCHICKEN 4554
-#define FEATHEREDCHICKEN 4555
-#define ROBOTDOG2 4560
-#define JOLLYMEAL 4569
-#define DUKEBURGER 4570
-#define SHOPPINGCART 4576
-#define CANWITHSOMETHING2 4580
-#define CANWITHSOMETHING3 4581
-#define CANWITHSOMETHING4 4582
-#define SNAKEP 4590
-#define DOLPHIN1 4591
-#define DOLPHIN2 4592
-#define NEWBEAST 4610
-#define NEWBEASTSTAYPUT 4611
-#define NEWBEASTJUMP 4690
-#define NEWBEASTHANG 4670
-#define NEWBEASTHANGDEAD 4671
-#define BOSS4 4740
-#define BOSS4STAYPUT 4741
-#define FEM10 4864
-#define TOUGHGAL 4866
-#define MAN 4871
-#define MAN2 4872
-#define WOMAN 4874
-#define PLEASEWAIT 4887
-#define NATURALLIGHTNING 4890
-#define WEATHERWARN 4893
-#define DUKETAG 4900
-#define SIGN1 4909
-#define SIGN2 4912
-#define JURYGUY 4943
+#pragma once
-
-
+#include "names.h"
// These tile positions are reserved!
#define RESERVEDSLOT1 6132
--- a/Game/src/sounds.c
+++ b/Game/src/sounds.c
@@ -25,13 +25,19 @@
//-------------------------------------------------------------------------
#include <stdio.h>
-#include <string.h>
-#include "../../Game/src/types.h"
-#include "util_lib.h"
+#include <stdlib.h>
+
#include "duke3d.h"
-#include "global.h"
+#include "../../Game/src/types.h"
+#include "audiolib/fx_man.h"
+#include "audiolib/music.h"
+#include "audiolib/sndcards.h"
+#include "control.h"
+#include "engine.h"
#include "filesystem.h"
-
+#include "global.h"
+#include "sounds.h"
+#include "soundefs.h"
#define LOUDESTVOLUME 150