Skip to content

Commit

Permalink
severely cripple memorycardman
Browse files Browse the repository at this point in the history
  • Loading branch information
MinaciousGrace committed May 5, 2017
1 parent f87046d commit 446f809
Show file tree
Hide file tree
Showing 41 changed files with 27 additions and 4,148 deletions.
11 changes: 0 additions & 11 deletions src/GameConstantsAndTypes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -328,17 +328,6 @@ static const char *ProfileSlotNames[] = {
XToString( ProfileSlot );
LuaXType( ProfileSlot );

static const char *MemoryCardStateNames[] = {
"ready",
"checking",
"late",
"error",
"removed",
"none",
};
XToString( MemoryCardState );
LuaXType( MemoryCardState );

static const char *StageAwardNames[] = {
"FullComboW3",
"SingleDigitW3",
Expand Down
16 changes: 0 additions & 16 deletions src/GameConstantsAndTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -339,22 +339,6 @@ enum ProfileSlot
const RString& ProfileSlotToString( ProfileSlot ps );
LuaDeclareType( ProfileSlot );

/** @brief The states of the memory card during play. */
enum MemoryCardState
{
MemoryCardState_Ready,
MemoryCardState_Checking,
MemoryCardState_TooLate,
MemoryCardState_Error,
MemoryCardState_Removed,
MemoryCardState_NoCard,
NUM_MemoryCardState,
MemoryCardState_Invalid,
};

const RString& MemoryCardStateToString( MemoryCardState mcs );
LuaDeclareType( MemoryCardState );

/** @brief The different ranking categories based on difficulty meter average. */
enum RankingCategory
{
Expand Down
2 changes: 0 additions & 2 deletions src/GameLoop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include "ThemeManager.h"
#include "SongManager.h"
#include "GameState.h"
#include "MemoryCardManager.h"
#include "ScreenManager.h"
#include "InputFilter.h"
#include "InputMapper.h"
Expand Down Expand Up @@ -293,7 +292,6 @@ void GameLoop::RunGameLoop()
TEXTUREMAN->Update( fDeltaTime );
GAMESTATE->Update( fDeltaTime );
SCREENMAN->Update( fDeltaTime );
MEMCARDMAN->Update();
NSMAN->Update( fDeltaTime );

/* Important: Process input AFTER updating game logic, or input will be
Expand Down
39 changes: 1 addition & 38 deletions src/GameState.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include "HighScore.h"
#include "LuaReference.h"
#include "MessageManager.h"
#include "MemoryCardManager.h"
#include "NoteData.h"
#include "NoteSkinManager.h"
#include "PlayerState.h"
Expand Down Expand Up @@ -283,8 +282,7 @@ void GameState::Reset()
SetCurrentStyle( NULL, PLAYER_INVALID );
FOREACH_MultiPlayer( p )
m_MultiPlayerStatus[p] = MultiPlayerStatus_NotJoined;
FOREACH_PlayerNumber( pn )
MEMCARDMAN->UnlockCard( pn );

//m_iCoins = 0; // don't reset coin count!
m_bMultiplayer = false;
m_iNumMultiplayerNoteFields = 1;
Expand Down Expand Up @@ -554,36 +552,21 @@ void GameState::BeginGame()
// Play attract on the ending screen, then on the ranking screen
// even if attract sounds are set to off.
m_iNumTimesThroughAttract = -1;

FOREACH_PlayerNumber( pn )
MEMCARDMAN->UnlockCard( pn );
}

void GameState::LoadProfiles( bool bLoadEdits )
{
// Unlock any cards that we might want to load.
FOREACH_HumanPlayer( pn )
if( !PROFILEMAN->IsPersistentProfile(pn) )
MEMCARDMAN->UnlockCard( pn );

MEMCARDMAN->WaitForCheckingToComplete();

FOREACH_HumanPlayer( pn )
{
// If a profile is already loaded, this was already called.
if( PROFILEMAN->IsPersistentProfile(pn) )
continue;

MEMCARDMAN->MountCard( pn );
bool bSuccess = PROFILEMAN->LoadFirstAvailableProfile( pn, bLoadEdits ); // load full profile
MEMCARDMAN->UnmountCard( pn );

if( !bSuccess )
continue;

// Lock the card on successful load, so we won't allow it to be changed.
MEMCARDMAN->LockCard( pn );

LoadCurrentSettingsFromProfile( pn );

Profile* pPlayerProfile = PROFILEMAN->GetProfile( pn );
Expand All @@ -609,12 +592,7 @@ void GameState::SavePlayerProfile( PlayerNumber pn )
if( m_pPlayerState[pn]->m_PlayerController != PC_HUMAN )
return;

bool bWasMemoryCard = PROFILEMAN->ProfileWasLoadedFromMemoryCard(pn);
if( bWasMemoryCard )
MEMCARDMAN->MountCard( pn );
PROFILEMAN->SaveProfile( pn );
if( bWasMemoryCard )
MEMCARDMAN->UnmountCard( pn );
}

bool GameState::HaveProfileToLoad()
Expand All @@ -625,9 +603,6 @@ bool GameState::HaveProfileToLoad()
if( PROFILEMAN->IsPersistentProfile(pn) )
continue;

// If a memory card is inserted, we'l try to load it.
if( MEMCARDMAN->CardInserted(pn) )
return true;
if( !PROFILEMAN->m_sDefaultLocalProfileID[pn].Get().empty() )
return true;
}
Expand Down Expand Up @@ -2482,17 +2457,6 @@ class LunaGameState: public Luna<GameState>
LuaHelpers::Push( L, pStyle );
return 1;
}
static int IsAnyHumanPlayerUsingMemoryCard( T* , lua_State *L )
{
bool bUsingMemoryCard = false;
FOREACH_HumanPlayer( pn )
{
if( MEMCARDMAN->GetCardState(pn) == MemoryCardState_Ready )
bUsingMemoryCard = true;
}
lua_pushboolean(L, bUsingMemoryCard );
return 1;
}
static int GetNumStagesForCurrentSongAndStepsOrCourse( T* , lua_State *L )
{
lua_pushnumber(L, GAMESTATE->GetNumStagesForCurrentSongAndStepsOrCourse() );
Expand Down Expand Up @@ -2813,7 +2777,6 @@ class LunaGameState: public Luna<GameState>
ADD_METHOD( GetHumanPlayers );
ADD_METHOD( GetEnabledPlayers );
ADD_METHOD( GetCurrentStyle );
ADD_METHOD( IsAnyHumanPlayerUsingMemoryCard );
ADD_METHOD( GetNumStagesForCurrentSongAndStepsOrCourse );
ADD_METHOD( GetNumStagesLeft );
ADD_METHOD( GetGameSeed );
Expand Down
81 changes: 0 additions & 81 deletions src/MemoryCardDisplay.cpp
Original file line number Diff line number Diff line change
@@ -1,81 +0,0 @@
#include "global.h"
#include "MemoryCardDisplay.h"
#include "ThemeManager.h"
#include "MemoryCardManager.h"
#include "RageUtil.h"
#include "XmlFile.h"
#include "ActorUtil.h"

REGISTER_ACTOR_CLASS( MemoryCardDisplay );

MemoryCardDisplay::MemoryCardDisplay()
{
m_PlayerNumber = PLAYER_INVALID;
m_LastSeenState = MemoryCardState_Invalid;
}

void MemoryCardDisplay::Load( PlayerNumber pn )
{
m_PlayerNumber = pn;

for( int i=0; i<NUM_MemoryCardState; i++ )
{
MemoryCardState mcs = (MemoryCardState)i;
RString sState = MemoryCardStateToString(mcs);
m_spr[i].Load( THEME->GetPathG("MemoryCardDisplay",ssprintf("%s p%d",sState.c_str(),pn+1)) );
m_spr[i].SetVisible( false );
this->AddChild( &m_spr[i] );
}
}

void MemoryCardDisplay::LoadFromNode( const XNode* pNode )
{
Lua *L = LUA->Get();
pNode->PushAttrValue( L, "PlayerNumber" );
PlayerNumber pn;
LuaHelpers::Pop( L, pn );
LUA->Release(L);

Load( pn );

ActorFrame::LoadFromNode( pNode );
}

void MemoryCardDisplay::Update( float fDelta )
{
MemoryCardState newMcs = MEMCARDMAN->GetCardState(m_PlayerNumber);
if( m_LastSeenState != newMcs )
{
if( m_LastSeenState != MemoryCardState_Invalid )
m_spr[m_LastSeenState].SetVisible( false );
m_LastSeenState = newMcs;
m_spr[m_LastSeenState].SetVisible( true );
}

ActorFrame::Update( fDelta );
}

/*
* (c) 2003 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.
*/
50 changes: 0 additions & 50 deletions src/MemoryCardDisplay.h
Original file line number Diff line number Diff line change
@@ -1,50 +0,0 @@
#ifndef MEMORY_CARD_DISPLAY_H
#define MEMORY_CARD_DISPLAY_H

#include "GameConstantsAndTypes.h"
#include "PlayerNumber.h"
#include "Sprite.h"
#include "ActorFrame.h"
/** @brief A graphic displaying the state of memory cards. */
class MemoryCardDisplay : public ActorFrame
{
public:
MemoryCardDisplay();
void Load( PlayerNumber pn );
void LoadFromNode( const XNode* pNode );
virtual MemoryCardDisplay *Copy() const;
void Update( float fDelta );

protected:
PlayerNumber m_PlayerNumber;
MemoryCardState m_LastSeenState;
// todo: make this an AutoActor eventually -aj
Sprite m_spr[NUM_MemoryCardState];
};

#endif

/*
* (c) 2003 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.
*/
Loading

0 comments on commit 446f809

Please sign in to comment.