don't duplicate the period in the filename

This commit is contained in:
Bradley Bell 2004-12-21 11:06:21 +00:00
parent 3454090f6e
commit 41059b4494
2 changed files with 8 additions and 5 deletions

View file

@ -1,7 +1,6 @@
2004-12-19 Bradley Bell <btb@icculus.org>
2004-12-21 Chris Taylor <c.taylor@student.curtin.edu.au>
* include/strutil.h, misc/strutil.c, main/bmread.c: implement
removeext, use it in ds_load instead of splitpath
* main/bmread.c: don't duplicate the period in the filename
2004-12-19 Chris Taylor <c.taylor@student.curtin.edu.au>
@ -24,6 +23,9 @@
* ui/Makefile.am: fix ui Makefile.am
* include/strutil.h, misc/strutil.c, main/bmread.c: implement
removeext, use it in ds_load instead of splitpath
2004-12-19 Chris Taylor <c.taylor@student.curtin.edu.au>
* include/u_mem.h: prototype for strdup with MPW

View file

@ -1,4 +1,4 @@
/* $Id: bmread.c,v 1.10 2004-12-20 09:17:10 btb Exp $ */
/* $Id: bmread.c,v 1.11 2004-12-21 11:06:21 btb Exp $ */
/*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -66,6 +66,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "args.h"
#include "text.h"
#include "interp.h"
#include "strutil.h"
#include "editor/texpage.h"
@ -328,7 +329,7 @@ int ds_load( char * filename ) {
#endif
removeext(filename, fname);
sprintf(rawname, "%s.%s", fname, (digi_sample_rate==SAMPLE_RATE_22K) ? ".r22" : ".raw");
sprintf(rawname, "%s.%s", fname, (digi_sample_rate==SAMPLE_RATE_22K) ? "r22" : "raw");
i=piggy_find_sound( fname );
if (i!=255) {