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

Move #endif to cover functions that need trigger

Browse source
This commit is contained in:
Kp 2014-11-17 04:02:26 +00:00
parent 57ed5c24fd
commit 317fffe5da
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/ai.h
View file

@ -134,12 +134,14 @@ void attempt_to_resume_path(vobjptridx_t objp);
// When a robot and a player collide, some robots attack!
void do_ai_robot_hit_attack(vobjptridx_t robot, objptridx_t player, const vms_vector &collision_point);
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
#if defined(DXX_BUILD_DESCENT_I)
typedef vobjptr_t _ai_door_is_openable_objptr;
#elif defined(DXX_BUILD_DESCENT_II)
typedef objptr_t _ai_door_is_openable_objptr;
#endif
int ai_door_is_openable(_ai_door_is_openable_objptr objp, vcsegptr_t segp, int sidenum);
#endif
int player_is_visible_from_object(vobjptridx_t objp, vms_vector &pos, fix field_of_view, const vms_vector &vec_to_player);
extern void ai_reset_all_paths(void); // Reset all paths. Call at the start of a level.
int ai_multiplayer_awareness(vobjptridx_t objp, int awareness_level);

2
common/main/collide.h
View file

@ -50,12 +50,14 @@ void collide_player_and_nasty_robot(vobjptridx_t player, vobjptridx_t robot, con
void net_destroy_controlcen(objptridx_t controlcen);
void collide_player_and_powerup(vobjptr_t player, vobjptridx_t powerup, const vms_vector &collision_point);
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
#if defined(DXX_BUILD_DESCENT_I)
typedef cobjptr_t _check_effect_blowup_objptr;
#elif defined(DXX_BUILD_DESCENT_II)
typedef vcobjptr_t _check_effect_blowup_objptr;
#endif
int check_effect_blowup(vsegptridx_t seg,int side,const vms_vector &pnt, _check_effect_blowup_objptr blower, int force_blowup_flag, int remote);
#endif
void apply_damage_to_controlcen(vobjptridx_t controlcen, fix damage, objnum_t who);
void bump_one_object(vobjptr_t obj0, const vms_vector &hit_dir, fix damage);
void drop_player_eggs(vobjptridx_t playerobj);

2
common/main/switch.h
View file

@ -180,7 +180,6 @@ extern void v30_trigger_read(v30_trigger *t, PHYSFS_file *fp);
extern void trigger_read(trigger *t, PHYSFS_file *fp);
void v29_trigger_read_as_v31(PHYSFS_File *fp, trigger &t);
void v30_trigger_read_as_v31(PHYSFS_File *fp, trigger &t);
#endif
/*
* reads n trigger structs from a PHYSFS_file and swaps if specified
@ -191,6 +190,7 @@ void trigger_write(PHYSFS_file *fp, const trigger &t);
void v29_trigger_write(PHYSFS_file *fp, const trigger &t);
void v30_trigger_write(PHYSFS_file *fp, const trigger &t);
void v31_trigger_write(PHYSFS_file *fp, const trigger &t);
#endif
#endif