From 02aab9d2687dd5da151205d74bfc7956ac0f82c5 Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Tue, 25 Jan 2005 20:02:58 +0000 Subject: [PATCH] externalize N_ObjBitmaps & remove_char, solve conflict --- ChangeLog | 1 + main/bmread.c | 17 +++++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b288410..34e791c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ ui/window.c: use timer_get_fixed_seconds instead of TICKER macro * ui/number.c: s/inputbox/Inputbox/ * ui/ui.c: InstallErrorHandler() no longer exists, don't use it anymore + * main/bmread.c: externalize N_ObjBitmaps & remove_char, solve conflict 2005-01-24 Chris Taylor diff --git a/main/bmread.c b/main/bmread.c index a2d558ef..0b1e89be 100644 --- a/main/bmread.c +++ b/main/bmread.c @@ -1,4 +1,4 @@ -/* $Id: bmread.c,v 1.12 2005-01-10 17:47:27 schaffner Exp $ */ +/* $Id: bmread.c,v 1.13 2005-01-25 20:02:58 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -90,7 +90,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. extern player_ship only_player_ship; // In bm.c -short N_ObjBitmaps=0; +extern short N_ObjBitmaps; // in bm.c short N_ObjBitmapPtrs=0; static int Num_robot_ais = 0; int TmapList[MAX_TEXTURES]; @@ -128,14 +128,15 @@ static int num_sounds=0; int linenum; //line int table currently being parsed //------------------- Useful macros and variables --------------- +extern void remove_char( char * s, char c ); // in piggy.c #define REMOVE_EOL(s) remove_char((s),'\n') #define REMOVE_COMMENTS(s) remove_char((s),';') #define REMOVE_DOTS(s) remove_char((s),'.') #define IFTOK(str) if (!strcmp(arg, str)) -char *space = { " \t" }; +extern char *space; // in piggy.c //--unused-- char *equal = { "=" }; -char *equal_space = { " \t=" }; +extern char *equal_space; // in piggy.c // For the sake of LINT, defining prototypes to module's functions @@ -156,14 +157,6 @@ void clear_to_end_of_line(void); void verify_textures(void); -//---------------------------------------------------------------------- -void remove_char( char * s, char c ) -{ - char *p; - p = strchr(s,c); - if (p) *p = '\0'; -} - //--------------------------------------------------------------- int compute_average_pixel(grs_bitmap *new) { -- 2.39.2