From dc3ce05e1a6ed38795c320b1f997ef3b7c1b8bde Mon Sep 17 00:00:00 2001 From: zicodxx Date: Thu, 3 Jan 2013 16:46:36 +0100 Subject: [PATCH] Declared wall_close_door_num in wall.h; Declared validate_segment_side in gameseg.h - patches by Kp --- CHANGELOG.txt | 1 + editor/group.c | 2 -- editor/medwall.c | 1 - editor/segment.c | 2 -- main/gameseg.h | 1 + main/wall.h | 1 + 6 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 638800478..ffb5cd147 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -9,6 +9,7 @@ main/bmread.c, main/piggy.c, main/piggy.h: Moved remove_char declaration to pigg main/multi.h, main/net_udp.c: Moved multi_* declarations to multi.h - patch by Kp maths/rand.c: Included maths.h in rand.c to get d_rand prototype - patch by Kp arch/include/joy.h, arch/sdl/event.c, arch/sdl/joy.c: Moved joy_*_handler declarations to joy.h - patch by Kp +editor/group.c, editor/medwall.c, editor/segment.c, main/gameseg.h, main/wall.h: Declared wall_close_door_num in wall.h; Declared validate_segment_side in gameseg.h - patches by Kp 20121102 -------- diff --git a/editor/group.c b/editor/group.c index 76ca0c452..7521413ae 100644 --- a/editor/group.c +++ b/editor/group.c @@ -80,8 +80,6 @@ int Group_orientation[MAX_GROUPS+1]; int current_group=-1; int num_groups=0; -extern void validate_segment_side(segment *sp, int sidenum); - // -- void swap_negate_columns(vms_matrix *rotmat, int col1, int col2) // -- { // -- fix col1_1,col1_2,col1_3; diff --git a/editor/medwall.c b/editor/medwall.c index 1197b9bda..3587dbb05 100644 --- a/editor/medwall.c +++ b/editor/medwall.c @@ -612,7 +612,6 @@ int wall_dialog_handler(UI_DIALOG *dlg, d_event *event, wall_dialog *wd) //--------------------------------------------------------------------- -extern void wall_close_door_num(int door_num); // Restore all walls to original status (closed doors, repaired walls) int wall_restore_all() diff --git a/editor/segment.c b/editor/segment.c index 15c568c1e..8a9945e0a 100644 --- a/editor/segment.c +++ b/editor/segment.c @@ -1082,8 +1082,6 @@ void delete_vertices_in_segment(segment *sp) update_num_vertices(); } -extern void validate_segment_side(segment *sp, int sidenum); - // ------------------------------------------------------------------------------- // Delete segment *sp in Segments array. // Return value: diff --git a/main/gameseg.h b/main/gameseg.h index bfe7275b7..a08eb378d 100644 --- a/main/gameseg.h +++ b/main/gameseg.h @@ -130,6 +130,7 @@ extern void extract_up_vector_from_segment(segment *sp,vms_vector *vp); extern void create_walls_on_side(segment *sp, int sidenum); extern void pick_random_point_in_seg(vms_vector *new_pos, int segnum); +extern void validate_segment_side(segment *sp, int sidenum); #endif diff --git a/main/wall.h b/main/wall.h index 1f1849b95..e8c338b39 100644 --- a/main/wall.h +++ b/main/wall.h @@ -306,5 +306,6 @@ extern void active_door_read_n_swap(active_door *ad, int n, int swap, PHYSFS_fil void cloaking_wall_read_n_swap(cloaking_wall *cw, int n, int swap, PHYSFS_file *fp); extern void wall_write(wall *w, short version, PHYSFS_file *fp); +void wall_close_door_num(int door_num); #endif