actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Glenn Maynard
2003-01-24 22:28:23 +00:00
parent 24a8ea5a47
commit bca879f9b0
6 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageLog.cpp
+2 -1
View File
@@ -15,7 +15,8 @@
#include "RageUtil.h" #include "RageUtil.h"
#include <fstream> #include <fstream>
#include "crash.h" /* XXX */
#include "archutils/win32/crash.h"
RageLog* LOG; // global and accessable from anywhere in the program RageLog* LOG; // global and accessable from anywhere in the program
stepmania/src/StdAfx.h
+2 -2
View File
@@ -56,8 +56,8 @@ using namespace std;
/* Assertion that sets an optional message and brings up the crash handler, so /* 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 * 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 * exception in most cases we expect never to happen (but not in cases that
* we do expect, such as d3d init failure.) */ * we do expect, such as DSound init failure.) */
#include "crash.h" #include "archutils/win32/crash.h"
#define RAGE_ASSERT_M(COND, MESSAGE) { if(!(COND)) { VDCHECKPOINT_M(MESSAGE); *(char*)0=0; } } #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") #define RAGE_ASSERT(COND) RAGE_ASSERT_M((COND), "Assertion '" #COND "' failed")
stepmania/src/StepMania.cpp
+5 -11
View File
@@ -46,20 +46,16 @@
#include "InputQueue.h" #include "InputQueue.h"
#include "SongCacheIndex.h" #include "SongCacheIndex.h"
//
// StepMania common classes
//
#include "GameConstantsAndTypes.h"
#include "tls.h" #include "archutils/win32/tls.h"
#include "crash.h" #include "archutils/win32/crash.h"
#include "SDL.h" #include "SDL.h"
#include "SDL_opengl.h" #include "SDL_opengl.h"
#ifdef _DEBUG #ifdef DEBUG
#pragma comment(lib, "SDL-1.2.5/lib/SDLmaind.lib") #pragma comment(lib, "SDL-1.2.5/lib/SDLmaind.lib")
#else #else
#pragma comment(lib, "SDL-1.2.5/lib/SDLmain.lib") #pragma comment(lib, "SDL-1.2.5/lib/SDLmain.lib")
@@ -73,8 +69,6 @@ HWND g_hWndMain = NULL;
static bool g_bHasFocus = true; static bool g_bHasFocus = true;
#include <time.h>
static void ChangeToDirOfExecutable(const char *argv0) static void ChangeToDirOfExecutable(const char *argv0)
{ {
@@ -258,11 +252,11 @@ int main(int argc, char* argv[])
SDL_WM_SetCaption("StepMania", "StepMania"); SDL_WM_SetCaption("StepMania", "StepMania");
loading_window->Paint(); loading_window->Paint();
srand( (unsigned)RageTimer::GetTimeSinceStart() ); // seed number generator
// //
// Create game objects // Create game objects
// //
srand( (unsigned)time(NULL) ); // seed number generator
LOG = new RageLog(); LOG = new RageLog();
#ifdef _DEBUG #ifdef _DEBUG
LOG->ShowConsole(); LOG->ShowConsole();
stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp
+7 -9
View File
@@ -3,20 +3,18 @@
* Each sound gets its own stream, which allows for very little startup * Each sound gets its own stream, which allows for very little startup
* latency for each sound and lower CPU usage. */ * latency for each sound and lower CPU usage. */
#include "../../stdafx.h" #include "stdafx.h"
#include "RageSoundDriver_DSound.h" #include "RageSoundDriver_DSound.h"
#include "DSoundHelpers.h" #include "DSoundHelpers.h"
#include "../../RageSoundManager.h" #include "RageSoundManager.h"
#include "../../RageException.h" #include "RageException.h"
#include "../../RageUtil.h" #include "RageUtil.h"
#include "../../RageSound.h" #include "RageSound.h"
#include "../../RageLog.h" #include "RageLog.h"
#include "../../tls.h" #include "archutils/win32/tls.h"
#include "SDL.h" #include "SDL.h"
#include "../../RageTimer.h"
RageSoundManager *SOUNDMAN = NULL; RageSoundManager *SOUNDMAN = NULL;
const int channels = 2; const int channels = 2;
stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp
+6 -6
View File
@@ -1,12 +1,12 @@
#include "../../stdafx.h" #include "stdafx.h"
#include "RageSoundDriver_DSound_Software.h" #include "RageSoundDriver_DSound_Software.h"
#include "DSoundHelpers.h" #include "DSoundHelpers.h"
#include "../../RageTimer.h" #include "RageTimer.h"
#include "../../RageLog.h" #include "RageLog.h"
#include "../../RageSound.h" #include "RageSound.h"
#include "../../RageUtil.h" #include "RageUtil.h"
#include "../../tls.h" #include "archutils/win32/tls.h"
#include "SDL.h" #include "SDL.h"
stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp
+6 -6
View File
@@ -1,13 +1,13 @@
#include "../../stdafx.h" #include "stdafx.h"
#include "RageSoundDriver_WaveOut.h" #include "RageSoundDriver_WaveOut.h"
#pragma comment(lib, "winmm.lib") #pragma comment(lib, "winmm.lib")
#include "../../RageTimer.h" #include "RageTimer.h"
#include "../../RageLog.h" #include "RageLog.h"
#include "../../RageSound.h" #include "RageSound.h"
#include "../../RageUtil.h" #include "RageUtil.h"
#include "../../tls.h" #include "archutils/win32/tls.h"
#include "SDL.h" #include "SDL.h"