Update of /cvsroot/netrek/client/netrekxp/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7322/src
Modified Files:
cowmain.c data.c defaults.c defwin.c helpwin.c input.c local.c
mswindow.c newwin.c option.c short.c socket.c spopt.c
Log Message:
Remove SHORT_PACKETS define
Index: mswindow.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- mswindow.c 28 Mar 2009 02:50:24 -0000 1.93
+++ mswindow.c 8 Jun 2009 22:55:03 -0000 1.94
@@ -5446,7 +5446,6 @@
}
-#ifdef SHORT_PACKETS
/* Apparently this solves some problem on X, but here it just forces a redraw...*/
/* Hrm - This was using redrawScrolling(win), updated to (win, hdc) -SAC 24 Jul 96 */
/* Was void W_SetSensitive(Window *window, int b) -SAC */
@@ -5466,7 +5465,6 @@
ReleaseDC (((Window *)win)->hwnd, hdc);
}
}
-#endif
// Uses SRCAND for raster operation - useful for masking
void
Index: spopt.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/spopt.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- spopt.c 1 Apr 2007 10:11:37 -0000 1.3
+++ spopt.c 8 Jun 2009 22:55:04 -0000 1.4
@@ -8,9 +8,6 @@
/******************************************************************************/
#include "config.h"
-
-#ifdef SHORT_PACKETS
-/* */
#include "copyright.h"
#include <stdio.h>
@@ -199,6 +196,3 @@
/* Unmap window */
W_UnmapWindow (spWin);
}
-
-
-#endif
Index: newwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- newwin.c 25 May 2009 14:43:53 -0000 1.78
+++ newwin.c 8 Jun 2009 22:55:04 -0000 1.79
@@ -1126,11 +1126,9 @@
udpWin = W_MakeMenu ("UDP", TWINSIDE + 10, -BORDER + 10, 40, UDP_NUMOPTS, NULL, 2);
W_SetWindowButtonHandler (udpWin, udpaction);
-#ifdef SHORT_PACKETS
spWin = W_MakeMenu ("network", TWINSIDE + 10, -BORDER + 10, 40, SPK_NUMFIELDS, NULL, 2);
W_SetWindowKeyDownHandler (spWin, spaction);
W_SetWindowButtonHandler (spWin, spaction);
-#endif
#if defined(SOUND)
soundWin = W_MakeMenu("sound", TWINSIDE + 20, -BORDER + 10, 33,
@@ -1198,10 +1196,7 @@
W_DefineTrekCursor (tstatw);
W_DefineWarningCursor (qwin);
W_DefineArrowCursor (udpWin);
-
-#ifdef SHORT_PACKETS
W_DefineArrowCursor (spWin);
-#endif
/* SRS these are not defined? Oh, because it's a inline def... grrr*/
W_DefineFedCursor (teamWin[0]);
@@ -1269,11 +1264,8 @@
W_MapWindow (reviewWin);
if (checkMapped ("UDP"))
udpwindow ();
-
-#ifdef SHORT_PACKETS
if (checkMapped ("network"))
spwindow ();
-#endif
if (checkMapped ("stats"))
W_MapWindow (statwin);
}
Index: input.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- input.c 24 May 2009 01:38:55 -0000 1.53
+++ input.c 8 Jun 2009 22:55:03 -0000 1.54
@@ -2014,11 +2014,8 @@
torps[i + (me->p_no * ntorps)].t_status == TSTRAIGHT)
{
sendDetMineReq ((short) (i + (me->p_no * ntorps)));
-
-#ifdef SHORT_PACKETS
if (recv_short)
break; /* Let the server det for me */
-#endif
}
}
}
@@ -2278,9 +2275,7 @@
W_UnmapWindow (docwin);
#endif
-#ifdef SHORT_PACKETS
W_UnmapWindow (spWin);
-#endif
W_UnmapWindow (pStats);
W_UnmapWindow (statwin);
@@ -2456,10 +2451,7 @@
void
Key45 (void)
{
-#ifdef SHORT_PACKETS
sendShortReq (SPK_SALL, 1);
-#endif
-
}
/******************************************************************************/
@@ -3113,14 +3105,10 @@
void
Key96 (void)
{
-
-#ifdef SHORT_PACKETS
if (spWin != NULL && W_IsMapped (spWin))
spdone ();
else
spwindow ();
-#endif
-
}
/******************************************************************************/
@@ -3569,11 +3557,7 @@
void
Key124 (void)
{
-
-#ifdef SHORT_PACKETS
sendShortReq (SPK_ALL, 1);
-#endif
-
}
/******************************************************************************/
Index: local.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- local.c 28 Mar 2009 09:35:38 -0000 1.118
+++ local.c 8 Jun 2009 22:55:03 -0000 1.119
@@ -1970,7 +1970,6 @@
if (tx == px && ty == py)
continue;
-#ifdef SHORT_PACKETS
if (php->ph_status != PHMISS) /* KOC 10/20/95 */
{ /* hack for SP_2 */
dir = (unsigned char)
@@ -1978,7 +1977,6 @@
(double) (tx - px)) / XPI * 128.0);
}
else
-#endif
{
dir = (unsigned char) (NORMALIZE (php->ph_dir + 64));
}
@@ -3360,10 +3358,8 @@
{
/* If alive but out of bounds, we probably missed a packet giving our location,
so quietly request a new one */
-#ifdef SHORT_PACKETS
if (me->p_status == PALIVE)
sendShortReq (SPK_SALL, 0);
-#endif
return;
}
Index: cowmain.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- cowmain.c 8 Jun 2009 22:26:07 -0000 1.41
+++ cowmain.c 8 Jun 2009 22:55:03 -0000 1.42
@@ -1037,8 +1037,7 @@
if (tryUdp && commMode != COMM_UDP)
sendUdpReq (COMM_UDP);
-#ifdef SHORT_PACKETS /* should we be checking for
- * udp on here? */
+ /* should we be checking for udp on here? */
if (tryShort)
sendShortReq (SPK_VON, 1);
else
@@ -1050,10 +1049,6 @@
sendUdpReq (COMM_UPDATE);
}
-#else
- /* `=' style update to get the kills in the playerlist right */
- sendUdpReq (COMM_UPDATE);
-#endif
/* Send request for updatesPerSec. New servers now support 50 u/s */
lastUpdateSpeed = updatesPerSec = intDefault ("updatesPerSec", updatesPerSec);
sendUpdatePacket (1000000 / updatesPerSec);
Index: short.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/short.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- short.c 15 Mar 2009 12:16:43 -0000 1.29
+++ short.c 8 Jun 2009 22:55:04 -0000 1.30
@@ -9,7 +9,6 @@
#include "config.h"
-#ifdef SHORT_PACKETS
#include <stdio.h>
#include <sys/types.h>
#include <winsock.h>
@@ -2199,7 +2198,3 @@
PlistNoteUpdate (pnum);
} /* for */
}
-
-#endif
-
-/* END SHORT_PACKETS */
Index: socket.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- socket.c 8 Jun 2009 22:26:07 -0000 1.71
+++ socket.c 8 Jun 2009 22:55:04 -0000 1.72
@@ -67,7 +67,6 @@
{
}
-#ifdef SHORT_PACKETS
char numofbits[256] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1,
2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 1,
2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2,
@@ -93,8 +92,6 @@
/* S_P2 */
int shortversion = SHORTVERSION; /* Which version do we use? */
-#endif /* SHORT_PACKETS */
-
#ifdef PACKET_LOG
void Log_Packet (char type,
int act_size);
@@ -144,8 +141,6 @@
{sizeof (struct thingy_info_spacket), handleThingyInfo}, /* SP_THINGY_INFO */
{sizeof (struct ship_cap_spacket), handleShipCap}, /* SP_SHIP_CAP */
-
-#ifdef SHORT_PACKETS
{sizeof (struct shortreply_spacket), handleShortReply}, /* SP_S_REPLY */
{-1, handleSMessage}, /* SP_S_MESSAGE */
{-1 /* sizeof(struct
@@ -154,47 +149,21 @@
{sizeof (struct youshort_spacket), handleSelfShort}, /* SP_S_YOU */
{sizeof (struct youss_spacket), handleSelfShip}, /* SP_S_YOU_SS */
{-1, /* variable */ handleVPlayer}, /* SP_S_PLAYER */
-#else
- {0, dummy}, /* 40 */
- {0, dummy}, /* 41 */
- {0, dummy}, /* 42 */
- {0, dummy}, /* 43 */
- {0, dummy}, /* 44 */
- {0, dummy}, /* 45 */
-#endif
{sizeof (struct ping_spacket), handlePing}, /* SP_PING */
-
-#ifdef SHORT_PACKETS
{-1, /* variable */ handleVTorp}, /* SP_S_TORP */
{-1, handleVTorpInfo}, /* SP_S_TORP_INFO */
{20, handleVTorp}, /* SP_S_8_TORP */
{-1, handleVPlanet}, /* SP_S_PLANET */
-#else
- {0, dummy}, /* 47 */
- {0, dummy}, /* 48 */
- {0, dummy}, /* 49 */
- {0, dummy}, /* 50 */
-#endif
-
{-1, /* variable */ handleGameparams},
{-1, /* variable */ handleExtension1},
{sizeof (struct terrain_packet2), handleTerrain2}, /* 53 */
{sizeof (struct terrain_info_packet2), handleTerrainInfo2}, /* 54 */
{0, dummy}, /* 55 */
-
-#ifdef SHORT_PACKETS /* S_P2 */
{0, dummy}, /* SP_S_SEQUENCE not yet
* implemented */
{-1, handleVPhaser}, /* SP_S_PHASER */
{-1, handleVKills}, /* SP_S_KILLS */
{sizeof (struct stats_s_spacket), handle_s_Stats}, /* SP_S_STATS */
-#else
- {0, dummy}, /* 56 */
- {0, dummy}, /* 57 */
- {0, dummy}, /* 58 */
- {0, dummy}, /* 59 */
-#endif
-
{sizeof (struct feature_cpacket), handleFeature}, /* CP_FEATURE; 60 */
{sizeof (struct rank_spacket), handleRank}, /* SP_RANK */
{sizeof (struct ltd_spacket), handleLtd}, /* SP_LTD */
@@ -244,17 +213,9 @@
0, /* 40 */
0, /* 41 */
sizeof (struct ping_cpacket), /* CP_PING_RESPONSE */
-
-#ifdef SHORT_PACKETS
sizeof (struct shortreq_cpacket), /* CP_S_REQ */
sizeof (struct threshold_cpacket), /* CP_S_THRS */
-1, /* CP_S_MESSAGE */
-#else
- 0, /* 43 */
- 0, /* 44 */
- 0, /* 45 */
-#endif
-
0, /* 46 */
0, /* 47 */
0, /* 48 */
@@ -1129,7 +1090,6 @@
}
size = handlers[*bufptr].size;
-#ifdef SHORT_PACKETS
if (size == -1)
{ /* variable packet */
size = getvpsize (bufptr);
@@ -1145,7 +1105,6 @@
size, *bufptr);
}
}
-#endif /* SHORT_PACKETS */
if (packetLights)
light_receive();
@@ -2214,7 +2173,6 @@
{
struct mesg_cpacket mesPacket;
-#ifdef SHORT_PACKETS
if (recv_short)
{
int size;
@@ -2229,8 +2187,6 @@
mesPacket.type = CP_S_MESSAGE;
}
else
-#endif
-
mesPacket.type = CP_MESSAGE;
mesPacket.group = (char) group;
mesPacket.indiv = (char) indiv;
@@ -4210,14 +4166,12 @@
if (req == COMM_UPDATE)
{
-#ifdef SHORT_PACKETS
if (recv_short)
{ /* not necessary */
/* Let the client do the work, and not the network :-) */
resetWeaponInfo ();
}
-#endif
sendServerPacket ((struct player_spacket *) &packet);
warning ("Sent request for full update");
@@ -4852,10 +4806,8 @@
outpacket_log[tpe]++;
outdata_this_sec += size;
-#ifdef SHORT_PACKETS
if (tpe == CP_S_MESSAGE)
cp_msg_size += size; /* HW */
-#endif
}
/* print out out the cool information on packet logging */
@@ -4884,7 +4836,6 @@
(int) sqrt ((numpl * sout2 - sumout * sumout) /
(numpl * (numpl - 1))));
-#ifdef SHORT_PACKETS
/* total_bytes = ALL_BYTES; *//* Hope this works HW */
for (i = 0; i <= NUM_PACKETS; i++)
{ /* I think it must be <= */
@@ -4894,24 +4845,13 @@
total_bytes += vari_sizes[i];
} /* The result should be ==
* ALL_BYTES HW */
-#else
- for (i = 0; i <= NUM_PACKETS; i++)
- {
- total_bytes += handlers[i].size * packet_log[i];
- }
-#endif
for (i = 0; i <= NUM_SIZES; i++)
{
-
-#ifdef SHORT_PACKETS
if (handlers[i].size != -1)
outtotal_bytes += outpacket_log[i] * sizes[i];
else
outtotal_bytes += cp_msg_size; /* HW */
-#else
- outtotal_bytes += outpacket_log[i] * sizes[i];
-#endif
}
LineToConsole ("Total bytes received %d, average CPS: %4.1f\n",
@@ -4920,8 +4860,6 @@
LineToConsole ("Num #Rcvd Size TotlBytes %%Total\n");
for (i = 0; i <= NUM_PACKETS; i++)
{
-
-#ifdef SHORT_PACKETS
if (handlers[i].size != -1)
calc_temp = handlers[i].size * packet_log[i];
else
@@ -4930,12 +4868,6 @@
LineToConsole ("%3d %5d %4d %9d %3.2f\n",
i, packet_log[i], handlers[i].size, calc_temp,
(float) (calc_temp * 100 / total_bytes));
-#else
- calc_temp = handlers[i].size * packet_log[i];
- LineToConsole ("%3d %5d %4d %9d %3.2f\n",
- i, packet_log[i], handlers[i].size, calc_temp,
- (float) (calc_temp * 100 / total_bytes));
-#endif
}
LineToConsole ("Total bytes sent %d, average CPS: %4.1f\n",
outtotal_bytes, (float) (outtotal_bytes / (Now - Start_Time)));
@@ -4943,8 +4875,6 @@
LineToConsole ("Num #Sent Size TotlBytes %%Total\n");
for (i = 0; i <= NUM_SIZES; i++)
{
-
-#ifdef SHORT_PACKETS
if (sizes[i] == -1)
calc_temp = cp_msg_size;
else
@@ -4953,13 +4883,6 @@
i, outpacket_log[i], sizes[i], calc_temp,
(float) (calc_temp * 100 / outtotal_bytes));
}
-#else
- calc_temp = sizes[i] * outpacket_log[i];
- LineToConsole ("%3d %5d %4d %9d %3.2f\n",
- i, outpacket_log[i], sizes[i], calc_temp,
- (float) (calc_temp * 100 / outtotal_bytes));
- }
-#endif
}
void print_packet(char *packet, int size)
@@ -5394,7 +5317,6 @@
((struct ship_cap_spacket *) packet)->s_desig2,
ntohs(((struct ship_cap_spacket *) packet)->s_bitmap) );
break;
-#ifdef SHORT_PACKETS
case SP_S_REPLY : /* reply to send-short * *
* request */
LineToConsole("\nS->C SP_S_REPLY\t");
@@ -5456,7 +5378,6 @@
ntohl(((struct player_s_spacket *) packet)->x),
ntohl(((struct player_s_spacket *) packet)->y) );
break;
-#endif
case SP_PING : /* ping packet */
LineToConsole("\nS->C SP_PING\t");
if (log_packets > 1)
@@ -5659,7 +5580,6 @@
ntohl(lp->wsdt) );
}
break;
-#ifdef SHORT_PACKETS
case SP_S_TORP : /* variable length torp * *
* packet */
LineToConsole("\nS->C SP_S_TORP\t");
@@ -5751,13 +5671,12 @@
ntohl(((struct stats_spacket *) packet)->maxkills),
ntohl(((struct stats_spacket *) packet)->sbmaxkills) );
break;
-#endif
default:
LineToConsole("\nS->C UNKNOWN\t");
if (log_packets > 1)
LineToConsole(" type=%d,",packet[0]);
}
-#ifdef nodef /* #ifdef SHORT_PACKETS */
+#ifdef nodef /* Short packet stuff */
switch( *((char *) packet) )
{
/* variable length packets */
@@ -6039,7 +5958,6 @@
ntohl(((struct ping_cpacket *) packet)->cp_sent),
ntohl(((struct ping_cpacket *) packet)->cp_recv) );
break;
-#ifdef SHORT_PACKETS
case CP_S_REQ :
LineToConsole("\nC->S CP_S_REQ\t");
if (log_packets > 1)
@@ -6072,7 +5990,6 @@
if (log_packets > 1)
LineToConsole(" no struct defined,");
break;
-#endif
case CP_FEATURE :
LineToConsole("\nC->S CP_FEATURE\t");
if (log_packets > 1)
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- data.c 8 Jun 2009 22:26:07 -0000 1.126
+++ data.c 8 Jun 2009 22:55:03 -0000 1.127
@@ -243,7 +243,6 @@
int SBhours = 0;
-#ifdef SHORT_PACKETS
int why_dead = 0;
int tryShort = 1; /* for .xtrekrc option */
int tryShort1 = 0;
@@ -254,8 +253,6 @@
char recv_threshold_s[8] = { '0', '\0' };
int recv_warn = 1;
-#endif
-
int updatesPerSec = 10; /* client requested updates per second */
int lastUpdateSpeed = 10; /* last update speed client requested */
int server_ups = 10; /* server responded updates per second */
@@ -465,11 +462,8 @@
W_Window udpWin, phaserwin, hintWin;
W_Window waitWin, waitqWin, countWin, motdButtonWin, motdWin;
-#ifdef SHORT_PACKETS
W_Window spWin = NULL;
-#endif
-
#ifdef NBT
W_Window macroWin = NULL;
Index: defwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defwin.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- defwin.c 9 May 2009 21:21:43 -0000 1.7
+++ defwin.c 8 Jun 2009 22:55:03 -0000 1.8
@@ -300,7 +300,6 @@
,}
,}
,
-#ifdef SHORT_PACKETS
{
"tryShort", BOOL_DEF, "Use short packets for communications", &tryShort1,
{
@@ -309,7 +308,6 @@
,}
,}
,
-#endif
{
"tryUdp", BOOL_DEF, "Use UDP for communications", &tryUdp1,
{
Index: helpwin.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/helpwin.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- helpwin.c 19 Apr 2008 16:22:59 -0000 1.15
+++ helpwin.c 8 Jun 2009 22:55:03 -0000 1.16
@@ -135,13 +135,9 @@
"+ Show UDP options window",
"= Update all",
", Ping stats window",
-
-#ifdef SHORT_PACKETS
"` Toggle PacketWindow",
"- Update small",
"| Update medium",
-#endif /* SHORT_PACKETS */
-
" (space) Unmap special windows",
"\\ Reset user timer",
Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- option.c 23 May 2009 13:23:39 -0000 1.60
+++ option.c 8 Jun 2009 22:55:04 -0000 1.61
@@ -393,9 +393,7 @@
#endif
{1, "show UDP control window", 0, &udpWin, 0, 0, NULL, NULL},
{1, "show ping stats window", 0, &pStats, 0, 0, NULL},
-#ifdef SHORT_PACKETS
{1, "show short packets window", 0, &spWin, 0, 0, NULL, NULL},
-#endif
{1, "done", ¬done, 0, 0, 0, NULL, NULL},
{-1, NULL, 0, 0, 0, 0, NULL, NULL}
};
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- defaults.c 6 Jun 2009 03:29:08 -0000 1.100
+++ defaults.c 8 Jun 2009 22:55:03 -0000 1.101
@@ -867,14 +867,12 @@
NULL
}
},
-#ifdef SHORT_PACKETS
{"tryShort", &tryShort, RC_BOOL,
{
"Use short packets for communications",
NULL
}
},
-#endif
{"tryUdp", &tryUdp, RC_BOOL,
{
"Use UDP for communications",
@@ -1866,10 +1864,8 @@
udpSequenceCheck = booleanDefault ("udpSequenceCheck", udpSequenceCheck);
baseUdpLocalPort = intDefault ("baseUdpLocalPort", baseUdpLocalPort);
-#ifdef SHORT_PACKETS
tryShort = booleanDefault ("tryShort", tryShort);
tryShort1 = tryShort;
-#endif
newDistress = booleanDefault ("newDistress", newDistress);
rejectMacro = booleanDefault ("rejectMacro", rejectMacro);
@@ -1963,9 +1959,7 @@
updateWindowsGeometry (reviewWin);
updateWindowsGeometry (pStats);
updateWindowsGeometry (udpWin);
-#ifdef SHORT_PACKETS
updateWindowsGeometry (spWin);
-#endif
#ifdef SOUND
updateWindowsGeometry (soundWin);
#endif
@@ -2745,7 +2739,6 @@
fputs (str, fp);
fputs ("\n", fp);
-#ifdef SHORT_PACKETS
// Short packets window
if ((adefault = stringDefault ("network.parent")) != NULL)
{
@@ -2760,7 +2753,6 @@
W_IsMapped (spWin) ? "on" : "off");
fputs (str, fp);
fputs ("\n", fp);
-#endif
#ifdef TOOLS
// Tools window