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

Comment content strings; whitespace fixes.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2545 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2006-11-25 23:48:21 +00:00
parent 55a56221b2
commit f7e655afd6
1 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/cnctdlg.c
+30 -19
View File
@@ -163,8 +163,8 @@ MCD_DrawSlider (WIDGET *_self, int x, int y)
r.extent.width = 3; r.extent.width = 3;
r.extent.height = 8; r.extent.height = 8;
r.corner.y = t.baseline.y - 7; r.corner.y = t.baseline.y - 7;
r.corner.x = t.baseline.x + 3 * tick + (3 * tick * (self->value - self->min) / r.corner.x = t.baseline.x + 3 * tick + (3 * tick *
(self->max - self->min)) - 1; (self->value - self->min) / (self->max - self->min)) - 1;
DrawFilledRectangle (&r); DrawFilledRectangle (&r);
(*self->draw_value)(self, t.baseline.x + 7 * tick, t.baseline.y); (*self->draw_value)(self, t.baseline.x + 7 * tick, t.baseline.y);
@@ -387,7 +387,7 @@ OnTextEntryEvent (WIDGET_TEXTENTRY *widget)
/* Button response routines */ /* Button response routines */
static int static int
do_connect (WIDGET *self, int event) do_connect (WIDGET *self, int event)
{ {
if (event == WIDGET_EVENT_SELECT) if (event == WIDGET_EVENT_SELECT)
@@ -405,7 +405,7 @@ do_connect (WIDGET *self, int event)
return FALSE; return FALSE;
} }
static int static int
do_listen (WIDGET *self, int event) do_listen (WIDGET *self, int event)
{ {
if (event == WIDGET_EVENT_SELECT) if (event == WIDGET_EVENT_SELECT)
@@ -421,7 +421,7 @@ do_listen (WIDGET *self, int event)
return FALSE; return FALSE;
} }
static int static int
do_cancel (WIDGET *self, int event) do_cancel (WIDGET *self, int event)
{ {
if (event == WIDGET_EVENT_SELECT) if (event == WIDGET_EVENT_SELECT)
@@ -451,8 +451,11 @@ CreateWidgets (void)
buttons[i].width = Widget_WidthFullScreen; buttons[i].width = Widget_WidthFullScreen;
} }
buttons[0].name = GAME_STRING (NETMELEE_STRING_BASE + 19); buttons[0].name = GAME_STRING (NETMELEE_STRING_BASE + 19);
// "Connect to remote host"
buttons[1].name = GAME_STRING (NETMELEE_STRING_BASE + 20); buttons[1].name = GAME_STRING (NETMELEE_STRING_BASE + 20);
// "Wait for incoming connection"
buttons[2].name = GAME_STRING (NETMELEE_STRING_BASE + 21); buttons[2].name = GAME_STRING (NETMELEE_STRING_BASE + 21);
// "Cancel"
buttons[0].handleEvent = do_connect; buttons[0].handleEvent = do_connect;
buttons[1].handleEvent = do_listen; buttons[1].handleEvent = do_listen;
@@ -481,33 +484,40 @@ CreateWidgets (void)
slider.step = 1; slider.step = 1;
slider.value = netplayOptions.inputDelay; slider.value = netplayOptions.inputDelay;
slider.category = GAME_STRING (NETMELEE_STRING_BASE + 24); slider.category = GAME_STRING (NETMELEE_STRING_BASE + 24);
// "Net Delay"
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
texts[i].tag = WIDGET_TYPE_TEXTENTRY; texts[i].tag = WIDGET_TYPE_TEXTENTRY;
texts[i].parent = NULL; texts[i].parent = NULL;
texts[i].handleEvent = Widget_HandleEventTextEntry; texts[i].handleEvent = Widget_HandleEventTextEntry;
texts[i].receiveFocus = Widget_ReceiveFocusSimple; texts[i].receiveFocus = Widget_ReceiveFocusSimple;
texts[i].draw = MCD_DrawTextEntry; texts[i].draw = MCD_DrawTextEntry;
texts[i].height = Widget_HeightOneLine; texts[i].height = Widget_HeightOneLine;
texts[i].width = Widget_WidthFullScreen; texts[i].width = Widget_WidthFullScreen;
texts[i].handleEventSelect = OnTextEntryEvent; texts[i].handleEventSelect = OnTextEntryEvent;
texts[i].maxlen = WIDGET_TEXTENTRY_WIDTH-1; texts[i].maxlen = WIDGET_TEXTENTRY_WIDTH-1;
texts[i].state = WTE_NORMAL; texts[i].state = WTE_NORMAL;
texts[i].cursor_pos = 0; texts[i].cursor_pos = 0;
} }
texts[0].category = GAME_STRING (NETMELEE_STRING_BASE + 22); texts[0].category = GAME_STRING (NETMELEE_STRING_BASE + 22);
// "Host"
texts[1].category = GAME_STRING (NETMELEE_STRING_BASE + 23); texts[1].category = GAME_STRING (NETMELEE_STRING_BASE + 23);
// "Port"
/* We sometimes assign to these internals; cannot strncpy over self! */ /* We sometimes assign to these internals; cannot strncpy over self! */
if (texts[0].value != netplayOptions.peer[current_state->which_side].host) if (texts[0].value != netplayOptions.peer[current_state->which_side].host)
{ {
strncpy (texts[0].value, netplayOptions.peer[current_state->which_side].host, texts[0].maxlen); strncpy (texts[0].value,
netplayOptions.peer[current_state->which_side].host,
texts[0].maxlen);
} }
if (texts[1].value != netplayOptions.peer[current_state->which_side].port) if (texts[1].value != netplayOptions.peer[current_state->which_side].port)
{ {
strncpy (texts[1].value, netplayOptions.peer[current_state->which_side].port, texts[1].maxlen); strncpy (texts[1].value,
netplayOptions.peer[current_state->which_side].port,
texts[1].maxlen);
} }
texts[0].value[texts[0].maxlen]=0; texts[0].value[texts[0].maxlen]=0;
texts[1].value[texts[1].maxlen]=0; texts[1].value[texts[1].maxlen]=0;
@@ -527,7 +537,7 @@ DrawConnectDialog (void)
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
DrawShadowedBox (&r, SHADOWBOX_BACKGROUND_COLOR, DrawShadowedBox (&r, SHADOWBOX_BACKGROUND_COLOR,
SHADOWBOX_DARK_COLOR, SHADOWBOX_MEDIUM_COLOR); SHADOWBOX_DARK_COLOR, SHADOWBOX_MEDIUM_COLOR);
menu.draw ((WIDGET *)&menu, r.corner.x + 10, r.corner.y + 10); menu.draw ((WIDGET *)&menu, r.corner.x + 10, r.corner.y + 10);
@@ -620,3 +630,4 @@ MeleeConnectDialog (int side)
} }
#endif /* NETPLAY */ #endif /* NETPLAY */