TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove unused hostage code

Browse source
This commit is contained in:
Kp 2013-03-24 23:38:52 +00:00
parent 0cc36c0ad3
commit 942b25b202
3 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/game.c
View file

@ -151,8 +151,6 @@ void init_game()
{
init_objects();
hostage_init();
init_special_effects();
init_exploding_walls();

18
main/hostage.c
View file

@ -42,15 +42,6 @@ int N_hostage_types = 0; // Number of hostage types
int Hostage_vclip_num[MAX_HOSTAGE_TYPES]; // vclip num for each tpye of hostage
hostage_data Hostages[MAX_HOSTAGES]; // Data for each hostage in mine
//------------- Internally used hostage variables --------------------------------------------------
static fix Hostage_animation_time=-1; // How long the rescue sequence has been playing - units are frames, not seconds - -1 means not playing
//---------------- Initializes the hostage system ----------------------------------------------------
void hostage_init()
{
Hostage_animation_time=-1;
}
//-------------- Renders a hostage ----------------------------------------------------------------
void draw_hostage(object *obj)
{
@ -83,13 +74,6 @@ void hostage_rescue( int hostage_number )
//------------------- Useful macros and variables ---------------
void hostage_remove_char( char * s, char c )
{
char *p;
p = strchr(s,c);
if (p) *p = '\0';
}
int hostage_is_valid( int hostage_num ) {
if ( hostage_num < 0 ) return 0;
if ( hostage_num >= MAX_HOSTAGES ) return 0;
@ -109,7 +93,7 @@ int hostage_object_is_valid( int objnum ) {
}
int hostage_get_next_slot() {
static int hostage_get_next_slot() {
int i;
for (i=0; i<MAX_HOSTAGES; i++ ) {
if (!hostage_is_valid(i))

8
main/hostage.h
View file

@ -120,7 +120,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#define MAX_HOSTAGE_TYPES 1
#define MAX_HOSTAGES 10 //max per any one level
#define HOSTAGE_MESSAGE_LEN 30
#define HOSTAGE_MAX_GLOBALS 10
// 1 per hostage
typedef struct hostage_data {
@ -132,27 +131,20 @@ typedef struct hostage_data {
char text[HOSTAGE_MESSAGE_LEN];
} hostage_data;
extern char Hostage_global_message[HOSTAGE_MAX_GLOBALS][HOSTAGE_MESSAGE_LEN];
extern int Hostage_num_globals;
extern int N_hostage_types;
extern int Num_hostages;
extern int Hostage_vclip_num[MAX_HOSTAGE_TYPES]; // for each type of hostage
extern hostage_data Hostages[MAX_HOSTAGES];
void draw_hostage(object *obj);
void hostage_rescue( int hostage_number );
void hostage_init();
//returns true if something drew
int do_hostage_effects();
void hostage_init_all();
void hostage_compress_all();
int hostage_get_next_slot();
int hostage_is_valid( int hostage_num );
int hostage_object_is_valid( int objnum );
void hostage_init_info( int objnum );