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

Naming code cleanup: some abuses of MENU_STATE removed; load savegame info while fading music; some dead code removed

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3309 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-11-17 08:49:22 +00:00
parent 0920380020
commit 8852fcf560
5 changed files with 61 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/gameopt.c
+39 -56
View File
@@ -44,12 +44,15 @@
#define SUMMARY_SIDE_OFFS 7
#define SAVES_PER_PAGE 5
#define MAX_NAME_SIZE SIS_NAME_SIZE
static BOOLEAN DoSettings (MENU_STATE *pMS);
static BOOLEAN DoNaming (MENU_STATE *pMS);
static MENU_STATE *pLocMenuState;
static BYTE prev_save; //keeps track of the last slot that was saved or loaded
static NamingCallback *namingCB;
void
ConfirmSaveLoad (STAMP *MsgStamp)
@@ -188,9 +191,9 @@ FeedbackSetting (BYTE which_setting)
#define DDSHS_BLOCKCUR 2
static BOOLEAN
DrawDescriptionString (MENU_STATE *pMS, COUNT which_string, COUNT state)
DrawDescriptionString (MENU_STATE *pMS, UNICODE *Str, COUNT CursorPos,
COUNT state)
{
COUNT rel_index;
RECT r;
TEXT lf;
COLOR BackGround, ForeGround;
@@ -198,8 +201,6 @@ DrawDescriptionString (MENU_STATE *pMS, COUNT which_string, COUNT state)
LockMutex (GraphicsLock);
rel_index = (COUNT)(which_string - pMS->first_item.y);
{
r.corner.x = 2;
r.extent.width = SHIP_NAME_WIDTH;
@@ -207,7 +208,7 @@ DrawDescriptionString (MENU_STATE *pMS, COUNT which_string, COUNT state)
SetContext (StatusContext);
if (pMS->CurState == CHANGE_CAPTAIN_SETTING)
{
{ // Naming the captain
Font = TinyFont;
r.corner.y = 10;
++r.corner.x;
@@ -218,7 +219,7 @@ DrawDescriptionString (MENU_STATE *pMS, COUNT which_string, COUNT state)
ForeGround = BUILD_COLOR (MAKE_RGB15 (0x0A, 0x1F, 0x1F), 0x0B);
}
else
{
{ // Naming the flagship
Font = StarConFont;
r.corner.y = 20;
lf.baseline.x = r.corner.x + (r.extent.width >> 1);
@@ -232,44 +233,23 @@ DrawDescriptionString (MENU_STATE *pMS, COUNT which_string, COUNT state)
}
SetContextFont (Font);
lf.pStr = ((GAME_DESC *)pMS->Extra)[rel_index];
lf.pStr = Str;
lf.CharCount = (COUNT)~0;
if (!(state & DDSHS_EDIT))
{ // normal state
SetFlashRect (SFR_MENU_3DO);
if (pMS->InputFunc == DoNaming)
{
if (pMS->CurState == CHANGE_CAPTAIN_SETTING)
DrawCaptainsName ();
else
{
DrawFlagshipName (TRUE);
if (pMenuState && pMenuState->InputFunc == DoOutfit)
DrawFlagshipName (FALSE);
}
}
else
{ // XXX: remnants of DOS? this function is never actually
// called outside DoNaming nowadays, which makes this
// code utterly dead
if (state == 0)
{
COLOR OldColor;
OldColor = SetContextForeGroundColor (BLACK_COLOR);
DrawFilledRectangle (&r);
SetContextForeGroundColor (OldColor);
}
font_DrawText (&lf);
}
}
else
{ // editing state
COUNT i;
RECT text_r;
BYTE char_deltas[MAX_DESC_CHARS];
BYTE char_deltas[MAX_NAME_SIZE];
BYTE *pchar_deltas;
TextRect (&lf, &text_r, char_deltas);
@@ -285,18 +265,18 @@ DrawDescriptionString (MENU_STATE *pMS, COUNT which_string, COUNT state)
DrawFilledRectangle (&r);
pchar_deltas = char_deltas;
for (i = pMS->first_item.x; i > 0; --i)
text_r.corner.x += (SIZE)*pchar_deltas++;
if ((COUNT)pMS->first_item.x < lf.CharCount) /* end of line */
for (i = CursorPos; i > 0; --i)
text_r.corner.x += *pchar_deltas++;
if (CursorPos < lf.CharCount) /* end of line */
--text_r.corner.x;
if (state & DDSHS_BLOCKCUR)
{ // Use block cursor for keyboardless systems
if ((COUNT)pMS->first_item.x == lf.CharCount)
if (CursorPos == lf.CharCount)
{ // cursor at end-line -- use insertion point
text_r.extent.width = 1;
}
else if ((COUNT)pMS->first_item.x + 1 == lf.CharCount)
else if (CursorPos + 1 == lf.CharCount)
{ // extra pixel for last char margin
text_r.extent.width = (SIZE)*pchar_deltas + 2;
}
@@ -331,34 +311,23 @@ OnNameChange (TEXTENTRY_STATE *pTES)
MENU_STATE *pMS = (MENU_STATE*) pTES->CbParam;
COUNT hl = DDSHS_EDIT;
pMS->first_item.x = pTES->CursorPos;
if (pTES->JoystickMode)
hl |= DDSHS_BLOCKCUR;
return DrawDescriptionString (pMS, 0, hl);
return DrawDescriptionString (pMS, pTES->BaseStr, pTES->CursorPos, hl);
}
static BOOLEAN
DoNaming (MENU_STATE *pMS)
{
GAME_DESC buf;
UNICODE buf[MAX_NAME_SIZE] = "";
TEXTENTRY_STATE tes;
UNICODE *Setting;
pMS->Initialized = TRUE;
pMS->InputFunc = DoNaming;
buf[0] = '\0';
// XXX: this code abuses MENU_STATE struct members to store
// some values:
// first_item.x - current cursor position
// first_item.y - must be set to 0; DrawDescriptionString()
// treats it as base index into array of strings
// supplied in Extra
pMS->first_item.x = 0;
pMS->first_item.y = 0;
pMS->Extra = buf;
DrawDescriptionString (pMS, 0, DDSHS_EDIT);
DrawDescriptionString (pMS, buf, 0, DDSHS_EDIT);
LockMutex (GraphicsLock);
DrawStatusMessage (GAME_STRING (NAMING_STRING_BASE + 0));
@@ -388,7 +357,10 @@ DoNaming (MENU_STATE *pMS)
utf8StringCopy (Setting, tes.MaxSize, buf);
else
utf8StringCopy (buf, sizeof (buf), Setting);
DrawDescriptionString (pMS, 0, DDSHS_NORMAL);
DrawDescriptionString (pMS, buf, 0, DDSHS_NORMAL);
if (namingCB)
namingCB ();
SetMenuSounds (MENU_SOUND_ARROWS, MENU_SOUND_SELECT);
@@ -399,6 +371,12 @@ DoNaming (MENU_STATE *pMS)
return (TRUE);
}
void
SetNamingCallback (NamingCallback *callback)
{
namingCB = callback;
}
static BOOLEAN
DoSettings (MENU_STATE *pMS)
{
@@ -867,11 +845,6 @@ DoPickGame (MENU_STATE *pMS)
pMS->delta_item = (SIZE)pMS->CurState;
pMS->CurState = NewState = prev_save;
pMS->InputFunc = DoPickGame;
SleepThreadUntil ((DWORD)pMS->CurFrame);
pMS->CurFrame = 0;
PauseMusic ();
StopSound ();
FadeMusic (NORMAL_VOLUME, 0);
{
extern FRAME PlayFrame;
@@ -884,7 +857,6 @@ DoPickGame (MENU_STATE *pMS)
BatchGraphics ();
Restart:
SetContext (SpaceContext);
LoadGameDescriptions ((SUMMARY_DESC *)pMS->Extra);
DrawCargo (1);
pMS->Initialized = TRUE;
goto ChangeGameSelection;
@@ -941,6 +913,7 @@ Restart:
SaveProblem ();
pMS->Initialized = FALSE;
LoadGameDescriptions ((SUMMARY_DESC *)pMS->Extra);
NewState = pMS->CurState;
LockMutex (GraphicsLock);
BatchGraphics ();
@@ -1139,6 +1112,9 @@ PickGame (MENU_STATE *pMS)
SUMMARY_DESC desc_array[MAX_SAVED_GAMES];
RECT DlgRect;
STAMP DlgStamp;
TimeCount TimeOut;
TimeOut = FadeMusic (0, ONE_SECOND / 2);
if (pSolarSysState)
{
@@ -1147,6 +1123,8 @@ PickGame (MENU_STATE *pMS)
TaskSwitch ();
}
LoadGameDescriptions (desc_array);
LockMutex (GraphicsLock);
OldContext = SetContext (SpaceContext);
@@ -1164,6 +1142,11 @@ PickGame (MENU_STATE *pMS)
pMS->Extra = desc_array;
UnlockMutex (GraphicsLock);
SleepThreadUntil (TimeOut);
PauseMusic ();
StopSound ();
FadeMusic (NORMAL_VOLUME, 0);
DoInput (pMS, TRUE);
LockMutex (GraphicsLock);
pMS->Initialized = -1;
@@ -1179,7 +1162,7 @@ PickGame (MENU_STATE *pMS)
}
if (!(GLOBAL (CurrentActivity) & (CHECK_ABORT | CHECK_LOAD)))
{
{ // Restore previous screen if necessary
// TODO: Need a better test for in-encounter
if (CommData.ConversationPhrasesRes
|| !(pSolarSysState
sc2/src/uqm/gameopt.h
+3
View File
@@ -22,5 +22,8 @@
extern void ConfirmSaveLoad (STAMP *MsgStamp);
extern BOOLEAN GameOptions (void);
typedef void (NamingCallback) (void);
extern void SetNamingCallback (NamingCallback *);
#endif /* _GAMEOPT_H */
sc2/src/uqm/outfit.c
+13
View File
@@ -609,6 +609,15 @@ ChangeFuelQuantity (void)
}
}
static void
onNamingDone (void)
{
// In case player just named a ship, redraw it
LockMutex (GraphicsLock);
DrawFlagshipName (FALSE);
UnlockMutex (GraphicsLock);
}
BOOLEAN
DoOutfit (MENU_STATE *pMS)
{
@@ -620,6 +629,8 @@ DoOutfit (MENU_STATE *pMS)
pMS->InputFunc = DoOutfit;
pMS->Initialized = TRUE;
SetNamingCallback (onNamingDone);
{
COUNT num_frames;
STAMP s;
@@ -747,6 +758,8 @@ ExitOutfit:
DestroyDrawable (ReleaseDrawable (pMS->ModuleFrame));
pMS->ModuleFrame = 0;
SetNamingCallback (NULL);
return (FALSE);
}
}
sc2/src/uqm/sis.c
+3 -1
View File
@@ -237,7 +237,9 @@ DrawSISMessageEx (const UNICODE *pStr, SIZE CurPos, SIZE ExPos, COUNT flags)
{ // editing state
int i;
RECT text_r;
BYTE char_deltas[MAX_DESC_CHARS];
// XXX: 128 is currently safe, but it would be better to specify
// the size to TextRect()
BYTE char_deltas[128];
BYTE *pchar_deltas;
t.baseline.x = 3;
sc2/src/uqm/state.h
-3
View File
@@ -46,9 +46,6 @@ extern DWORD PutGroupInfo (DWORD offset, BYTE which_group);
// (GROUP_LIST) in one of the state files
extern void BuildGroups (void);
#define MAX_DESC_CHARS 60
typedef UNICODE GAME_DESC[MAX_DESC_CHARS + 1];
typedef struct GAME_STATE_FILE GAME_STATE_FILE;
#define STARINFO_FILE 0