Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3530/src
Modified Files:
input.c parsemeta.c warning.c
Log Message:
- fixed bug with phaser messages going blank due to improper buffering (not sure where
this bug came from, in the downloadable version off playnetrek this bug does not exist)
- removed defunct netrek forum link from metaserver window
Index: parsemeta.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- parsemeta.c 12 Apr 2006 04:20:04 -0000 1.2
+++ parsemeta.c 15 Apr 2006 09:58:25 -0000 1.3
@@ -701,7 +701,7 @@
/* Additional Help Options */
W_WriteText (metaWin, 0, num_servers + 1, W_Yellow,
- " Netrek Homepage | Newbie Manual | Forum | FAQ | Dogfight Manual", 67, 0);
+ " Netrek Homepage | Newbie Manual | FAQ | Dogfight Manual", 63, 0);
/* Map window */
W_MapWindow (metaWin);
@@ -784,15 +784,13 @@
else if (data->y == num_servers + 1) /* Help Line */
{
x = data->x / W_Textwidth;
- if (x >= 0 && x <= 19) /* Netrek Home Page */
+ if (x >= 0 && x <= 23) /* Netrek Home Page */
ShellExecute (NULL, "open", "http://www.netrek.org", NULL, NULL, SW_SHOWNORMAL);
- else if (x >= 21 && x <= 35) /* Newbie Manual */
+ else if (x >= 25 && x <= 39) /* Newbie Manual */
ShellExecute (NULL, "open", "http://www.netrek.org/cow/current/newbie.html", NULL, NULL, SW_SHOWNORMAL);
- else if (x >= 37 && x <= 43) /* Forums */
- ShellExecute (NULL, "open", "http://netrek.game-host.org", NULL, NULL, SW_SHOWNORMAL);
- else if (x >= 45 && x <= 49) /* FAQ */
+ else if (x >= 41 && x <= 45) /* FAQ */
ShellExecute (NULL, "open", "http://www.inl.org/netrek/netrekFAQ.html", NULL, NULL, SW_SHOWNORMAL);
- else if (x >= 51 && x <= 67) /* Dogfight Manual */
+ else if (x >= 47 && x <= 63) /* Dogfight Manual */
ShellExecute (NULL, "open", "http://cha.rlie.nl/dfmanual/", NULL, NULL, SW_SHOWNORMAL);
}
}
Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- input.c 12 Apr 2006 04:20:03 -0000 1.2
+++ input.c 15 Apr 2006 09:58:25 -0000 1.3
@@ -1489,9 +1489,9 @@
{
int x, y;
- if (findMouseInWin (&x, &y, playerw))
- {
- data->Window = playerw;
+ if (findMouseInWin (&x, &y, playerw))
+ {
+ data->Window = playerw;
data->x = x;
data->y = y;
}
Index: warning.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/warning.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- warning.c 12 Apr 2006 04:20:04 -0000 1.2
+++ warning.c 15 Apr 2006 09:58:25 -0000 1.3
@@ -30,7 +30,7 @@
LONG curtime;
struct tm *tm;
char newtext[128];
-
+ char newtext2[128];
if (warncount > 0)
{
/* XFIX */
@@ -62,10 +62,10 @@
time (&curtime);
tm = localtime (&curtime);
#ifdef PHASER_STATS
- sprintf (newtext, "%.100s %02d:%02d:%02d",
+ sprintf (newtext2, "%.100s %02d:%02d:%02d",
(doPhaser && phaserStats) ? newtext : text, tm->tm_hour,
#else
- sprintf (newtext, "%.100s %02d:%02d:%02d", text, tm->tm_hour,
+ sprintf (newtext2, "%.100s %02d:%02d:%02d", text, tm->tm_hour,
#endif
tm->tm_min, tm->tm_sec);
warncount = (warncount > 100) ? 109 : warncount + 9;
@@ -74,14 +74,14 @@
{
if (logFile != NULL)
{
- fprintf (logFile, "%s\n", newtext);
+ fprintf (logFile, "%s\n", newtext2);
fflush (logFile);
}
else
- puts (newtext);
+ puts (newtext2);
}
if (doPhaser)
- W_MessageAllowedWindows (WAM_PHASER, 0, 0, textColor, newtext, warncount, 0);
+ W_MessageAllowedWindows (WAM_PHASER, 0, 0, textColor, newtext2, warncount, 0);
}
}