From c7bb2755d64ab4880f4c0ef7f9893a7d447f148e Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Tue, 16 Jul 2002 20:47:27 +0000 Subject: [PATCH] don't use althogdir on non-unix --- main/inferno.c | 9 +++++++-- main/text.c | 6 ++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/main/inferno.c b/main/inferno.c index 56e1335b..c42f8ba8 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -13,13 +13,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. /* * $Source: /cvs/cvsroot/d2x/main/inferno.c,v $ - * $Revision: 1.28 $ + * $Revision: 1.29 $ * $Author: bradleyb $ - * $Date: 2002-07-16 19:05:13 $ + * $Date: 2002-07-16 20:47:27 $ * * FIXME: put description here * * $Log: not supported by cvs2svn $ + * Revision 1.28 2002/07/16 19:05:13 bradleyb + * need limits.h on mingw also + * * Revision 1.27 2002/02/16 02:08:31 bradleyb * allow older sdl versions * @@ -595,8 +598,10 @@ int main(int argc,char **argv) arch_init(); +#ifdef __unix__ //tell cfile where hogdir is cfile_use_alternate_hogdir(SHAREPATH); +#endif //tell cfile about our counter cfile_set_critical_error_counter_ptr(&descent_critical_error); diff --git a/main/text.c b/main/text.c index 1a326629..a129b012 100644 --- a/main/text.c +++ b/main/text.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: text.c,v 1.4 2002-04-19 21:26:30 bradleyb Exp $"; +static char rcsid[] = "$Id: text.c,v 1.5 2002-07-16 20:47:27 bradleyb Exp $"; #endif #include @@ -82,9 +82,7 @@ void load_text() if ((tfile = cfopen(filename,"rb")) == NULL) { filename="descent.txb"; if ((ifile = cfopen(filename, "rb")) == NULL) { - char cwd[_MAX_PATH]; - getcwd(cwd, _MAX_PATH); - Error("Cannot open file DESCENT.TEX or DESCENT.TXB\nIs descent2.hog in %s?", AltHogdir_initialized?AltHogDir:cwd); + Error("Cannot open file DESCENT.TEX or DESCENT.TXB\nIs descent2.hog in %s?", AltHogdir_initialized?AltHogDir:"current directory"); } have_binary = 1; -- 2.39.2