From ac43b52a74f6126b7b367598fc9aa83b7400c6d9 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 3 Mar 2013 01:03:33 +0000 Subject: [PATCH] Move */main/effects.h -> common/main/effects.h --- {d2x-rebirth => common}/main/effects.h | 6 ++ d1x-rebirth/main/effects.h | 81 -------------------------- 2 files changed, 6 insertions(+), 81 deletions(-) rename {d2x-rebirth => common}/main/effects.h (95%) delete mode 100644 d1x-rebirth/main/effects.h diff --git a/d2x-rebirth/main/effects.h b/common/main/effects.h similarity index 95% rename from d2x-rebirth/main/effects.h rename to common/main/effects.h index 8be27b850..149e7baaa 100644 --- a/d2x-rebirth/main/effects.h +++ b/common/main/effects.h @@ -23,7 +23,11 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "vclip.h" +#if defined(DXX_BUILD_DESCENT_I) +#define MAX_EFFECTS 60 +#elif defined(DXX_BUILD_DESCENT_II) #define MAX_EFFECTS 110 +#endif //flags for eclips. If no flags are set, always plays @@ -33,7 +37,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define ECLIP_NUM_FUELCEN 2 #define ECLIP_NUM_BOSS 53 +#ifdef DXX_BUILD_DESCENT_II #define ECLIP_NUM_FORCE_FIELD 78 +#endif typedef struct eclip { vclip vc; //imbedded vclip diff --git a/d1x-rebirth/main/effects.h b/d1x-rebirth/main/effects.h deleted file mode 100644 index e41332158..000000000 --- a/d1x-rebirth/main/effects.h +++ /dev/null @@ -1,81 +0,0 @@ -/* -THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX -SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO -END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A -ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS -IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS -SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE -FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE -CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS -AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. -COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. -*/ - -/* - * - * Headerfile for effects.c - * - */ - - - -#ifndef _EFFECTS_H -#define _EFFECTS_H - -#include "vclip.h" - -#define MAX_EFFECTS 60 - -//flags for eclips. If no flags are set, always plays - -#define EF_CRITICAL 1 //this doesn't get played directly (only when mine critical) -#define EF_ONE_SHOT 2 //this is a special that gets played once -#define EF_STOPPED 4 //this has been stopped - -#define ECLIP_NUM_FUELCEN 2 -#define ECLIP_NUM_BOSS 53 - -typedef struct eclip { - vclip vc; //imbedded vclip - fix time_left; //for sequencing - int frame_count; //for sequencing - short changing_wall_texture; //Which element of Textures array to replace. - short changing_object_texture; //Which element of ObjBitmapPtrs array to replace. - int flags; //see above - int crit_clip; //use this clip instead of above one when mine critical - int dest_bm_num; //use this bitmap when monitor destroyed - int dest_vclip; //what vclip to play when exploding - int dest_eclip; //what eclip to play when exploding - fix dest_size; //3d size of explosion - int sound_num; //what sound this makes - int segnum,sidenum; //what seg & side, for one-shot clips -} __pack__ eclip; - -extern int Num_effects; -extern eclip Effects[MAX_EFFECTS]; - -// Set up special effects. -extern void init_special_effects(); - -// Clear any active one-shots -void reset_special_effects(); - -// Function called in game loop to do effects. -extern void do_special_effects(); - -// Restore bitmap -extern void restore_effect_bitmap_icons(); - -//stop an effect from animating. Show first frame. -void stop_effect(int effect_num); - -//restart a stopped effect -void restart_effect(int effect_num); - -/* - * reads n eclip structs from a PHYSFS_file - */ -extern int eclip_read_n(eclip *ec, int n, PHYSFS_file *fp); - -#endif /* _EFFECTS_H */ -