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

remove unnecessary dependencies on ScreenGameplay

Browse Source
This commit is contained in:
Chris Danford
2005-01-06 01:52:45 +00:00
parent fddfd2783e
commit 9132b5a518
6 changed files with 62 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameplayMessages.h
+57
View File
@@ -0,0 +1,57 @@
#ifndef GameplayMessages_H
#define GameplayMessages_H
#include "ScreenMessage.h"
// messages sent by Combo
const ScreenMessage SM_PlayToasty = ScreenMessage(SM_User+104);
const ScreenMessage SM_100Combo = ScreenMessage(SM_User+200);
const ScreenMessage SM_200Combo = ScreenMessage(SM_User+201);
const ScreenMessage SM_300Combo = ScreenMessage(SM_User+202);
const ScreenMessage SM_400Combo = ScreenMessage(SM_User+203);
const ScreenMessage SM_500Combo = ScreenMessage(SM_User+204);
const ScreenMessage SM_600Combo = ScreenMessage(SM_User+205);
const ScreenMessage SM_700Combo = ScreenMessage(SM_User+206);
const ScreenMessage SM_800Combo = ScreenMessage(SM_User+207);
const ScreenMessage SM_900Combo = ScreenMessage(SM_User+208);
const ScreenMessage SM_1000Combo = ScreenMessage(SM_User+209);
const ScreenMessage SM_ComboStopped = ScreenMessage(SM_User+210);
const ScreenMessage SM_ComboContinuing = ScreenMessage(SM_User+211);
const ScreenMessage SM_MissComboAborted = ScreenMessage(SM_User+212);
const ScreenMessage SM_BattleTrickLevel1 = ScreenMessage(SM_User+301);
const ScreenMessage SM_BattleTrickLevel2 = ScreenMessage(SM_User+302);
const ScreenMessage SM_BattleTrickLevel3 = ScreenMessage(SM_User+303);
const ScreenMessage SM_BattleDamageLevel1 = ScreenMessage(SM_User+304);
const ScreenMessage SM_BattleDamageLevel2 = ScreenMessage(SM_User+305);
const ScreenMessage SM_BattleDamageLevel3 = ScreenMessage(SM_User+306);
#endif
/*
* (c) 2001-2002 Chris Danford
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, and/or sell copies of the Software, and to permit persons to
* whom the Software is furnished to do so, provided that the above
* copyright notice(s) and this permission notice appear in all copies of
* the Software and that both the above copyright notice(s) and this
* permission notice appear in supporting documentation.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
stepmania/src/Inventory.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include "PrefsManager.h"
#include "song.h"
#include "ScreenManager.h"
#include "ScreenGameplay.h"
#include "GameplayMessages.h"
#include "StageStats.h"
#include "ThemeMetric.h"
#include "PlayerState.h"
stepmania/src/Player.cpp
+1
View File
@@ -31,6 +31,7 @@
#include "RageSoundManager.h"
#include "ThemeMetric.h"
#include "PlayerState.h"
#include "GameplayMessages.h"
ThemeMetric<float> GRAY_ARROWS_Y_STANDARD ("Player","ReceptorArrowsYStandard");
ThemeMetric<float> GRAY_ARROWS_Y_REVERSE ("Player","ReceptorArrowsYReverse");
stepmania/src/ScoreKeeperMAX2.cpp
+2 -1
View File
@@ -5,7 +5,7 @@
#include "Steps.h"
#include "PrefsManager.h"
#include "ScreenManager.h"
#include "ScreenGameplay.h"
#include "GameplayMessages.h"
#include "GameState.h"
#include "Course.h"
#include "SongManager.h"
@@ -16,6 +16,7 @@
#include "NetworkSyncManager.h"
#include "PlayerState.h"
#include "Style.h"
#include "Song.h"
ScoreKeeperMAX2::ScoreKeeperMAX2(
const vector<Song*>& apSongs,
stepmania/src/ScreenGameplay.cpp
+1
View File
@@ -43,6 +43,7 @@
#include "ScreenDimensions.h"
#include "ThemeMetric.h"
#include "PlayerState.h"
#include "GameplayMessages.h"
//
// Defines
stepmania/src/ScreenGameplay.h
-24
View File
@@ -27,30 +27,6 @@ class Inventory;
#include "NetworkSyncManager.h"
#include "AutoKeysounds.h"
// messages sent by Combo
const ScreenMessage SM_PlayToasty = ScreenMessage(SM_User+104);
const ScreenMessage SM_100Combo = ScreenMessage(SM_User+200);
const ScreenMessage SM_200Combo = ScreenMessage(SM_User+201);
const ScreenMessage SM_300Combo = ScreenMessage(SM_User+202);
const ScreenMessage SM_400Combo = ScreenMessage(SM_User+203);
const ScreenMessage SM_500Combo = ScreenMessage(SM_User+204);
const ScreenMessage SM_600Combo = ScreenMessage(SM_User+205);
const ScreenMessage SM_700Combo = ScreenMessage(SM_User+206);
const ScreenMessage SM_800Combo = ScreenMessage(SM_User+207);
const ScreenMessage SM_900Combo = ScreenMessage(SM_User+208);
const ScreenMessage SM_1000Combo = ScreenMessage(SM_User+209);
const ScreenMessage SM_ComboStopped = ScreenMessage(SM_User+210);
const ScreenMessage SM_ComboContinuing = ScreenMessage(SM_User+211);
const ScreenMessage SM_MissComboAborted = ScreenMessage(SM_User+212);
const ScreenMessage SM_BattleTrickLevel1 = ScreenMessage(SM_User+301);
const ScreenMessage SM_BattleTrickLevel2 = ScreenMessage(SM_User+302);
const ScreenMessage SM_BattleTrickLevel3 = ScreenMessage(SM_User+303);
const ScreenMessage SM_BattleDamageLevel1 = ScreenMessage(SM_User+304);
const ScreenMessage SM_BattleDamageLevel2 = ScreenMessage(SM_User+305);
const ScreenMessage SM_BattleDamageLevel3 = ScreenMessage(SM_User+306);
class LyricsLoader;
class ScreenGameplay : public Screen
{