From bca879f9b098e86bb5ae414cedd69bc0705285e0 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 24 Jan 2003 22:28:23 +0000
Subject: [PATCH] update

---
 stepmania/src/RageLog.cpp                        |  3 ++-
 stepmania/src/StdAfx.h                           |  4 ++--
 stepmania/src/StepMania.cpp                      | 16 +++++-----------
 .../src/arch/Sound/RageSoundDriver_DSound.cpp    | 16 +++++++---------
 .../Sound/RageSoundDriver_DSound_Software.cpp    | 12 ++++++------
 .../src/arch/Sound/RageSoundDriver_WaveOut.cpp   | 12 ++++++------
 6 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp
index fda58e806b..488e5bb7c8 100644
--- a/stepmania/src/RageLog.cpp
+++ b/stepmania/src/RageLog.cpp
@@ -15,7 +15,8 @@
 #include "RageUtil.h"
 #include <fstream>
 
-#include "crash.h"
+/* XXX */
+#include "archutils/win32/crash.h"
 
 RageLog* LOG;		// global and accessable from anywhere in the program
 
diff --git a/stepmania/src/StdAfx.h b/stepmania/src/StdAfx.h
index f502874a4b..6ae4ce43cb 100644
--- a/stepmania/src/StdAfx.h
+++ b/stepmania/src/StdAfx.h
@@ -56,8 +56,8 @@ using namespace std;
 /* Assertion that sets an optional message and brings up the crash handler, so
  * we get a backtrace.  This should probably be used instead of throwing an
  * exception in most cases we expect never to happen (but not in cases that
- * we do expect, such as d3d init failure.) */
-#include "crash.h"
+ * we do expect, such as DSound init failure.) */
+#include "archutils/win32/crash.h"
 #define RAGE_ASSERT_M(COND, MESSAGE) { if(!(COND)) { VDCHECKPOINT_M(MESSAGE); *(char*)0=0; } }
 #define RAGE_ASSERT(COND) RAGE_ASSERT_M((COND), "Assertion '" #COND "' failed")
 
diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index 7e7d548304..b878483023 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -46,20 +46,16 @@
 #include "InputQueue.h"
 #include "SongCacheIndex.h"
 
-//
-// StepMania common classes
-//
-#include "GameConstantsAndTypes.h"
 
-#include "tls.h"
-#include "crash.h"
+#include "archutils/win32/tls.h"
+#include "archutils/win32/crash.h"
 
 
 #include "SDL.h"
 #include "SDL_opengl.h"
 
 
-#ifdef _DEBUG
+#ifdef DEBUG
 #pragma comment(lib, "SDL-1.2.5/lib/SDLmaind.lib")
 #else
 #pragma comment(lib, "SDL-1.2.5/lib/SDLmain.lib")
@@ -73,8 +69,6 @@ HWND g_hWndMain = NULL;
 
 static bool g_bHasFocus = true;
 
-#include <time.h>
-
 
 static void ChangeToDirOfExecutable(const char *argv0)
 {
@@ -258,11 +252,11 @@ int main(int argc, char* argv[])
 	SDL_WM_SetCaption("StepMania", "StepMania");
 	loading_window->Paint();
 
+	srand( (unsigned)RageTimer::GetTimeSinceStart() );	// seed number generator
+	
 	//
 	// Create game objects
 	//
-	srand( (unsigned)time(NULL) );	// seed number generator
-	
 	LOG			= new RageLog();
 #ifdef _DEBUG
 	LOG->ShowConsole();
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp b/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
index fda7df2304..cfed601da0 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
@@ -3,20 +3,18 @@
  * Each sound gets its own stream, which allows for very little startup
  * latency for each sound and lower CPU usage. */
 
-#include "../../stdafx.h"
+#include "stdafx.h"
 #include "RageSoundDriver_DSound.h"
 #include "DSoundHelpers.h"
 
-#include "../../RageSoundManager.h"
-#include "../../RageException.h"
-#include "../../RageUtil.h"
-#include "../../RageSound.h"
-#include "../../RageLog.h"
-#include "../../tls.h"
+#include "RageSoundManager.h"
+#include "RageException.h"
+#include "RageUtil.h"
+#include "RageSound.h"
+#include "RageLog.h"
+#include "archutils/win32/tls.h"
 #include "SDL.h"
 
-#include "../../RageTimer.h"
-
 RageSoundManager *SOUNDMAN = NULL;
 
 const int channels = 2;
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
index d19d8309b5..c28c407cff 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
@@ -1,12 +1,12 @@
-#include "../../stdafx.h"
+#include "stdafx.h"
 #include "RageSoundDriver_DSound_Software.h"
 #include "DSoundHelpers.h"
 
-#include "../../RageTimer.h"
-#include "../../RageLog.h"
-#include "../../RageSound.h"
-#include "../../RageUtil.h"
-#include "../../tls.h"
+#include "RageTimer.h"
+#include "RageLog.h"
+#include "RageSound.h"
+#include "RageUtil.h"
+#include "archutils/win32/tls.h"
 
 #include "SDL.h"
 
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
index 581932b19d..7b783f8fdf 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
@@ -1,13 +1,13 @@
-#include "../../stdafx.h"
+#include "stdafx.h"
 #include "RageSoundDriver_WaveOut.h"
 
 #pragma comment(lib, "winmm.lib")
 
-#include "../../RageTimer.h"
-#include "../../RageLog.h"
-#include "../../RageSound.h"
-#include "../../RageUtil.h"
-#include "../../tls.h"
+#include "RageTimer.h"
+#include "RageLog.h"
+#include "RageSound.h"
+#include "RageUtil.h"
+#include "archutils/win32/tls.h"
 
 #include "SDL.h"