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

Left-justified categories in the Options Menu, and fixed DCQ overload

Browse Source 
problems therein.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1503 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2005-02-01 06:56:01 +00:00
parent 51526dc79e
commit 58cba1e5b4
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+3
View File
@@ -1,4 +1,7 @@
Changes towards version 0.4: Changes towards version 0.4:
- Many options menu changes: left-justified categories, and the ability
to change driver/resolution/bpp/scaler in real time, and updates are
less frequent so as to spare the DCQ -McMartin
- PC ending animation now draws the flagship w/ modules according to - PC ending animation now draws the flagship w/ modules according to
the actual player's load; also the script structure changed the actual player's load; also the script structure changed
allowing for an FPS improvement -Alex allowing for an FPS improvement -Alex
sc2/src/sc2code/setupmenu.c
+13 -4
View File
@@ -250,7 +250,7 @@ static MENU_CATEGORY cmdline_opts[] = {
#define NUM_STEPS 20 #define NUM_STEPS 20
#define X_STEP (SCREEN_WIDTH / NUM_STEPS) #define X_STEP (SCREEN_WIDTH / NUM_STEPS)
#define Y_STEP (SCREEN_HEIGHT / NUM_STEPS) #define Y_STEP (SCREEN_HEIGHT / NUM_STEPS)
#define MENU_FRAME_RATE (ONE_SECOND / 60) #define MENU_FRAME_RATE (ONE_SECOND / 20)
static void static void
SetDefaults (void) SetDefaults (void)
@@ -334,8 +334,9 @@ DrawMenu (PSETUP_MENU_STATE pInputState)
{ {
int i, home_x, home_y; int i, home_x, home_y;
t.baseline.x = r.corner.x + (r.extent.width / 8); t.baseline.x = r.corner.x; // + (r.extent.width / 8);
t.baseline.y += 16; t.baseline.y += 16;
t.align = ALIGN_LEFT;
t.pStr = menu->category; t.pStr = menu->category;
if (pInputState->category == cat_index) if (pInputState->category == cat_index)
{ {
@@ -347,8 +348,9 @@ DrawMenu (PSETUP_MENU_STATE pInputState)
} }
font_DrawText (&t); font_DrawText (&t);
home_x = t.baseline.x + (r.extent.width / 4); home_x = t.baseline.x + 3 * (r.extent.width / 8);
home_y = t.baseline.y; home_y = t.baseline.y;
t.align = ALIGN_CENTER;
for (i = 0; i < menu->numopts; i++) for (i = 0; i < menu->numopts; i++)
{ {
t.baseline.x = home_x + ((i % 3) * (r.extent.width / 4)); t.baseline.x = home_x + ((i % 3) * (r.extent.width / 4));
@@ -409,7 +411,14 @@ DoSetupMenu (PSETUP_MENU_STATE pInputState)
{ {
RECT r; RECT r;
COLOR bg, dark, medium; COLOR bg, dark, medium;
int frame = --pInputState->anim_frame_count; int frame;
pInputState->anim_frame_count -= 3;
if (pInputState->anim_frame_count < 0)
{
pInputState->anim_frame_count = 0;
}
frame = pInputState->anim_frame_count;
r.corner.x = ((frame * X_STEP) >> 1) + 2; r.corner.x = ((frame * X_STEP) >> 1) + 2;
r.corner.y = ((frame * Y_STEP) >> 1) + 2; r.corner.y = ((frame * Y_STEP) >> 1) + 2;