From 317fffe5da2bfef4095f8eb96d00bdb3a3c9158c Mon Sep 17 00:00:00 2001 From: Kp Date: Mon, 17 Nov 2014 04:02:26 +0000 Subject: [PATCH] Move #endif to cover functions that need trigger --- common/main/ai.h | 2 ++ common/main/collide.h | 2 ++ common/main/switch.h | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common/main/ai.h b/common/main/ai.h index 6e5723126..fd86f3811 100644 --- a/common/main/ai.h +++ b/common/main/ai.h @@ -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); diff --git a/common/main/collide.h b/common/main/collide.h index e661bb0b9..bf590c59f 100644 --- a/common/main/collide.h +++ b/common/main/collide.h @@ -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); diff --git a/common/main/switch.h b/common/main/switch.h index 0c9b4d3fa..d8f82fd97 100644 --- a/common/main/switch.h +++ b/common/main/switch.h @@ -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