enum name cleanup

This commit is contained in:
Chris Danford
2005-12-01 03:20:25 +00:00
parent 1829ba9eee
commit 36c7d8e0ed
26 changed files with 164 additions and 139 deletions
+9 -9
View File
@@ -212,14 +212,14 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
//
switch( action )
{
case EDIT_MENU_ACTION_EDIT:
case EDIT_MENU_ACTION_PRACTICE:
case EditMenuAction_Edit:
case EditMenuAction_Practice:
break;
case EDIT_MENU_ACTION_DELETE:
case EditMenuAction_Delete:
ASSERT( pSteps );
ScreenPrompt::Prompt( SM_None, "These steps will be lost permanently.\n\nContinue with delete?", PROMPT_YES_NO, ANSWER_NO );
break;
case EDIT_MENU_ACTION_CREATE:
case EditMenuAction_Create:
ASSERT( !pSteps );
{
// Yuck. Doing the memory allocation doesn't seem right since
@@ -259,13 +259,13 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
//
switch( action )
{
case EDIT_MENU_ACTION_EDIT:
case EDIT_MENU_ACTION_CREATE:
case EDIT_MENU_ACTION_PRACTICE:
case EditMenuAction_Edit:
case EditMenuAction_Create:
case EditMenuAction_Practice:
{
// Prepare prepare for ScreenEdit
ASSERT( pSteps );
bool bPromptToNameSteps = (action == EDIT_MENU_ACTION_CREATE && dc == DIFFICULTY_EDIT);
bool bPromptToNameSteps = (action == EditMenuAction_Create && dc == DIFFICULTY_EDIT);
if( bPromptToNameSteps )
{
ScreenTextEntry::TextEntry(
@@ -285,7 +285,7 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
}
}
break;
case EDIT_MENU_ACTION_DELETE:
case EditMenuAction_Delete:
break;
default:
ASSERT(0);