Pump Theme Fixes
This commit is contained in:
Andrew Livy
+6
-2
@@ -3,9 +3,13 @@ X denotes task complete or no longer required to do.
|
||||
- denotes task to do, but also being worked upon by other dev.
|
||||
H denotes task on hold.
|
||||
|
||||
TODO As of: 12:26 03/02/28
|
||||
* Mathematics Assignment
|
||||
* Integrating Assignment 3
|
||||
|
||||
TODO As of: 16:57 03/02/08
|
||||
* Object Oriented Design 2 Assignment
|
||||
* Operating Systems 2 Assignment
|
||||
X Object Oriented Design 2 Assignment
|
||||
X Operating Systems 2 Assignment
|
||||
* Systems Programming 2 Assignment
|
||||
* Para-Style EndScreens
|
||||
* Para-Style Scoreboard
|
||||
|
||||
@@ -1 +1 @@
|
||||
header1
|
||||
_shared1
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
ScreenSelectMusicEz2 difficulty frame.png
|
||||
@@ -0,0 +1 @@
|
||||
ScreenSelectMusicEz2 infoframe.png
|
||||
@@ -0,0 +1 @@
|
||||
ScreenSelectMusicEz2 mirroricon.png
|
||||
@@ -0,0 +1 @@
|
||||
ScreenSelectMusic options message 1x2.png
|
||||
@@ -0,0 +1 @@
|
||||
ScreenSelectMusicEz2 shuffleicon.png
|
||||
@@ -0,0 +1 @@
|
||||
ScreenSelectMusicEz2 speedicon.png
|
||||
@@ -24,8 +24,8 @@ public:
|
||||
|
||||
#endif
|
||||
/*
|
||||
-----------------------------------------------------------------------------
|
||||
------------------------------------------------------------------------------
|
||||
Copyright (c) 2002-2003 by the person(s) listed below. All rights reserved.
|
||||
Glenn Maynard
|
||||
-----------------------------------------------------------------------------
|
||||
------------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
@@ -57,6 +57,8 @@ const ScreenMessage SM_NoSongs = ScreenMessage(SM_User+3);
|
||||
|
||||
ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
|
||||
{
|
||||
m_bTransitioning = false;
|
||||
m_fRemainingWaitTime = 0.0f;
|
||||
i_ErrorDetected=0;
|
||||
CodeDetector::RefreshCacheItems();
|
||||
|
||||
@@ -341,6 +343,7 @@ void ScreenEz2SelectMusic::MenuStart( PlayerNumber pn )
|
||||
}
|
||||
|
||||
m_bMadeChoice = true;
|
||||
m_fRemainingWaitTime = RageTimer::GetTimeSinceStart();
|
||||
|
||||
TweenOffScreen();
|
||||
|
||||
@@ -353,8 +356,6 @@ void ScreenEz2SelectMusic::MenuStart( PlayerNumber pn )
|
||||
m_sprOptionsMessage.BeginTweening( 0.25f ); // fade out
|
||||
m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) );
|
||||
m_sprOptionsMessage.SetZoomY( 0 );
|
||||
|
||||
m_Menu.StartTransitioning( SM_GoToNextScreen );
|
||||
}
|
||||
|
||||
|
||||
@@ -367,6 +368,12 @@ void ScreenEz2SelectMusic::Update( float fDeltaTime )
|
||||
this->PostScreenMessage( SM_NoSongs, 5.5f ); // timeout incase the user decides to do nothing :D
|
||||
}
|
||||
|
||||
if(m_bMadeChoice && RageTimer::GetTimeSinceStart() > m_fRemainingWaitTime + 2 && !m_bTransitioning)
|
||||
{
|
||||
m_bTransitioning = true;
|
||||
m_Menu.StartTransitioning( SM_GoToNextScreen );
|
||||
}
|
||||
|
||||
Screen::Update( fDeltaTime );
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "MenuElements.h"
|
||||
#include "DifficultyMeter.h"
|
||||
#include "DifficultyRating.h"
|
||||
|
||||
#include "RageTimer.h"
|
||||
|
||||
class ScreenEz2SelectMusic : public Screen
|
||||
{
|
||||
@@ -50,6 +50,7 @@ protected:
|
||||
|
||||
void TweenOffScreen();
|
||||
|
||||
|
||||
Sprite m_ChoiceListFrame;
|
||||
Sprite m_ChoiceListHighlight;
|
||||
Sprite m_Guide;
|
||||
@@ -65,6 +66,7 @@ protected:
|
||||
RageSound m_soundMusicChange;
|
||||
RageSound m_soundMusicCycle;
|
||||
|
||||
float m_fRemainingWaitTime;
|
||||
MusicBannerWheel m_MusicBannerWheel;
|
||||
MenuElements m_Menu;
|
||||
DifficultyRating m_DifficultyRating;
|
||||
@@ -73,6 +75,7 @@ protected:
|
||||
int m_iSelection[NUM_PLAYERS];
|
||||
bool m_bGoToOptions;
|
||||
bool m_bMadeChoice;
|
||||
bool m_bTransitioning;
|
||||
|
||||
int i_ErrorDetected;
|
||||
|
||||
|
||||
@@ -44,6 +44,7 @@
|
||||
//
|
||||
#define PREV_SCREEN( play_mode ) THEME->GetMetric ("ScreenGameplay","PrevScreen"+Capitalize(PlayModeToString(play_mode)))
|
||||
#define NEXT_SCREEN( play_mode ) THEME->GetMetric ("ScreenGameplay","NextScreen"+Capitalize(PlayModeToString(play_mode)))
|
||||
|
||||
CachedThemeMetricF SECONDS_BETWEEN_COMMENTS ("ScreenGameplay","SecondsBetweenComments");
|
||||
CachedThemeMetricF G_TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds");
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "global.h"
|
||||
/****************************************
|
||||
ScreenSelectModeOld,cpp
|
||||
ScreenSelectMode.cpp
|
||||
Desc: See Header
|
||||
Copyright (C):
|
||||
Andrew Livy
|
||||
|
||||
@@ -15,7 +15,9 @@ Andrew Livy
|
||||
#include "ScrollingList.h"
|
||||
#include "GameConstantsAndTypes.h"
|
||||
#include "ModeChoice.h"
|
||||
|
||||
#include "BitmapText.h"
|
||||
// #include "TransitionFade.h"
|
||||
#include "RandomSample.h"
|
||||
|
||||
/* Class Definition */
|
||||
|
||||
|
||||
@@ -31,6 +31,7 @@ void MakeInputHandlers(vector<InputHandler *> &Add)
|
||||
|
||||
#if defined(WIN32)
|
||||
Add.push_back(new InputHandler_Win32_Pump);
|
||||
// Add.push_back(new InputHandler_Win32_Para);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "ArchHooks/ArchHooks_Win32.h"
|
||||
|
||||
#include "InputHandler/InputHandler_Win32_Pump.h"
|
||||
// #include "InputHandler/InputHandler_Win32_Para.h"
|
||||
|
||||
#include "Sound/RageSoundDriver_DSound.h"
|
||||
#include "Sound/RageSoundDriver_DSound_Software.h"
|
||||
|
||||
Reference in New Issue
Block a user