adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More appropriate names for ROSTER + 1 and ROSTER + 2, from slayne

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@345 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
gewlitys
2002-12-05 19:39:46 +00:00
parent 1b6fbacf1f
commit d7e79800d6
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/planets/planets.h
+3 -1
View File
@@ -27,7 +27,9 @@ enum
STARMAP, STARMAP,
EQUIP_DEVICE, EQUIP_DEVICE,
CARGO, CARGO,
ROSTER ROSTER,
GAME_MENU,
NAVIGATION
}; };
enum enum
sc2/src/sc2code/planets/pstarmap.c
+8 -8
View File
@@ -1172,7 +1172,7 @@ DoFlagshipCommands (INPUT_STATE InputState, PMENU_STATE pMS)
if ((InputState & DEVICE_BUTTON1) || LastActivity == CHECK_LOAD) if ((InputState & DEVICE_BUTTON1) || LastActivity == CHECK_LOAD)
{ {
CONTEXT OldContext; CONTEXT OldContext;
if (NewState != SCAN + 1 && NewState != (ROSTER + 1) + 1) if (NewState != SCAN + 1 && NewState != (GAME_MENU) + 1)
{ {
SetSemaphore (GraphicsSem); SetSemaphore (GraphicsSem);
SetFlashRect (NULL_PTR, (FRAME)0); SetFlashRect (NULL_PTR, (FRAME)0);
@@ -1217,7 +1217,7 @@ DoFlagshipCommands (INPUT_STATE InputState, PMENU_STATE pMS)
InputState &= ~DEVICE_BUTTON1; InputState &= ~DEVICE_BUTTON1;
break; break;
} }
case ROSTER + 1: case GAME_MENU:
if (GameOptions () == 0) if (GameOptions () == 0)
return (FALSE); return (FALSE);
@@ -1274,7 +1274,7 @@ DoFlagshipCommands (INPUT_STATE InputState, PMENU_STATE pMS)
break; break;
} }
} }
case ROSTER + 2: case NAVIGATION:
if (LOBYTE (GLOBAL (CurrentActivity)) == IN_HYPERSPACE) if (LOBYTE (GLOBAL (CurrentActivity)) == IN_HYPERSPACE)
return (FALSE); return (FALSE);
@@ -1307,8 +1307,8 @@ DoFlagshipCommands (INPUT_STATE InputState, PMENU_STATE pMS)
ClearSemaphore (GraphicsSem); ClearSemaphore (GraphicsSem);
if (InputState & DEVICE_BUTTON1) if (InputState & DEVICE_BUTTON1)
{ {
pMS->CurState = (ROSTER + 2) + 1; pMS->CurState = (NAVIGATION) + 1;
DrawMenuStateStrings (PM_SCAN, ROSTER + 2); DrawMenuStateStrings (PM_SCAN, NAVIGATION);
} }
} }
else else
@@ -1316,7 +1316,7 @@ DoFlagshipCommands (INPUT_STATE InputState, PMENU_STATE pMS)
SetSemaphore (GraphicsSem); SetSemaphore (GraphicsSem);
SetFlashRect (NULL_PTR, (FRAME)0); SetFlashRect (NULL_PTR, (FRAME)0);
ClearSemaphore (GraphicsSem); ClearSemaphore (GraphicsSem);
DrawMenuStateStrings (PM_SCAN, ROSTER + 2); DrawMenuStateStrings (PM_SCAN, NAVIGATION);
} }
} }
else else
@@ -1328,12 +1328,12 @@ DoFlagshipCommands (INPUT_STATE InputState, PMENU_STATE pMS)
|| GetInputYComponent (InputState) < 0) || GetInputYComponent (InputState) < 0)
{ {
if (NewState-- == (BYTE)(FirstState + 1)) if (NewState-- == (BYTE)(FirstState + 1))
NewState = (ROSTER + 2) + 1; NewState = (NAVIGATION) + 1;
} }
else if (GetInputXComponent (InputState) > 0 else if (GetInputXComponent (InputState) > 0
|| GetInputYComponent (InputState) > 0) || GetInputYComponent (InputState) > 0)
{ {
if (NewState++ == (ROSTER + 2) + 1) if (NewState++ == (NAVIGATION) + 1)
NewState = (BYTE)(FirstState + 1); NewState = (BYTE)(FirstState + 1);
} }