From e2a05558aa3f43617cf11ea6d03fbe9fd66161fc Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Tue, 25 Jan 2005 21:53:41 +0000 Subject: [PATCH] call bm_read_all even if EDITOR is defined --- ChangeLog | 1 + main/piggy.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c2197e5..fc48795c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ mouse_set_limits and mouse_set_pos (we don't want to limit user) * ui/menubar.c: specify int type for state2_alt_down * main/editor/eglobal.c: remove variable New_segment (is now a macro) + * main/piggy.c: call bm_read_all even if EDITOR is defined 2005-01-24 Chris Taylor diff --git a/main/piggy.c b/main/piggy.c index f509212f..6b9b25a8 100644 --- a/main/piggy.c +++ b/main/piggy.c @@ -1,4 +1,4 @@ -/* $Id: piggy.c,v 1.60 2005-01-10 17:47:27 schaffner Exp $ */ +/* $Id: piggy.c,v 1.61 2005-01-25 21:53:41 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: piggy.c,v 1.60 2005-01-10 17:47:27 schaffner Exp $"; +static char rcsid[] = "$Id: piggy.c,v 1.61 2005-01-25 21:53:41 schaffner Exp $"; #endif @@ -1053,7 +1053,7 @@ int read_hamfile() if (Piggy_hamfile_version < 3) // hamfile contains sound info sound_offset = cfile_read_int(ham_fp); - #ifndef EDITOR + #if 1 //ndef EDITOR { //int i; -- 2.39.2