Update of /cvsroot/netrek/client/netrekxp/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv792/src
Modified Files:
data.c local.c short.c socket.c warning.c
Log Message:
Warning messages are no longer logged. Cuts down on logfile spam.
Fix spelling of foreign in warning message #46.
Minor todo list changes.
Minor indenting fixes.
Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- local.c 9 Jan 2009 03:34:07 -0000 1.116
+++ local.c 15 Mar 2009 12:16:42 -0000 1.117
@@ -1317,7 +1317,7 @@
else if (value <= 66)
color = yColor;
else
- color = gColor;
+ color = gColor;
}
else
color = playerColor (j);
Index: short.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/short.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- short.c 16 Apr 2008 02:57:09 -0000 1.28
+++ short.c 15 Mar 2009 12:16:43 -0000 1.29
@@ -121,7 +121,7 @@
/* beam_up() */
"Must be orbiting or docked to beam up.", /* 44 */
"Those aren't our men.", /* 45 */
- "Comm Officer: We're not authorized to beam foriegn troops on board!",
/* 46 */
+ "Comm Officer: We're not authorized to beam foreign troops on board!",
/* 46 */
/* beam_down() */
"Must be orbiting or docked to beam down.", /* 47 */
"Comm Officer: Starbase refuses permission to beam our troops over.",
/* 48 */
@@ -1344,7 +1344,11 @@
else
#endif
if (damage >= 0 && damage < NUMWTEXTS)
+ {
+ /* Don't log spammy warning messages. */
+ log_ignore = 1;
warning (w_texts[damage]);
+ }
break;
case PHASER_HIT_TEXT:
target = &players[(unsigned char) packet->argument & 0x3f];
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- data.c 12 Feb 2009 03:48:25 -0000 1.116
+++ data.c 15 Mar 2009 12:16:42 -0000 1.117
@@ -146,6 +146,7 @@
int rotatePlanets = 1;
int logging = 0;
+int log_ignore = 0;
int continueTractor = 1;
int tcounter = 2;
char *title = NULL;
Index: warning.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/warning.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- warning.c 16 Apr 2008 00:08:23 -0000 1.15
+++ warning.c 15 Mar 2009 12:16:43 -0000 1.16
@@ -131,7 +131,7 @@
tm->tm_min, tm->tm_sec);
warncount = (warncount > 100) ? 109 : warncount + 9;
- if (logging)
+ if (logging && !log_ignore)
{
if (logFile != NULL)
{
@@ -141,6 +141,7 @@
else
puts (newtext);
}
+ log_ignore = 0;
if (doPhaser)
W_MessageAllowedWindows (WAM_PHASER, 0, 0, textColor, newtext,
warncount, 0);
Index: socket.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- socket.c 6 Mar 2009 04:09:27 -0000 1.54
+++ socket.c 15 Mar 2009 12:16:43 -0000 1.55
@@ -3292,22 +3292,23 @@
void handleExtension1 (struct paradiseext1_spacket *packet)
{
- switch (packet->subtype) {
- case SP_PE1_MISSING_BITMAP:
- {
- struct pe1_missing_bitmap_spacket *pkt = (struct
pe1_missing_bitmap_spacket *) packet;
- newMotdPic(ntohs(pkt->x), ntohs(pkt->y), ntohs(pkt->width),
ntohs(pkt->height), 0, ntohs(pkt->page));
- }
- break;
- case SP_PE1_NUM_MISSILES:
- me->p_totmissiles = ntohs(((struct pe1_num_missiles_spacket *)
packet)->num);
- // printf("updated totmissiles to %d\n",me->p_totmissiles);
- if (me->p_totmissiles < 0)
- me->p_totmissiles = 0; // SB/WB have -1
- break;
- default:
- printf("unknown paradise extension packet 1 subtype = %d\n",
- packet->subtype);
+ switch (packet->subtype)
+ {
+ case SP_PE1_MISSING_BITMAP:
+ {
+ struct pe1_missing_bitmap_spacket *pkt = (struct
pe1_missing_bitmap_spacket *) packet;
+ newMotdPic(ntohs(pkt->x), ntohs(pkt->y), ntohs(pkt->width),
ntohs(pkt->height), 0, ntohs(pkt->page));
+ }
+ break;
+ case SP_PE1_NUM_MISSILES:
+ me->p_totmissiles = ntohs(((struct pe1_num_missiles_spacket *)
packet)->num);
+ // printf("updated totmissiles to %d\n",me->p_totmissiles);
+ if (me->p_totmissiles < 0)
+ me->p_totmissiles = 0; // SB/WB have -1
+ break;
+ default:
+ LineToConsole ("unknown paradise extension packet 1 subtype = %d\n",
packet->subtype);
+ break;
}
}
void handleThingy (struct thingy_spacket *packet)
_______________________________________________
netrek-cvs mailing list
[email protected]
http://mailman.us.netrek.org/mailman/listinfo/netrek-cvs
