From 65f20f9f2d0b24f5aa3d75e571ed5a8209134735 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sun, 19 Dec 2004 11:01:29 +0000 Subject: [PATCH] replace byte with sbyte --- ChangeLog | 4 ++-- main/editor/medwall.h | 11 +++++++---- main/editor/segment.c | 15 +++++++++------ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37b2c348..132e7318 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ 2004-12-19 Bradley Bell - * include/ui.h, main/editor/editor.h, main/editor/segment.c: - replace byte with sbyte + * include/ui.h, main/editor/editor.h, main/editor/medwall.h, + main/editor/segment.c: replace byte with sbyte 2004-12-19 Chris Taylor diff --git a/main/editor/medwall.h b/main/editor/medwall.h index 8a8fb209..0a3c3bc6 100644 --- a/main/editor/medwall.h +++ b/main/editor/medwall.h @@ -12,13 +12,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* * $Source: /cvs/cvsroot/d2x/main/editor/medwall.h,v $ - * $Revision: 1.2 $ - * $Author: schaffner $ - * $Date: 2004-08-28 23:17:45 $ + * $Revision: 1.3 $ + * $Author: btb $ + * $Date: 2004-12-19 11:01:29 $ * * Created from version 1.6 of main\wall.h * * $Log: not supported by cvs2svn $ + * Revision 1.2 2004/08/28 23:17:45 schaffner + * move old per-file change logs into new file ChangeLog-old + * * Revision 1.1 2001/10/25 02:27:17 bradleyb * attempt at support for editor, makefile changes, etc * @@ -56,7 +59,7 @@ extern int wall_remove_blastable(); // Adds a wall. (visually) extern int wall_add_to_curside(); -extern int wall_add_to_markedside(byte type); +extern int wall_add_to_markedside(sbyte type); // Removes a wall. (visually) extern int wall_remove(); diff --git a/main/editor/segment.c b/main/editor/segment.c index b2e831ac..3b8aa859 100644 --- a/main/editor/segment.c +++ b/main/editor/segment.c @@ -13,13 +13,16 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. /* * $Source: /cvs/cvsroot/d2x/main/editor/segment.c,v $ - * $Revision: 1.2 $ - * $Author: schaffner $ - * $Date: 2004-08-29 14:03:51 $ + * $Revision: 1.3 $ + * $Author: btb $ + * $Date: 2004-12-19 11:00:32 $ * * Interrogation functions for segment data structure. * * $Log: not supported by cvs2svn $ + * Revision 1.2 2004/08/29 14:03:51 schaffner + * move more old change logs into ChangeLog-old + * * Revision 1.1 2001/10/25 02:27:17 bradleyb * attempt at support for editor, makefile changes, etc * @@ -118,7 +121,7 @@ void copy_side_except_vertex_ids(side *destside, side *sourceside) // [side] [index] [cur:next] // To remap the vertices on a side after a forward rotation -byte xlate_previous[6][4][2] = { +sbyte xlate_previous[6][4][2] = { { {7, 3}, {3, 2}, {2, 6}, {6, 7} }, // remapping left to left { {5, 4}, {4, 0}, {7, 3}, {6, 7} }, // remapping back to top { {5, 4}, {1, 5}, {0, 1}, {4, 0} }, // remapping right to right @@ -148,7 +151,7 @@ void remap_vertices_previous(segment *segp, int sidenum) } } -byte xlate_previous_right[6][4][2] = { +sbyte xlate_previous_right[6][4][2] = { { {5, 6}, {6, 7}, {2, 3}, {1, 2} }, // bottom to left { {6, 7}, {7, 4}, {3, 0}, {2, 3} }, // left to top { {7, 4}, {4, 5}, {0, 1}, {3, 0} }, // top to right @@ -901,7 +904,7 @@ void compress_segments(void) // Combine duplicate vertices. // If two vertices have the same coordinates, within some small tolerance, then assign // the same vertex number to the two vertices, freeing up one of the vertices. -void med_combine_duplicate_vertices(byte *vlp) +void med_combine_duplicate_vertices(sbyte *vlp) { int v,w; -- 2.39.2