From 6a9271593fe7703612a0d70fb5c1999e57de24fe Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Tue, 18 Mar 2003 02:31:37 +0000
Subject: [PATCH] simplify DEMO_FILENAME macro

---
 ChangeLog      |  2 ++
 main/newdemo.c | 11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 527e1a94..a013c37f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-03-17  Bradley Bell  <btb@icculus.org>
 
+	* main/newdemo.c: simplify DEMO_FILENAME macro
+
 	* main/console.c, main/game.c: enable experimental console support
 
 	* main/gamerend.c: fixed location of fps meter in multi
diff --git a/main/newdemo.c b/main/newdemo.c
index d13ee6ae..b3f3ca15 100644
--- a/main/newdemo.c
+++ b/main/newdemo.c
@@ -1,4 +1,4 @@
-/* $Id: newdemo.c,v 1.11 2003-03-17 07:59:11 btb Exp $ */
+/* $Id: newdemo.c,v 1.12 2003-03-18 02:31:16 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -17,6 +17,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
  * Code to make a complete demo playback system.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.11  2003/03/17 07:59:11  btb
+ * also look in shared data dir for demos
+ *
  * Revision 1.10  2003/03/17 07:10:21  btb
  * comments/formatting
  *
@@ -887,11 +890,7 @@ byte RenderingWasRecorded[32];
 #define DEMO_VERSION            15      // last D1 version was 13
 #define DEMO_GAME_TYPE          3       // 1 was shareware, 2 registered
 
-#ifndef MACINTOSH
-#define DEMO_FILENAME           "demos/tmpdemo.dem"
-#else
-#define DEMO_FILENAME           ":Demos:tmpdemo.dem"
-#endif
+#define DEMO_FILENAME           DEMO_DIR "tmpdemo.dem"
 
 #define DEMO_MAX_LEVELS         29
 
-- 
2.39.2