allow -notitles to work in shareware [and non-RELEASE] version too. (d1x r1.35)
authorBradley Bell <btb@icculus.org>
Fri, 25 Feb 2005 07:19:33 +0000 (07:19 +0000)
committerBradley Bell <btb@icculus.org>
Fri, 25 Feb 2005 07:19:33 +0000 (07:19 +0000)
ChangeLog
main/inferno.c

index 92d90b8..a9ff5da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-24  Tim Massey  <tmassey@obscorp.com>
+
+       * main/inferno.c: allow -notitles to work in shareware [and
+       non-RELEASE] version too. (d1x r1.35)
+
 2005-02-24  Peter Hawkins  <peterh@isa.net.au>
 
        * arch/linux/alsadigi.c: update to alsa 1.0 API. (d1x r1.3)
index 6dce6b4..c0faefa 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: inferno.c,v 1.97 2005-02-25 05:20:36 chris Exp $ */
+/* $Id: inferno.c,v 1.98 2005-02-25 07:19:33 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -809,12 +809,10 @@ int main(int argc, char *argv[])
 #endif
 #endif
 
-       #ifndef RELEASE
        if ( FindArg( "-notitles" ) )
                songs_play_song( SONG_TITLE, 1);
        else
-       #endif
-       {       //NOTE LINK TO ABOVE!
+       {
 #ifndef SHAREWARE
                int played=MOVIE_NOT_PLAYED;    //default is not played
 #endif
@@ -1152,9 +1150,7 @@ int main(int argc, char *argv[])
 
        WriteConfigFile();
 
-       #ifndef RELEASE
        if (!FindArg( "-notitles" ))
-       #endif
                show_order_form();
 
        #ifndef NDEBUG