From 8b9bc61141e79754646753c9c42687c68a0621c8 Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Tue, 25 Jan 2005 21:58:23 +0000 Subject: [PATCH] if LVL can't be found, try filename that was passed --- ChangeLog | 3 ++- main/gamesave.c | 16 +++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc48795c..f694fd59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,7 +22,8 @@ * 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 - + * main/gamesave.c: if LVL can't be found, try filename that was passed + 2005-01-24 Chris Taylor * 2d/font.c: fix bug #2167: some characters would not display because diff --git a/main/gamesave.c b/main/gamesave.c index 3c7251a5..fef39159 100644 --- a/main/gamesave.c +++ b/main/gamesave.c @@ -1,4 +1,4 @@ -/* $Id: gamesave.c,v 1.29 2005-01-25 20:46:55 schaffner Exp $ */ +/* $Id: gamesave.c,v 1.30 2005-01-25 21:58:23 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -char gamesave_rcsid[] = "$Id: gamesave.c,v 1.29 2005-01-25 20:46:55 schaffner Exp $"; +char gamesave_rcsid[] = "$Id: gamesave.c,v 1.30 2005-01-25 21:58:23 schaffner Exp $"; #endif #include @@ -1332,14 +1332,20 @@ int load_level(char * filename_passed) #ifdef EDITOR //if we have the editor, try the LVL first, no matter what was passed. - //if we don't have an LVL, try RDL + //if we don't have an LVL, try what was passed or RL2 //if we don't have the editor, we just use what was passed change_filename_extension(filename,filename_passed,".lvl"); use_compiled_level = 0; - if (!cfexist(filename)) { - change_filename_extension(filename,filename,".rl2"); + if (!cfexist(filename)) + { + char *p = strrchr(filename_passed, '.'); + + if (stricmp(p, ".lvl")) + strcpy(filename, filename_passed); // set to what was passed + else + change_filename_extension(filename, filename, ".rl2"); use_compiled_level = 1; } #endif -- 2.39.2