From e2994daee068377ee7ee1ce8fbc04df84b38201e Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sun, 19 Dec 2004 11:00:32 +0000 Subject: [PATCH] replace byte with sbyte --- ChangeLog | 3 ++- include/ui.h | 8 ++++---- main/editor/editor.h | 15 +++++++++------ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54a0e64c..37b2c348 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2004-12-19 Bradley Bell - * include/ui.h, main/editor/editor.h: replace byte with sbyte + * include/ui.h, main/editor/editor.h, main/editor/segment.c: + replace byte with sbyte 2004-12-19 Chris Taylor diff --git a/include/ui.h b/include/ui.h index 06c09cf2..c2858b96 100644 --- a/include/ui.h +++ b/include/ui.h @@ -117,10 +117,10 @@ typedef struct { BASE_GADGET char *text; short width, height; - byte flag; - byte pressed; - byte position; - byte oldposition; + sbyte flag; + sbyte pressed; + sbyte position; + sbyte oldposition; int trap_key; int (*user_function)(void); } UI_GADGET_ICON; diff --git a/main/editor/editor.h b/main/editor/editor.h index b4445bbc..4c90fcf3 100644 --- a/main/editor/editor.h +++ b/main/editor/editor.h @@ -13,13 +13,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. /* * $Source: /cvs/cvsroot/d2x/main/editor/editor.h,v $ - * $Revision: 1.2 $ - * $Author: bradleyb $ - * $Date: 2001-10-25 02:19:32 $ + * $Revision: 1.3 $ + * $Author: btb $ + * $Date: 2004-12-19 10:58:39 $ * * FIXME: put description here * * $Log: not supported by cvs2svn $ + * Revision 1.2 2001/10/25 02:19:32 bradleyb + * conditionalize including multi.h and network.h, fix backslashes, fix compiler errors with EDITOR + * * */ @@ -180,7 +183,7 @@ extern int AttachSide; // Side on segment to attach extern int Draw_all_segments; // Set to 1 means draw_world draws all segments in Segments, else draw only connected segments extern segment *Markedsegp; // Marked segment, used in conjunction with *Cursegp to form joints. extern int Markedside; // Marked side on Markedsegp. -extern byte Vertex_active[MAX_VERTICES]; // !0 means vertex is in use, 0 means not in use. +extern sbyte Vertex_active[MAX_VERTICES]; // !0 means vertex is in use, 0 means not in use. extern grs_canvas *Pad_text_canvas; // Keypad text @@ -220,7 +223,7 @@ extern int is_free_vertex(int vi); // Set existing vertex vnum to value *vp. extern int med_set_vertex(int vnum,vms_vector *vp); -extern void med_combine_duplicate_vertices(byte *vlp); +extern void med_combine_duplicate_vertices(sbyte *vlp); // Attach side newside of newseg to side destside of destseg. // Copies *newseg into global array Segments, increments Num_segments. @@ -569,7 +572,7 @@ extern int Lock_view_to_cursegp; // !0 means whenever cursegp changes, view it extern int Num_tilings; // number of tilings/wall extern int Degenerate_segment_found; -extern byte Been_visited[]; // List of segments visited in a recursive search, if element n set, segment n done been visited +extern sbyte Been_visited[]; // List of segments visited in a recursive search, if element n set, segment n done been visited // Initializes autosave system. // Sets global Autosave_count to 0. -- 2.39.2