cleanup
This commit is contained in:
@@ -1,14 +1,4 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
/*
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
File: BPMDisplay.h
|
|
||||||
|
|
||||||
Desc: A graphic displayed in the BPMDisplay during Dancing.
|
|
||||||
|
|
||||||
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "BPMDisplay.h"
|
#include "BPMDisplay.h"
|
||||||
#include "RageUtil.h"
|
#include "RageUtil.h"
|
||||||
#include "GameConstantsAndTypes.h"
|
#include "GameConstantsAndTypes.h"
|
||||||
|
|||||||
@@ -34,9 +34,6 @@ static void GetResolutionFromFileName( CString sPath, int &Width, int &Height )
|
|||||||
Height = atoi(matches[1].c_str());
|
Height = atoi(matches[1].c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// RageBitmapTexture constructor
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
RageBitmapTexture::RageBitmapTexture( RageTextureID name ) :
|
RageBitmapTexture::RageBitmapTexture( RageTextureID name ) :
|
||||||
RageTexture( name )
|
RageTexture( name )
|
||||||
{
|
{
|
||||||
@@ -345,4 +342,3 @@ void RageBitmapTexture::Destroy()
|
|||||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||||
* PERFORMANCE OF THIS SOFTWARE.
|
* PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
/*
|
/* RageTexture - Abstract class for a texture and metadata. */
|
||||||
* RageTexture - Abstract class for a texture and metadata.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef RAGE_TEXTURE_H
|
#ifndef RAGE_TEXTURE_H
|
||||||
#define RAGE_TEXTURE_H
|
#define RAGE_TEXTURE_H
|
||||||
@@ -8,10 +6,6 @@
|
|||||||
#include "RageTypes.h"
|
#include "RageTypes.h"
|
||||||
#include "RageTextureID.h"
|
#include "RageTextureID.h"
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// RageTexture Class Declarations
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
class RageTexture
|
class RageTexture
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|||||||
@@ -1,15 +1,10 @@
|
|||||||
/*
|
/* RageUtil - Miscellaneous helper macros and functions. */
|
||||||
* RageUtil - Miscellaneous helper macros and functions.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef RAGEUTIL_H
|
#ifndef RAGEUTIL_H
|
||||||
#define RAGEUTIL_H
|
#define RAGEUTIL_H
|
||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// SAFE_ Macros
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
#define SAFE_DELETE(p) { if(p) { delete (p); (p)=NULL; } }
|
#define SAFE_DELETE(p) { if(p) { delete (p); (p)=NULL; } }
|
||||||
#define SAFE_DELETE_ARRAY(p) { if(p) { delete[] (p); (p)=NULL; } }
|
#define SAFE_DELETE_ARRAY(p) { if(p) { delete[] (p); (p)=NULL; } }
|
||||||
#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } }
|
#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } }
|
||||||
@@ -72,11 +67,6 @@ inline void wrap( float &x, float n)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// Misc helper functions
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
// Fast random number generators
|
// Fast random number generators
|
||||||
// Taken from "Numerical Recipes in C"
|
// Taken from "Numerical Recipes in C"
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +1,4 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
/*
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
Class: ScreenDemonstration
|
|
||||||
|
|
||||||
Desc: See header.
|
|
||||||
|
|
||||||
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
|
|
||||||
Chris Danford
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ScreenDemonstration.h"
|
#include "ScreenDemonstration.h"
|
||||||
#include "RageLog.h"
|
#include "RageLog.h"
|
||||||
#include "ThemeManager.h"
|
#include "ThemeManager.h"
|
||||||
|
|||||||
@@ -1,15 +1,4 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
/*
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
Class: ScreenEdit
|
|
||||||
|
|
||||||
Desc: See header.
|
|
||||||
|
|
||||||
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
|
|
||||||
Chris Danford
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ScreenEdit.h"
|
#include "ScreenEdit.h"
|
||||||
#include "PrefsManager.h"
|
#include "PrefsManager.h"
|
||||||
#include "SongManager.h"
|
#include "SongManager.h"
|
||||||
|
|||||||
@@ -1,15 +1,4 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
/*
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
Class: ScreenGameOver
|
|
||||||
|
|
||||||
Desc: See header.
|
|
||||||
|
|
||||||
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
|
|
||||||
Chris Danford
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ScreenGameOver.h"
|
#include "ScreenGameOver.h"
|
||||||
#include "ScreenManager.h"
|
#include "ScreenManager.h"
|
||||||
#include "AnnouncerManager.h"
|
#include "AnnouncerManager.h"
|
||||||
|
|||||||
@@ -1,15 +1,11 @@
|
|||||||
#include "global.h"
|
|
||||||
/*
|
/*
|
||||||
* Area for testing. Throw whatever you're working on in here. If you
|
* Area for testing. Throw whatever you're working on in here. If you
|
||||||
* don't want stuff in here to be wiped out by the next guy who works on something,
|
* don't want stuff in here to be wiped out by the next guy who works on something,
|
||||||
* make a separate screen and add a hook into ScreenTest; this one's just a
|
* make a separate screen and add a hook into ScreenTest; this one's just a
|
||||||
* scratchpad.
|
* scratchpad.
|
||||||
*
|
*/
|
||||||
* Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
|
|
||||||
* (there is no actual code here)
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
#include "global.h"
|
||||||
#include "ScreenSandbox.h"
|
#include "ScreenSandbox.h"
|
||||||
#include "GameConstantsAndTypes.h"
|
#include "GameConstantsAndTypes.h"
|
||||||
#include "ThemeManager.h"
|
#include "ThemeManager.h"
|
||||||
|
|||||||
@@ -1,15 +1,3 @@
|
|||||||
#include "global.h"
|
|
||||||
/*
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
File: ScreenTest.h
|
|
||||||
|
|
||||||
Desc: Area for testing.
|
|
||||||
|
|
||||||
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
|
|
||||||
Chris Danford, Glenn Maynard, Lance Gilbert
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "global.h"
|
#include "global.h"
|
||||||
#include "ScreenTest.h"
|
#include "ScreenTest.h"
|
||||||
#include "ScreenSandbox.h"
|
#include "ScreenSandbox.h"
|
||||||
|
|||||||
@@ -1,17 +1,4 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
/*
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
File: ScreenTestSound.h
|
|
||||||
|
|
||||||
Desc: Area for testing.
|
|
||||||
|
|
||||||
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
|
|
||||||
Glenn Maynard
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "global.h"
|
|
||||||
|
|
||||||
#include "ScreenTestSound.h"
|
#include "ScreenTestSound.h"
|
||||||
#include "RageDisplay.h"
|
#include "RageDisplay.h"
|
||||||
#include "SDL.h"
|
#include "SDL.h"
|
||||||
|
|||||||
@@ -1,15 +1,4 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
/*
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
Class: ScreenTextEntry
|
|
||||||
|
|
||||||
Desc: See header.
|
|
||||||
|
|
||||||
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
|
|
||||||
Chris Danford
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ScreenTextEntry.h"
|
#include "ScreenTextEntry.h"
|
||||||
#include "PrefsManager.h"
|
#include "PrefsManager.h"
|
||||||
#include "ScreenManager.h"
|
#include "ScreenManager.h"
|
||||||
|
|||||||
Reference in New Issue
Block a user