From 27b12d32281fea36fcda589ae86315faec7877aa Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 22 Apr 2005 04:58:32 +0000 Subject: [PATCH] rename MEMORY_CARD_STATE_WRITE_ERROR -> MEMORY_CARD_STATE_ERROR --- stepmania/src/GameConstantsAndTypes.h | 2 +- stepmania/src/MemoryCardManager.cpp | 4 ++-- stepmania/src/ScreenSystemLayer.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index f340cbdd66..f90f928011 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -177,7 +177,7 @@ enum MemoryCardState MEMORY_CARD_STATE_READY, MEMORY_CARD_STATE_CHECKING, MEMORY_CARD_STATE_TOO_LATE, - MEMORY_CARD_STATE_WRITE_ERROR, + MEMORY_CARD_STATE_ERROR, MEMORY_CARD_STATE_REMOVED, MEMORY_CARD_STATE_NO_CARD, NUM_MEMORY_CARD_STATES, diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp index 994ddcd280..fd8f7fd385 100644 --- a/stepmania/src/MemoryCardManager.cpp +++ b/stepmania/src/MemoryCardManager.cpp @@ -457,7 +457,7 @@ void MemoryCardManager::CheckStateChanges() break; case UsbStorageDevice::STATE_WRITE_ERROR: - state = MEMORY_CARD_STATE_WRITE_ERROR; + state = MEMORY_CARD_STATE_ERROR; break; case UsbStorageDevice::STATE_READY: @@ -483,7 +483,7 @@ void MemoryCardManager::CheckStateChanges() case MEMORY_CARD_STATE_TOO_LATE: m_soundTooLate.Play(); break; - case MEMORY_CARD_STATE_WRITE_ERROR: + case MEMORY_CARD_STATE_ERROR: m_soundError.Play(); break; } diff --git a/stepmania/src/ScreenSystemLayer.cpp b/stepmania/src/ScreenSystemLayer.cpp index cd6f2d019a..3807b4af9c 100644 --- a/stepmania/src/ScreenSystemLayer.cpp +++ b/stepmania/src/ScreenSystemLayer.cpp @@ -145,7 +145,7 @@ CString ScreenSystemLayer::GetCreditsMessage( PlayerNumber pn ) const else return ""; - case MEMORY_CARD_STATE_WRITE_ERROR: return CREDITS_CARD_ERROR.GetValue(); + case MEMORY_CARD_STATE_ERROR: return CREDITS_CARD_ERROR.GetValue(); case MEMORY_CARD_STATE_TOO_LATE: return CREDITS_CARD_TOO_LATE.GetValue(); case MEMORY_CARD_STATE_CHECKING: return CREDITS_CARD_CHECKING.GetValue(); case MEMORY_CARD_STATE_REMOVED: return CREDITS_CARD_REMOVED.GetValue();