Song Backgrounds no longer show in editor

This commit is contained in:
Chris Danford
2002-10-08 00:39:31 +00:00
parent 838dec544b
commit b1a58e30b4
2 changed files with 12 additions and 12 deletions
+3 -3
View File
@@ -217,7 +217,7 @@ ScreenEdit::ScreenEdit()
GAMESTATE->m_PlayerOptions[PLAYER_1].m_fArrowScrollSpeed = 1; GAMESTATE->m_PlayerOptions[PLAYER_1].m_fArrowScrollSpeed = 1;
GAMESTATE->m_PlayerOptions[PLAYER_1].m_ColorType = PlayerOptions::COLOR_NOTE; GAMESTATE->m_PlayerOptions[PLAYER_1].m_ColorType = PlayerOptions::COLOR_NOTE;
m_Background.LoadFromSong( m_pSong ); m_BGAnimation.LoadFromAniDir( THEME->GetPathTo("BGAnimations","edit") );
shiftAnchor = -1; shiftAnchor = -1;
m_SnapDisplay.SetXY( EDIT_X, EDIT_GRAY_Y ); m_SnapDisplay.SetXY( EDIT_X, EDIT_GRAY_Y );
@@ -359,7 +359,7 @@ void ScreenEdit::Update( float fDeltaTime )
} }
} }
m_Background.Update( fDeltaTime ); m_BGAnimation.Update( fDeltaTime );
m_SnapDisplay.Update( fDeltaTime ); m_SnapDisplay.Update( fDeltaTime );
m_GrayArrowRowEdit.Update( fDeltaTime ); m_GrayArrowRowEdit.Update( fDeltaTime );
m_NoteFieldEdit.Update( fDeltaTime ); m_NoteFieldEdit.Update( fDeltaTime );
@@ -501,7 +501,7 @@ void ScreenEdit::Update( float fDeltaTime )
void ScreenEdit::DrawPrimitives() void ScreenEdit::DrawPrimitives()
{ {
m_Background.Draw(); m_BGAnimation.Draw();
m_SnapDisplay.Draw(); m_SnapDisplay.Draw();
m_GrayArrowRowEdit.Draw(); m_GrayArrowRowEdit.Draw();
+9 -9
View File
@@ -18,7 +18,7 @@
#include "FocusingSprite.h" #include "FocusingSprite.h"
#include "RageMusic.h" #include "RageMusic.h"
#include "MotionBlurSprite.h" #include "MotionBlurSprite.h"
#include "Background.h" #include "BGAnimation.h"
#include "SnapDisplay.h" #include "SnapDisplay.h"
@@ -55,16 +55,16 @@ protected:
Song* m_pSong; Song* m_pSong;
Notes* m_pNotes; Notes* m_pNotes;
Background m_Background; BGAnimation m_BGAnimation;
NoteField m_NoteFieldEdit; NoteField m_NoteFieldEdit;
SnapDisplay m_SnapDisplay; SnapDisplay m_SnapDisplay;
GrayArrowRow m_GrayArrowRowEdit; GrayArrowRow m_GrayArrowRowEdit;
BitmapText m_textInfo; // status information that changes BitmapText m_textInfo; // status information that changes
BitmapText m_textHelp; BitmapText m_textHelp;
Quad m_rectShortcutsBack; Quad m_rectShortcutsBack;
BitmapText m_textShortcuts; BitmapText m_textShortcuts;
// keep track of where we are and what we're doing // keep track of where we are and what we're doing
float m_fTrailingBeat; // this approaches GAMESTATE->m_fSongBeat, which is the actual beat float m_fTrailingBeat; // this approaches GAMESTATE->m_fSongBeat, which is the actual beat