From quozl at users.sourceforge.net Mon Jul 7 20:40:24 2008 From: quozl at users.sourceforge.net (James Cameron) Date: Tue, 08 Jul 2008 01:40:24 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c,1.110,1.111 Message-ID: <20080708014035.34E9CB406@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14699 Modified Files: data.c Log Message: RCD bomb, show planet name regardless Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.110 retrieving revision 1.111 diff -u -d -r1.110 -r1.111 --- data.c 19 Apr 2008 20:03:00 -0000 1.110 +++ data.c 8 Jul 2008 01:40:21 -0000 1.111 @@ -552,7 +552,7 @@ /* ^o */ {(unsigned char) ('\xcf'), "ogg", " %T%c->%O Help Ogg %p at %l\0"}, /* ^b */ - {(unsigned char) ('\xc2'), "bomb", " %T%c->%O %?%n>4%{bomb %l @ %n%!bomb%}\0"}, + {(unsigned char) ('\xc2'), "bomb", " %T%c->%O %?%n>4%{bomb %l @ %n%!bomb %l%}\0"}, /* ^c */ {(unsigned char) ('\xc3'), "space_control", " %T%c->%O Help Control at %L\0"}, /* ^1 */ From modemhero at users.sourceforge.net Mon Jul 7 21:00:56 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 08 Jul 2008 02:00:56 +0000 Subject: [netrek-cvs] client/netrekxp/src parsemeta.c,1.42,1.43 Message-ID: <20080708020108.D6885B406@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23978/src Modified Files: parsemeta.c Log Message: Fix bug in size of generic_32 packet pad. Remove paradise server from list of servers client can't use, in the metaserver display. Missed this check during first pass on adding paradise servers to metaserver. Reworked logic for saving and refreshing of servers on metaserver - the old method of using status changes irregardless of server age was not a good one. Better solution is to only check if the saved server status is an internal server state. Also, don't save server in cache if bogus age or when value. Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- parsemeta.c 16 Apr 2008 00:08:18 -0000 1.42 +++ parsemeta.c 8 Jul 2008 02:00:53 -0000 1.43 @@ -333,7 +333,7 @@ #endif /* Don't list servers we cannot use */ - if (slist->typeflag != 'P' && !metablock(slist->address)) + if (!metablock(slist->address)) { #ifdef DEBUG LineToConsole ("HOST:%-30s PORT:%-6d %12s %-5d %d %c\n", @@ -593,10 +593,12 @@ #endif } /* if it was found, check age. Don't update if old entry is newer or - of the same age. However, make sure status hasn't changed. If status - differs, we want to use the new information packet regardless of age. */ + of the same age. Always update servers with a status saved as + statusNull or higher, as this indicates either old data from the cache + or that the server somehow has a permanent internal status state, + which we don't want. */ else { - if ((now-age) < (sp->when-sp->age) && (sp->status == tempstatus)) { + if ((now-age) < (sp->when-sp->age) && (sp->status < statusNull)) { sp->age = (int)now - (int)(sp->when-sp->age); sp->when = now; sp->refresh = 1; @@ -856,7 +858,10 @@ continue; #endif /* Protect against saving corrupted server data */ - if (serverlist[i].address == NULL || serverlist[i].lifetime > MAX_LIFETIME) + if (serverlist[i].address == NULL + || serverlist[i].lifetime > MAX_LIFETIME + || serverlist[i].age < 0 + || serverlist[i].when > time(NULL)) continue; sprintf(str,"%s,%d,%lld,%d,%d,%d,%d,%c\n", From modemhero at users.sourceforge.net Mon Jul 7 21:00:55 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 08 Jul 2008 02:00:55 +0000 Subject: [netrek-cvs] client/netrekxp/include packets.h,1.12,1.13 Message-ID: <20080708020104.DFF23B406@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23978/include Modified Files: packets.h Log Message: Fix bug in size of generic_32 packet pad. Remove paradise server from list of servers client can't use, in the metaserver display. Missed this check during first pass on adding paradise servers to metaserver. Reworked logic for saving and refreshing of servers on metaserver - the old method of using status changes irregardless of server age was not a good one. Better solution is to only check if the saved server status is an internal server state. Also, don't save server in cache if bogus age or when value. Index: packets.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- packets.h 16 Apr 2008 00:08:01 -0000 1.12 +++ packets.h 8 Jul 2008 02:00:46 -0000 1.13 @@ -909,7 +909,7 @@ char version; /* alphabetic */ short repair_time; /* server estimate of repair time in seconds */ short pl_orbit; /* what planet player orbiting, -1 if none */ - char pad1[25]; + char pad1[26]; }; #define GENERIC_32_VERSION 'a' #define GENERIC_32_LENGTH 32 From modemhero at users.sourceforge.net Mon Jul 7 21:00:48 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 08 Jul 2008 02:00:48 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.154,1.155 Message-ID: <20080708020127.2D144B406@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23978 Modified Files: clientr.suo Log Message: Fix bug in size of generic_32 packet pad. Remove paradise server from list of servers client can't use, in the metaserver display. Missed this check during first pass on adding paradise servers to metaserver. Reworked logic for saving and refreshing of servers on metaserver - the old method of using status changes irregardless of server age was not a good one. Better solution is to only check if the saved server status is an internal server state. Also, don't save server in cache if bogus age or when value. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.154 retrieving revision 1.155 diff -u -d -r1.154 -r1.155 Binary files /tmp/cvsxfY9db and /tmp/cvs88Lcfr differ From modemhero at users.sourceforge.net Fri Jul 11 22:49:47 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 12 Jul 2008 03:49:47 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h, 1.100, 1.101 packets.h, 1.13, 1.14 struct.h, 1.28, 1.29 Message-ID: <20080712034956.079683B40B6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26979/include Modified Files: data.h packets.h struct.h Log Message: First pass at generic 32 version b support. Known issues: doesn't pass version b to server via value field yet. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- data.h 19 Apr 2008 20:03:00 -0000 1.100 +++ data.h 12 Jul 2008 03:49:45 -0000 1.101 @@ -833,4 +833,6 @@ extern int mapscaleFactor; /* allows for scaling of galactic window, unused */ extern int fullBitmapRotation; /* draw old bitmap sets to all angles */ extern int hideConsole; /* show console window or not */ + +extern struct context *context; #endif /* _h_data */ Index: packets.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- packets.h 8 Jul 2008 02:00:46 -0000 1.13 +++ packets.h 12 Jul 2008 03:49:45 -0000 1.14 @@ -903,21 +903,44 @@ unsigned short s_bitmap; }; +#define GENERIC_32_LENGTH 32 struct generic_32_spacket { - char type; /* SP_GENERIC_32 */ - char version; /* alphabetic */ - short repair_time; /* server estimate of repair time in seconds */ - short pl_orbit; /* what planet player orbiting, -1 if none */ - char pad1[26]; + char type; + char version; /* alphabetic, 0x60 + version */ + u_short repair_time; /* server estimate of repair time, seconds */ + char pl_orbit; /* what planet player orbiting, -1 if none */ + u_short gameup; /* server status flags */ + u_char tournament_teams; /* what teams are involved */ + u_char tournament_age; /* duration of t-mode so far */ + char tournament_age_units; /* units for above, see s2du */ + u_char tournament_remain; /* remaining INL game time */ + char tournament_remain_units; /* units for above, see s2du */ + u_char starbase_remain; /* starbase reconstruction, mins */ + u_char team_remain; /* team surrender time, seconds */ + char pad1[18]; }; -#define GENERIC_32_VERSION 'a' -#define GENERIC_32_LENGTH 32 +#define GENERIC_32_VERSION_B 2 +#define GENERIC_32_VERSION GENERIC_32_VERSION_B /* default */ -/* versioning instructions: we start with version 'a', and each time a - field is added increment the version and reduce the pad size, - keeping the packet the same size ... client is entitled to trust - fields in struct that were defined at a particular version. +/* SP_GENERIC_32 versioning instructions: + + we start with version 'a', and each time a structure is changed + increment the version and reduce the pad size, keeping the packet + the same size ... + + client is entitled to trust fields in struct that were defined at a + particular version ... + + client is to send CP_FEATURE with SP_GENERIC_32 value 1 for version + 'a', value 2 for version 'b', etc ... + + server is to reply with SP_FEATURE with SP_GENERIC_32 value set to + the maximum version it supports (not the version requested by the + client), ... + + server is to send SP_GENERIC_32 packets of the highest version it + knows about, but no higher than the version the client asks for. */ struct flags_all_spacket Index: struct.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- struct.h 19 Apr 2008 16:22:56 -0000 1.28 +++ struct.h 12 Jul 2008 03:49:45 -0000 1.29 @@ -939,4 +939,17 @@ struct cons_buffer * next; }; -#endif /* _h_struct */ +// Game context variables, sent in generic_32 packet +struct context +{ + u_short gameup; /* server status flags */ + u_char tournament_teams; /* what teams are involved */ + u_char tournament_age; /* duration of t-mode so far */ + char tournament_age_units; /* units for above, see s2du */ + u_char tournament_remain; /* remaining INL game time */ + char tournament_remain_units; /* units for above, see s2du */ + u_char starbase_remain; /* starbase reconstruction, mins */ + u_char team_remain; /* team surrender time, seconds */ +}; + +#endif /* _h_struct */ \ No newline at end of file From modemhero at users.sourceforge.net Fri Jul 11 22:49:48 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 12 Jul 2008 03:49:48 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.111, 1.112 local.c, 1.112, 1.113 map.c, 1.65, 1.66 socket.c, 1.47, 1.48 Message-ID: <20080712034956.A14B53B40B9@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26979/src Modified Files: data.c local.c map.c socket.c Log Message: First pass at generic 32 version b support. Known issues: doesn't pass version b to server via value field yet. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- local.c 19 Apr 2008 20:03:03 -0000 1.112 +++ local.c 12 Jul 2008 03:49:45 -0000 1.113 @@ -699,7 +699,7 @@ if ((showArmy == 1 || showArmy == 3) && (l->pl_info & me->p_team) && (paradise ? (PL_TYPE(*l) == PLPLANET) : 1) && (F_show_army_count || - ( (me->p_flags & PFORBIT) && (F_sp_generic_32 ? me->pl_orbit : get_closest_planet(me->p_x, me->p_y)) == l->pl_no) + ( (me->p_flags & PFORBIT) && ((F_sp_generic_32 && me->pl_orbit != -1) ? me->pl_orbit : get_closest_planet(me->p_x, me->p_y)) == l->pl_no) || (!paradise && (me->p_flags & PFPLLOCK) && (me->p_flags & PFOBSERV) && (me->p_planet == l->pl_no)) )) { char armbuf[4]; Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- map.c 19 Apr 2008 20:03:04 -0000 1.65 +++ map.c 12 Jul 2008 03:49:45 -0000 1.66 @@ -544,7 +544,7 @@ if (F_check_planets) { if ((me->p_flags & PFORBIT) - && (F_sp_generic_32 ? me->pl_orbit : get_closest_planet(me->p_x, me->p_y)) == l->pl_no) + && ((F_sp_generic_32 && me->pl_orbit != -1) ? me->pl_orbit : get_closest_planet(me->p_x, me->p_y)) == l->pl_no) { orbit_planet_refresh++; if ((orbit_planet_refresh * 10 / server_ups) >= 1) Index: socket.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- socket.c 21 Jun 2008 13:31:41 -0000 1.47 +++ socket.c 12 Jul 2008 03:49:45 -0000 1.48 @@ -2818,10 +2818,28 @@ #endif return; } - if (packet->version < 'a') return; - me->p_repair_time = packet->repair_time; - me->pl_orbit = packet->pl_orbit; - if (packet->version < 'b') return; + if (packet->version < 'a') + return; + else if (packet->version == 'a') + { + me->p_repair_time = packet->repair_time; + me->pl_orbit = packet->pl_orbit; + return; + } + else if (packet->version == 'b') + { + me->p_repair_time = ntohs (packet->repair_time); + me->pl_orbit = packet->pl_orbit; + context->gameup = ntohs(packet->gameup); + context->tournament_teams = packet->tournament_teams; + context->tournament_age = packet->tournament_age; + context->tournament_age_units = packet->tournament_age_units; + context->tournament_remain = packet->tournament_remain; + context->tournament_remain_units = packet->tournament_remain_units; + context->starbase_remain = packet->starbase_remain; + context->team_remain = packet->team_remain; + return; + } } void Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.111 retrieving revision 1.112 diff -u -d -r1.111 -r1.112 --- data.c 8 Jul 2008 01:40:21 -0000 1.111 +++ data.c 12 Jul 2008 03:49:45 -0000 1.112 @@ -927,3 +927,5 @@ int mapscaleFactor = 40; /* allows for scaling of galactic window, unused */ int fullBitmapRotation = 1; /* draw old bitmap sets to all angles */ int hideConsole = 0; /* show console window or not */ + +struct context *context; From modemhero at users.sourceforge.net Fri Jul 11 22:49:47 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 12 Jul 2008 03:49:47 +0000 Subject: [netrek-cvs] client/netrekxp/resources/netrekrc netrekrc.txt, 1.5, 1.6 Message-ID: <20080712034956.0F5E13B40B8@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/netrekrc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26979/resources/netrekrc Modified Files: netrekrc.txt Log Message: First pass at generic 32 version b support. Known issues: doesn't pass version b to server via value field yet. Index: netrekrc.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/netrekrc/netrekrc.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- netrekrc.txt 6 Apr 2008 23:29:55 -0000 1.5 +++ netrekrc.txt 12 Jul 2008 03:49:45 -0000 1.6 @@ -523,7 +523,8 @@ # Receive SP_GENERIC_32 packets, which are used to convey things # like repair time and planet being orbitted. Increases bandwidth -# usage by 320 bytes/second for a server running at 10 UPS. +# usage anywhere from 0 to 320 bytes/second for a server running +# at 10 UPS. useGeneric32: on # Use beeplite From modemhero at users.sourceforge.net Fri Jul 11 22:49:47 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 12 Jul 2008 03:49:47 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.155,1.156 Message-ID: <20080712034956.0452FB441@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26979 Modified Files: clientr.suo Log Message: First pass at generic 32 version b support. Known issues: doesn't pass version b to server via value field yet. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.155 retrieving revision 1.156 diff -u -d -r1.155 -r1.156 Binary files /tmp/cvsiHv8eh and /tmp/cvsBsQ6RZ differ From modemhero at users.sourceforge.net Sat Jul 12 07:09:39 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 12 Jul 2008 12:09:39 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h, 1.101, 1.102 packets.h, 1.14, 1.15 Message-ID: <20080712120951.43F3F3B40A6@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6576/include Modified Files: data.h packets.h Log Message: Next pass at generic_32 version b support. Known issues: can't find win32 equivalent for attribute packing, feature packet arg1 of /002 is causing pointer error to arg2 Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.101 retrieving revision 1.102 diff -u -d -r1.101 -r1.102 --- data.h 12 Jul 2008 03:49:45 -0000 1.101 +++ data.h 12 Jul 2008 12:09:36 -0000 1.102 @@ -834,5 +834,6 @@ extern int fullBitmapRotation; /* draw old bitmap sets to all angles */ extern int hideConsole; /* show console window or not */ +extern int generic_32_version; extern struct context *context; #endif /* _h_data */ Index: packets.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- packets.h 12 Jul 2008 03:49:45 -0000 1.14 +++ packets.h 12 Jul 2008 12:09:36 -0000 1.15 @@ -903,10 +903,26 @@ unsigned short s_bitmap; }; -#define GENERIC_32_LENGTH 32 struct generic_32_spacket { char type; + char pad[31]; +}; +#define GENERIC_32_LENGTH 32 +#define COST_GENERIC_32 (F_sp_generic_32 ? GENERIC_32_LENGTH : 0) +struct generic_32_spacket_a +{ + char type; + char version; /* alphabetic, 0x60 + version */ + u_short repair_time; /* server estimate of repair time in seconds */ + u_short pl_orbit; /* what planet player orbiting, -1 if none */ + char pad1[26]; + /* NOTE: this version didn't use network byte order for the shorts */ +}; +#define GENERIC_32_VERSION_A 1 +struct generic_32_spacket_b +{ + char type; char version; /* alphabetic, 0x60 + version */ u_short repair_time; /* server estimate of repair time, seconds */ char pl_orbit; /* what planet player orbiting, -1 if none */ @@ -919,7 +935,7 @@ u_char starbase_remain; /* starbase reconstruction, mins */ u_char team_remain; /* team surrender time, seconds */ char pad1[18]; -}; +}; //__attribute__ ((packed)); #define GENERIC_32_VERSION_B 2 #define GENERIC_32_VERSION GENERIC_32_VERSION_B /* default */ From modemhero at users.sourceforge.net Sat Jul 12 07:09:40 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 12 Jul 2008 12:09:40 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.112, 1.113 feature.c, 1.22, 1.23 socket.c, 1.48, 1.49 Message-ID: <20080712120954.1F1C5B42E@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6576/src Modified Files: data.c feature.c socket.c Log Message: Next pass at generic_32 version b support. Known issues: can't find win32 equivalent for attribute packing, feature packet arg1 of /002 is causing pointer error to arg2 Index: feature.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/feature.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- feature.c 19 Apr 2008 20:03:01 -0000 1.22 +++ feature.c 12 Jul 2008 12:09:37 -0000 1.23 @@ -76,7 +76,7 @@ {"SELF_8FLAGS2", &F_self_8flags2, 'S', 0, 0, 0}, {"19FLAGS", &F_self_19flags, 'S', 1, 0, 0}, {"SHIP_CAP", &F_ship_cap, 'S', 1, 0, 0}, - {"SP_GENERIC_32", &F_sp_generic_32, 'S', 1, 0, 0}, + {"SP_GENERIC_32", &F_sp_generic_32, 'S', 1, "\002", 0}, {"FULL_DIRECTION_RESOLUTION", &F_full_direction_resolution, 'S', 1, 0, 0}, {"FULL_WEAPON_RESOLUTION", &F_full_weapon_resolution, 'S', 1, 0, 0}, {"CHECK_PLANETS", &F_check_planets, 'S', 1, 0, 0}, @@ -117,11 +117,15 @@ { struct feature *f; int value; + char arg1, arg2; for (f = features; f->name != 0; f++) { if (strcmpi (f->name, "FEATURE_PACKETS") != 0) { + value = f->value; + arg1 = (f->arg1 ? *f->arg1 : 0); + arg2 = (f->arg2 ? *f->arg2 : 0); if (!strcmp(f->name, "CHECK_PLANETS")) value = useCheckPlanets; else if (!strcmp(f->name, "FULL_DIRECTION_RESOLUTION")) @@ -130,16 +134,10 @@ value = useFullWeapInfo; else if (!strcmp(f->name, "SP_GENERIC_32")) value = useGeneric32; - else - value = f->value; - sendFeature (f->name, - f->feature_type, - value, - (char) (f->arg1 ? *f->arg1 : 0), - (char) (f->arg2 ? *f->arg2 : 0)); - + sendFeature (f->name, f->feature_type, value, arg1, arg2); #ifdef DEBUG - LineToConsole ("(C->S) %s (%c): %d\n", f->name, f->feature_type, value); + LineToConsole ("(C->S) %s (%c): %d (%d/%d)\n", f->name, + f->feature_type, value, arg1, arg2); #endif } } @@ -164,8 +162,9 @@ } #endif - sprintf (buf, "%s: %s(%d)", &packet->name[0], - ((value == 1) ? "ON" : (value == 0) ? "OFF" : "UNKNOWN"), value); + sprintf (buf, "%s: %s(%d) (%d/%d)", &packet->name[0], + ((value == 1) ? "ON" : (value == 0) ? "OFF" : "UNKNOWN"), value, + packet->arg1, packet->arg2); #ifdef TOOLS W_WriteText (toolsWin, 0, 0, textColor, buf, strlen (buf), W_RegularFont); @@ -213,7 +212,11 @@ lame_base_refit = value; return; } - + if (strcmpi (packet->name, "SP_GENERIC_32") == 0) + { + generic_32_version = packet->arg1; + return; + } if (features[i].name == 0) { LineToConsole ("Feature %s from server unknown to client!\n", packet->name); Index: socket.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- socket.c 12 Jul 2008 03:49:45 -0000 1.48 +++ socket.c 12 Jul 2008 12:09:37 -0000 1.49 @@ -922,7 +922,7 @@ if (paradise) size = sizeof(struct motd_pic_spacket); else - size = sizeof(struct generic_32_spacket); + size = GENERIC_32_LENGTH; break; case SP_STATS2: //case SP_FLAGS_ALL: @@ -2818,28 +2818,47 @@ #endif return; } - if (packet->version < 'a') - return; - else if (packet->version == 'a') + return; +} + +void +handleGeneric32_a (struct generic_32_spacket_a *packet) +{ + + if (sizeof(struct generic_32_spacket) != GENERIC_32_LENGTH) { - me->p_repair_time = packet->repair_time; - me->pl_orbit = packet->pl_orbit; - return; +#ifdef DEBUG + LineToConsole("Generic32 packet length of %d, ignoring packet.\n", sizeof(struct generic_32_spacket)); +#endif + return; } - else if (packet->version == 'b') + me->p_repair_time = packet->repair_time; + me->pl_orbit = packet->pl_orbit; + return; +} + +void +handleGeneric32_b (struct generic_32_spacket_b *packet) +{ + + if (sizeof(struct generic_32_spacket) != GENERIC_32_LENGTH) { - me->p_repair_time = ntohs (packet->repair_time); - me->pl_orbit = packet->pl_orbit; - context->gameup = ntohs(packet->gameup); - context->tournament_teams = packet->tournament_teams; - context->tournament_age = packet->tournament_age; - context->tournament_age_units = packet->tournament_age_units; - context->tournament_remain = packet->tournament_remain; - context->tournament_remain_units = packet->tournament_remain_units; - context->starbase_remain = packet->starbase_remain; - context->team_remain = packet->team_remain; - return; +#ifdef DEBUG + LineToConsole("Generic32 packet length of %d, ignoring packet.\n", sizeof(struct generic_32_spacket)); +#endif + return; } + me->p_repair_time = ntohs (packet->repair_time); + me->pl_orbit = packet->pl_orbit; + context->gameup = ntohs(packet->gameup); + context->tournament_teams = packet->tournament_teams; + context->tournament_age = packet->tournament_age; + context->tournament_age_units = packet->tournament_age_units; + context->tournament_remain = packet->tournament_remain; + context->tournament_remain_units = packet->tournament_remain_units; + context->starbase_remain = packet->starbase_remain; + context->team_remain = packet->team_remain; + return; } void @@ -2986,7 +3005,14 @@ if (paradise) handleMotdPic ((struct motd_pic_spacket *) sbuf); else - handleGeneric32 ((struct generic_32_spacket *) sbuf); + { + if (generic_32_version == 'a') + handleGeneric32_a ((struct generic_32_spacket_a *) sbuf); + else if (generic_32_version == 'b') + handleGeneric32_b ((struct generic_32_spacket_b *) sbuf); + else + handleGeneric32 ((struct generic_32_spacket *) sbuf); + } return; } void handlePacket33 (unsigned char *sbuf) @@ -5086,10 +5112,29 @@ { LineToConsole("\nS->C SP_GENERIC_32\t"); if (log_packets > 1) - LineToConsole(" version=%d, repair_time=%d, pl_orbit=%d,", - ((struct generic_32_spacket *) packet)->version, - ntohs(((struct generic_32_spacket *) packet)->repair_time), - ntohs(((struct generic_32_spacket *) packet)->pl_orbit) ); + { + if (generic_32_version == 'a') + LineToConsole(" version=%d, repair_time=%d, pl_orbit=%d,", + ((struct generic_32_spacket_a *) packet)->version, + ((struct generic_32_spacket_a *) packet)->repair_time, + ((struct generic_32_spacket_a *) packet)->pl_orbit); + else if (generic_32_version == 'b') + LineToConsole(" version=%d, repair_time=%d, pl_orbit=%d, gameup=%d, tourn_teams=%d, tourn_age=%d, tourn_age_units=%d, tourn_remain=%d, tourn_remain_units=%d, starbase_remain=%d, team_remain=%d,", + ((struct generic_32_spacket_b *) packet)->version, + ntohs(((struct generic_32_spacket_b *) packet)->repair_time), + ((struct generic_32_spacket_b *) packet)->pl_orbit, + ((struct generic_32_spacket_b *) packet)->gameup, + ((struct generic_32_spacket_b *) packet)->tournament_teams, + ((struct generic_32_spacket_b *) packet)->tournament_age, + ((struct generic_32_spacket_b *) packet)->tournament_age_units, + ((struct generic_32_spacket_b *) packet)->tournament_remain, + ((struct generic_32_spacket_b *) packet)->tournament_remain_units, + ((struct generic_32_spacket_b *) packet)->starbase_remain, + ((struct generic_32_spacket_b *) packet)->team_remain ); + + else + LineToConsole(" version=unknown," ); + } break; } case SP_FLAGS_ALL : Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- data.c 12 Jul 2008 03:49:45 -0000 1.112 +++ data.c 12 Jul 2008 12:09:37 -0000 1.113 @@ -928,4 +928,5 @@ int fullBitmapRotation = 1; /* draw old bitmap sets to all angles */ int hideConsole = 0; /* show console window or not */ +int generic_32_version = 0; /* what version of generic_32 does server send us */ struct context *context; From modemhero at users.sourceforge.net Sat Jul 12 07:09:38 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 12 Jul 2008 12:09:38 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.156,1.157 Message-ID: <20080712120949.01135B42E@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6576 Modified Files: clientr.suo Log Message: Next pass at generic_32 version b support. Known issues: can't find win32 equivalent for attribute packing, feature packet arg1 of /002 is causing pointer error to arg2 Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.156 retrieving revision 1.157 diff -u -d -r1.156 -r1.157 Binary files /tmp/cvsCEAIRy and /tmp/cvsLXaxox differ From modemhero at users.sourceforge.net Sat Jul 12 22:15:50 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 13 Jul 2008 03:15:50 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.102,1.103 Message-ID: <20080713031559.15C7D3B408E@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27091/include Modified Files: data.h Log Message: Next iteration on getting generic_32 version b working. Known issue: not getting packets from server with code for version a or earlier. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.102 retrieving revision 1.103 diff -u -d -r1.102 -r1.103 --- data.h 12 Jul 2008 12:09:36 -0000 1.102 +++ data.h 13 Jul 2008 03:15:47 -0000 1.103 @@ -658,6 +658,7 @@ extern int F_ship_cap; extern int F_show_all_tractors; extern int F_sp_generic_32; +extern char A_sp_generic_32; extern int F_full_direction_resolution; extern int F_full_weapon_resolution; extern int F_check_planets; @@ -834,6 +835,5 @@ extern int fullBitmapRotation; /* draw old bitmap sets to all angles */ extern int hideConsole; /* show console window or not */ -extern int generic_32_version; extern struct context *context; #endif /* _h_data */ From modemhero at users.sourceforge.net Sat Jul 12 22:15:50 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 13 Jul 2008 03:15:50 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.113, 1.114 feature.c, 1.23, 1.24 socket.c, 1.49, 1.50 Message-ID: <20080713031559.2E51C3B408F@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27091/src Modified Files: data.c feature.c socket.c Log Message: Next iteration on getting generic_32 version b working. Known issue: not getting packets from server with code for version a or earlier. Index: feature.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/feature.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- feature.c 12 Jul 2008 12:09:37 -0000 1.23 +++ feature.c 13 Jul 2008 03:15:48 -0000 1.24 @@ -76,7 +76,7 @@ {"SELF_8FLAGS2", &F_self_8flags2, 'S', 0, 0, 0}, {"19FLAGS", &F_self_19flags, 'S', 1, 0, 0}, {"SHIP_CAP", &F_ship_cap, 'S', 1, 0, 0}, - {"SP_GENERIC_32", &F_sp_generic_32, 'S', 1, "\002", 0}, + {"SP_GENERIC_32", &F_sp_generic_32, 'S', 1, &A_sp_generic_32, 0}, {"FULL_DIRECTION_RESOLUTION", &F_full_direction_resolution, 'S', 1, 0, 0}, {"FULL_WEAPON_RESOLUTION", &F_full_weapon_resolution, 'S', 1, 0, 0}, {"CHECK_PLANETS", &F_check_planets, 'S', 1, 0, 0}, @@ -133,7 +133,10 @@ else if (!strcmp(f->name, "FULL_WEAPON_RESOLUTION")) value = useFullWeapInfo; else if (!strcmp(f->name, "SP_GENERIC_32")) + { value = useGeneric32; + arg1 = GENERIC_32_VERSION; + } sendFeature (f->name, f->feature_type, value, arg1, arg2); #ifdef DEBUG LineToConsole ("(C->S) %s (%c): %d (%d/%d)\n", f->name, @@ -214,7 +217,7 @@ } if (strcmpi (packet->name, "SP_GENERIC_32") == 0) { - generic_32_version = packet->arg1; + A_sp_generic_32 = packet->arg1; return; } if (features[i].name == 0) Index: socket.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- socket.c 12 Jul 2008 12:09:37 -0000 1.49 +++ socket.c 13 Jul 2008 03:15:48 -0000 1.50 @@ -2810,28 +2810,12 @@ void handleGeneric32 (struct generic_32_spacket *packet) { - - if (sizeof(struct generic_32_spacket) != GENERIC_32_LENGTH) - { -#ifdef DEBUG - LineToConsole("Generic32 packet length of %d, ignoring packet.\n", sizeof(struct generic_32_spacket)); -#endif - return; - } return; } void handleGeneric32_a (struct generic_32_spacket_a *packet) { - - if (sizeof(struct generic_32_spacket) != GENERIC_32_LENGTH) - { -#ifdef DEBUG - LineToConsole("Generic32 packet length of %d, ignoring packet.\n", sizeof(struct generic_32_spacket)); -#endif - return; - } me->p_repair_time = packet->repair_time; me->pl_orbit = packet->pl_orbit; return; @@ -2840,14 +2824,6 @@ void handleGeneric32_b (struct generic_32_spacket_b *packet) { - - if (sizeof(struct generic_32_spacket) != GENERIC_32_LENGTH) - { -#ifdef DEBUG - LineToConsole("Generic32 packet length of %d, ignoring packet.\n", sizeof(struct generic_32_spacket)); -#endif - return; - } me->p_repair_time = ntohs (packet->repair_time); me->pl_orbit = packet->pl_orbit; context->gameup = ntohs(packet->gameup); @@ -3006,11 +2982,11 @@ handleMotdPic ((struct motd_pic_spacket *) sbuf); else { - if (generic_32_version == 'a') - handleGeneric32_a ((struct generic_32_spacket_a *) sbuf); - else if (generic_32_version == 'b') - handleGeneric32_b ((struct generic_32_spacket_b *) sbuf); - else + if (sbuf[1] == 'a') + handleGeneric32_a ((struct generic_32_spacket_a *) sbuf); + else if (sbuf[1] == 'b') + handleGeneric32_b ((struct generic_32_spacket_b *) sbuf); + else handleGeneric32 ((struct generic_32_spacket *) sbuf); } return; @@ -5113,12 +5089,12 @@ LineToConsole("\nS->C SP_GENERIC_32\t"); if (log_packets > 1) { - if (generic_32_version == 'a') + if (packet[1] == 'a') LineToConsole(" version=%d, repair_time=%d, pl_orbit=%d,", ((struct generic_32_spacket_a *) packet)->version, ((struct generic_32_spacket_a *) packet)->repair_time, ((struct generic_32_spacket_a *) packet)->pl_orbit); - else if (generic_32_version == 'b') + else if (packet[1] == 'b') LineToConsole(" version=%d, repair_time=%d, pl_orbit=%d, gameup=%d, tourn_teams=%d, tourn_age=%d, tourn_age_units=%d, tourn_remain=%d, tourn_remain_units=%d, starbase_remain=%d, team_remain=%d,", ((struct generic_32_spacket_b *) packet)->version, ntohs(((struct generic_32_spacket_b *) packet)->repair_time), Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -d -r1.113 -r1.114 --- data.c 12 Jul 2008 12:09:37 -0000 1.113 +++ data.c 13 Jul 2008 03:15:48 -0000 1.114 @@ -762,6 +762,7 @@ int F_ship_cap = 0; int F_show_all_tractors = 1; int F_sp_generic_32 = 0; +char A_sp_generic_32 = 0; /* last sp_generic_32 version sent by server */ int F_full_direction_resolution = 0; int F_full_weapon_resolution = 0; int F_check_planets = 0; @@ -928,5 +929,4 @@ int fullBitmapRotation = 1; /* draw old bitmap sets to all angles */ int hideConsole = 0; /* show console window or not */ -int generic_32_version = 0; /* what version of generic_32 does server send us */ struct context *context; From modemhero at users.sourceforge.net Sat Jul 12 22:15:49 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 13 Jul 2008 03:15:49 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.157,1.158 Message-ID: <20080713031559.4A5E73B4091@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27091 Modified Files: clientr.suo Log Message: Next iteration on getting generic_32 version b working. Known issue: not getting packets from server with code for version a or earlier. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.157 retrieving revision 1.158 diff -u -d -r1.157 -r1.158 Binary files /tmp/cvsC3JGYR and /tmp/cvsUPMdms differ From modemhero at users.sourceforge.net Sat Jul 12 22:56:49 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 13 Jul 2008 03:56:49 +0000 Subject: [netrek-cvs] client/netrekxp/src enter.c,1.17,1.18 Message-ID: <20080713035657.50E6FB42E@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10977/src Modified Files: enter.c Log Message: Initiialize context struct. Index: enter.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/enter.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- enter.c 18 Apr 2008 03:42:36 -0000 1.17 +++ enter.c 13 Jul 2008 03:56:46 -0000 1.18 @@ -57,6 +57,7 @@ initialize_thingies(); status2 = (struct status2 *) malloc(sizeof(*status2)); status = (struct status *) malloc(sizeof(*status)); + context = (struct context *) malloc(sizeof(*context)); initialize_planets(); mctl = (struct mctl *) malloc(sizeof(*mctl)); messages = (struct message *) malloc(sizeof(*messages) * MAXMESSAGE); From modemhero at users.sourceforge.net Sat Jul 12 22:56:48 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 13 Jul 2008 03:56:48 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.158,1.159 Message-ID: <20080713035657.54F69B445@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10977 Modified Files: clientr.suo Log Message: Initiialize context struct. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.158 retrieving revision 1.159 diff -u -d -r1.158 -r1.159 Binary files /tmp/cvsddvmYk and /tmp/cvsNELzDn differ From modemhero at users.sourceforge.net Sun Jul 13 20:52:50 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 14 Jul 2008 01:52:50 +0000 Subject: [netrek-cvs] client/netrekxp/include packets.h,1.15,1.16 Message-ID: <20080714015258.763EAB433@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31318/include Modified Files: packets.h Log Message: Fixes packing for generic 32 b struct. Fixes bug in packet log display for generic 32. Index: packets.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- packets.h 12 Jul 2008 12:09:36 -0000 1.15 +++ packets.h 14 Jul 2008 01:52:47 -0000 1.16 @@ -903,6 +903,7 @@ unsigned short s_bitmap; }; +#pragma pack(push,1) struct generic_32_spacket { char type; @@ -935,7 +936,9 @@ u_char starbase_remain; /* starbase reconstruction, mins */ u_char team_remain; /* team surrender time, seconds */ char pad1[18]; -}; //__attribute__ ((packed)); +}; +#pragma pack(pop) + #define GENERIC_32_VERSION_B 2 #define GENERIC_32_VERSION GENERIC_32_VERSION_B /* default */ From modemhero at users.sourceforge.net Sun Jul 13 20:52:50 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 14 Jul 2008 01:52:50 +0000 Subject: [netrek-cvs] client/netrekxp/src socket.c,1.50,1.51 Message-ID: <20080714015258.7FAF8B447@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31318/src Modified Files: socket.c Log Message: Fixes packing for generic 32 b struct. Fixes bug in packet log display for generic 32. Index: socket.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- socket.c 13 Jul 2008 03:15:48 -0000 1.50 +++ socket.c 14 Jul 2008 01:52:48 -0000 1.51 @@ -5099,7 +5099,7 @@ ((struct generic_32_spacket_b *) packet)->version, ntohs(((struct generic_32_spacket_b *) packet)->repair_time), ((struct generic_32_spacket_b *) packet)->pl_orbit, - ((struct generic_32_spacket_b *) packet)->gameup, + ntohs(((struct generic_32_spacket_b *) packet)->gameup), ((struct generic_32_spacket_b *) packet)->tournament_teams, ((struct generic_32_spacket_b *) packet)->tournament_age, ((struct generic_32_spacket_b *) packet)->tournament_age_units, From modemhero at users.sourceforge.net Sun Jul 13 20:52:49 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 14 Jul 2008 01:52:49 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.159,1.160 Message-ID: <20080714015258.5F13CB403@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31318 Modified Files: clientr.suo Log Message: Fixes packing for generic 32 b struct. Fixes bug in packet log display for generic 32. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.159 retrieving revision 1.160 diff -u -d -r1.159 -r1.160 Binary files /tmp/cvsWPhf9k and /tmp/cvsZxKM0x differ From modemhero at users.sourceforge.net Tue Jul 15 19:16:53 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 16 Jul 2008 00:16:53 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.204, 1.205 netrekrc_options.txt, 1.56, 1.57 Message-ID: <20080716001702.A86DB3B40A8@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31114/docs Modified Files: changes.txt netrekrc_options.txt Log Message: Add new dashboard timerType that displays info from generic 32 b packet in order of importance (INL time > surrender time > sb reconstruct time > time since t mode started). Defaults to current time of day if server does not use generic 32 b. Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- netrekrc_options.txt 19 Apr 2008 16:22:57 -0000 1.56 +++ netrekrc_options.txt 16 Jul 2008 00:16:51 -0000 1.57 @@ -304,6 +304,7 @@ # 2 - server time # 3 - time in ship # 4 - user-set time +# 5 - game-related timers tpDotDist: (int) distance between tractor/pressor dots (default 10) tractorID: (on/off) show the ID of player you are tractoring as a number below your ship Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.204 retrieving revision 1.205 diff -u -d -r1.204 -r1.205 --- changes.txt 19 Apr 2008 16:22:56 -0000 1.204 +++ changes.txt 16 Jul 2008 00:16:51 -0000 1.205 @@ -8,6 +8,8 @@ New features: 1) Addition of 3rd metaserver to the metaserver list. 2) Added support for new server feature packets (lame_refit and whydead_2). +3) Added new timerType option for displaying useful game-related timers like +surrender, sb reconstruct, INL, and t mode duration. General changes: 1) Removed option for ship specific netrekrc file (rcfile-). Still can From modemhero at users.sourceforge.net Tue Jul 15 19:16:54 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 16 Jul 2008 00:16:54 +0000 Subject: [netrek-cvs] client/netrekxp/resources/netrekrc netrekrc.txt, 1.6, 1.7 Message-ID: <20080716001702.5DF513B40A8@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/netrekrc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31114/netrekrc Modified Files: netrekrc.txt Log Message: Add new dashboard timerType that displays info from generic 32 b packet in order of importance (INL time > surrender time > sb reconstruct time > time since t mode started). Defaults to current time of day if server does not use generic 32 b. Index: netrekrc.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/netrekrc/netrekrc.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- netrekrc.txt 12 Jul 2008 03:49:45 -0000 1.6 +++ netrekrc.txt 16 Jul 2008 00:16:51 -0000 1.7 @@ -463,6 +463,7 @@ # 2 - show time on server # 3 - show time in ship # 4 - show user-set time +# 5 - show game-related timers timerType: 1 # Distance between tractor/pressor dots @@ -487,7 +488,7 @@ # 0 - TCP # 1 - simple UDP (default) # 2 - enforced UDP (state) -# 3 - enfotrced UDP (state & weapons) +# 3 - enforced UDP (state & weapons) udpClientSend: 1 # Print UDP debug information From modemhero at users.sourceforge.net Tue Jul 15 19:16:14 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 16 Jul 2008 00:16:14 +0000 Subject: [netrek-cvs] client/netrekxp/src dashboard.c, 1.28, 1.29 defaults.c, 1.92, 1.93 enter.c, 1.18, 1.19 option.c, 1.55, 1.56 socket.c, 1.51, 1.52 Message-ID: <20080716001629.04355B435@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30468/src Modified Files: dashboard.c defaults.c enter.c option.c socket.c Log Message: Add new dashboard timerType that displays info from generic 32 b packet in order of importance (INL time > surrender time > sb reconstruct time > time since t mode started). Defaults to current time of day if server does not use generic 32 b. Index: dashboard.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/dashboard.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- dashboard.c 19 Apr 2008 20:03:00 -0000 1.28 +++ dashboard.c 16 Jul 2008 00:16:10 -0000 1.29 @@ -204,6 +204,19 @@ case T_USER: s = "TMR"; break; + /* Variable game-related timers, display in order of importance */ + case T_UTIL: + if (context->tournament_remain) + s = "INL"; + else if (context->team_remain) + s = "SUR"; + else if (context->starbase_remain) + s = "SB "; + else if (context->tournament_age) + s = "TMD"; + else + s = "NOW"; + break; } if(s) { @@ -222,7 +235,27 @@ get the timer string and start comparing it with the old one. Only print the differences */ - timer = timeString(now - timeBank[timerType]); + switch (timerType) + { + case T_DAY: + case T_SERVER: + case T_SHIP: + case T_USER: + timer = timeString(now - timeBank[timerType]); + break; + case T_UTIL: + if (context->tournament_remain) + sprintf(timer, " %03d %c", context->tournament_remain, context->tournament_remain_units); + else if (context->team_remain) + sprintf(timer, " %03d s", context->team_remain); + else if (context->starbase_remain) + sprintf(timer, " %03d m", context->starbase_remain); + else if (context->tournament_age) + sprintf(timer, " %03d %c", context->tournament_age, context->tournament_age_units); + else + timer = timeString(now - timeBank[timerType]); + break; + } x = xloc + 4 * W_Textwidth; left = 0; right = -1; Index: enter.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/enter.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- enter.c 13 Jul 2008 03:56:46 -0000 1.18 +++ enter.c 16 Jul 2008 00:16:10 -0000 1.19 @@ -57,8 +57,8 @@ initialize_thingies(); status2 = (struct status2 *) malloc(sizeof(*status2)); status = (struct status *) malloc(sizeof(*status)); - context = (struct context *) malloc(sizeof(*context)); initialize_planets(); + initialize_context(); mctl = (struct mctl *) malloc(sizeof(*mctl)); messages = (struct message *) malloc(sizeof(*messages) * MAXMESSAGE); Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- option.c 19 Apr 2008 16:23:00 -0000 1.55 +++ option.c 16 Jul 2008 00:16:11 -0000 1.56 @@ -154,6 +154,7 @@ "Timer shows time on server", "Timer shows time in ship", "Timer shows user-set time", + "Timer shows game-related info", "" }; Index: socket.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- socket.c 14 Jul 2008 01:52:48 -0000 1.51 +++ socket.c 16 Jul 2008 00:16:11 -0000 1.52 @@ -2975,6 +2975,21 @@ } } +void +initialize_context(void) +{ + context = (struct context *) malloc(sizeof(*context)); + + context->gameup = 0; + context->tournament_teams = 0; + context->tournament_age = 0; + context->tournament_age_units = 0; + context->tournament_remain = 0; + context->tournament_remain_units = 0; + context->starbase_remain = 0; + context->team_remain = 0; +} + /* Functions to handle the overloaded packet types 32 and 33 */ void handlePacket32 (unsigned char *sbuf) { Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.92 retrieving revision 1.93 diff -u -d -r1.92 -r1.93 --- defaults.c 19 Apr 2008 16:22:59 -0000 1.92 +++ defaults.c 16 Jul 2008 00:16:10 -0000 1.93 @@ -837,6 +837,7 @@ "2 - show time on server", "3 - show time in ship", "4 - show user-set time", + "5 - show game-related timers", NULL } }, From modemhero at users.sourceforge.net Tue Jul 15 19:17:03 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 16 Jul 2008 00:17:03 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.57, 1.58 Message-ID: <20080716001712.406C3B42F@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31197 Modified Files: generalconfig.html Log Message: Add new dashboard timerType that displays info from generic 32 b packet in order of importance (INL time > surrender time > sb reconstruct time > time since t mode started). Defaults to current time of day if server does not use generic 32 b. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- generalconfig.html 19 Apr 2008 16:22:57 -0000 1.57 +++ generalconfig.html 16 Jul 2008 00:17:00 -0000 1.58 @@ -1403,6 +1403,7 @@
  • 2 - server time
  • 3 - time in ship
  • 4 - user-set time
    • +
  • 5 - game-related timers
    • From modemhero at users.sourceforge.net Tue Jul 15 19:16:12 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 16 Jul 2008 00:16:12 +0000 Subject: [netrek-cvs] client/netrekxp/include defs.h, 1.33, 1.34 packets.h, 1.16, 1.17 proto.h, 1.63, 1.64 struct.h, 1.29, 1.30 Message-ID: <20080716001651.D4B713B40A8@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30468/include Modified Files: defs.h packets.h proto.h struct.h Log Message: Add new dashboard timerType that displays info from generic 32 b packet in order of importance (INL time > surrender time > sb reconstruct time > time since t mode started). Defaults to current time of day if server does not use generic 32 b. Index: defs.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- defs.h 19 Apr 2008 16:22:56 -0000 1.33 +++ defs.h 16 Jul 2008 00:16:08 -0000 1.34 @@ -487,7 +487,8 @@ #define T_SERVER 2 /* time on server */ #define T_SHIP 3 /* time in ship */ #define T_USER 4 /* user reset timer */ -#define T_TOTAL 5 /* number of T_ defs */ +#define T_UTIL 5 /* t mode/sb/inl/surr time, from generic 32 */ +#define T_TOTAL 6 /* number of T_ defs */ /* The maximum length of message in buffer */ #define MAX_MLENGTH 286 Index: packets.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- packets.h 14 Jul 2008 01:52:47 -0000 1.16 +++ packets.h 16 Jul 2008 00:16:09 -0000 1.17 @@ -903,7 +903,9 @@ unsigned short s_bitmap; }; -#pragma pack(push,1) +#pragma pack(push,1) /* Necessary to remove padding during compile, + size of struct needs to be exact, GCC equivalent + is __attribute__ (( packed )) */ struct generic_32_spacket { char type; @@ -937,7 +939,7 @@ u_char team_remain; /* team surrender time, seconds */ char pad1[18]; }; -#pragma pack(pop) +#pragma pack(pop) /* Restores packing values saved by push */ #define GENERIC_32_VERSION_B 2 #define GENERIC_32_VERSION GENERIC_32_VERSION_B /* default */ Index: struct.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- struct.h 12 Jul 2008 03:49:45 -0000 1.29 +++ struct.h 16 Jul 2008 00:16:09 -0000 1.30 @@ -166,6 +166,23 @@ * (append) ) byte18++: the text to pre or append .. depending on termination * above. text is null terminated and the last thing in this distress */ +/* The following defines are for gameup field */ +#define GU_GAMEOK 0x1 +#define GU_PRACTICE 0x2 /* Basepractice robot is present */ +/* also set by INL robot during a pause, in pre-game, or post-game */ +#define GU_CHAOS 0x4 +/* also set by INL robot in post-game */ +#define GU_PAUSED 0x8 +#define GU_INROBOT 0x10 /* INL robot is present */ +#define GU_NEWBIE 0x20 /* Newbie robot is present */ +#define GU_PRET 0x40 /* Pre-t robot is present */ +#define GU_BOT_IN_GAME 0x80 /* Pre-t robot + bots are present */ +#define GU_CONQUER 0x100 /* conquest parade in progress */ +#define GU_PUCK 0x200 /* Hockey robot is present */ +#define GU_DOG 0x400 /* Dogfight robot is present */ +#define GU_INL_DRAFTING 0x800 /* INL draft pre-game is in progress */ +#define GU_INL_DRAFTED 0x1000 /* INL draft game is in progress */ + #define PFREE 0 #define POUTFIT 1 #define PALIVE 2 Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- proto.h 19 Apr 2008 16:22:56 -0000 1.63 +++ proto.h 16 Jul 2008 00:16:09 -0000 1.64 @@ -1161,6 +1161,7 @@ void initialize_plasmas (void); void initialize_torps (void); void initialize_phasers (void); +void initialize_context (void); // Paradise handlers void build_default_configuration (void); void load_default_teams (void); From modemhero at users.sourceforge.net Wed Jul 16 18:23:09 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 16 Jul 2008 23:23:09 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.160,1.161 Message-ID: <20080716232318.A26ED3B40BF@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5463 Modified Files: clientr.suo Log Message: Bug fix to timer display, remove zeroes. Add fuse to metaserver lookup so it doesn't loop forever. Add control-R (refresh) and q (quit) keys to metaserver window. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.160 retrieving revision 1.161 diff -u -d -r1.160 -r1.161 Binary files /tmp/cvsUUXYX6 and /tmp/cvstZdISy differ From modemhero at users.sourceforge.net Wed Jul 16 18:23:09 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 16 Jul 2008 23:23:09 +0000 Subject: [netrek-cvs] client/netrekxp/include packets.h, 1.17, 1.18 struct.h, 1.30, 1.31 Message-ID: <20080716232318.F262E3B40BF@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5463/include Modified Files: packets.h struct.h Log Message: Bug fix to timer display, remove zeroes. Add fuse to metaserver lookup so it doesn't loop forever. Add control-R (refresh) and q (quit) keys to metaserver window. Index: packets.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/packets.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- packets.h 16 Jul 2008 00:16:09 -0000 1.17 +++ packets.h 16 Jul 2008 23:23:07 -0000 1.18 @@ -931,7 +931,7 @@ char pl_orbit; /* what planet player orbiting, -1 if none */ u_short gameup; /* server status flags */ u_char tournament_teams; /* what teams are involved */ - u_char tournament_age; /* duration of t-mode so far */ + u_char tournament_age; /* time since last t-mode start */ char tournament_age_units; /* units for above, see s2du */ u_char tournament_remain; /* remaining INL game time */ char tournament_remain_units; /* units for above, see s2du */ Index: struct.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/struct.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- struct.h 16 Jul 2008 00:16:09 -0000 1.30 +++ struct.h 16 Jul 2008 23:23:07 -0000 1.31 @@ -961,7 +961,7 @@ { u_short gameup; /* server status flags */ u_char tournament_teams; /* what teams are involved */ - u_char tournament_age; /* duration of t-mode so far */ + u_char tournament_age; /* time since last t-mode start */ char tournament_age_units; /* units for above, see s2du */ u_char tournament_remain; /* remaining INL game time */ char tournament_remain_units; /* units for above, see s2du */ From modemhero at users.sourceforge.net Wed Jul 16 18:23:10 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 16 Jul 2008 23:23:10 +0000 Subject: [netrek-cvs] client/netrekxp/src dashboard.c, 1.29, 1.30 parsemeta.c, 1.43, 1.44 Message-ID: <20080716232319.841763B40BF@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5463/src Modified Files: dashboard.c parsemeta.c Log Message: Bug fix to timer display, remove zeroes. Add fuse to metaserver lookup so it doesn't loop forever. Add control-R (refresh) and q (quit) keys to metaserver window. Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- parsemeta.c 8 Jul 2008 02:00:53 -0000 1.43 +++ parsemeta.c 16 Jul 2008 23:23:07 -0000 1.44 @@ -1278,6 +1278,8 @@ * used in newwin() to set the height of the meta-server window. */ { + int fuse = 3; + /* host names of metaservers, default in data.c, comma delimited */ if ((stringDefault("metaServer")) != NULL) metaServer = stringDefault("metaServer"); @@ -1308,7 +1310,11 @@ case 1: ReadMetasSend(); LoadMetasCache(); - if (num_servers == 0) ReadMetasRecv(-1); + while (num_servers < 2) { + ReadMetasRecv(-1); + sleep(1); + if (!fuse--) break; + } if (num_servers != 0) { /* Allocate 4 spots for header/refresh/quit/link */ metaHeight = num_servers + 4; @@ -1629,10 +1635,10 @@ /* Add refresh option */ if (type == 1) - W_WriteText(metaWin, 0, metaHeight-3, W_Yellow, "Refresh", 7, 0); + W_WriteText(metaWin, 0, metaHeight-3, W_Yellow, "Refresh (Ctrl-R)", 16, 0); /* Add quit option */ - W_WriteText (metaWin, 0, metaHeight-2, W_Yellow, "Quit", 4, 0); + W_WriteText (metaWin, 0, metaHeight-2, W_Yellow, "Quit (q)", 8, 0); /* Additional Help Options */ W_WriteText (metaWin, 0, metaHeight-1, W_Yellow, @@ -1792,8 +1798,16 @@ switch ((int) data.type) { case W_EV_KEY: - if (data.Window == metaWin) - metaaction (&data); + if (data.key == 113 || data.key == 196) { /* q or ^d */ + metadone(); + terminate (0); + } + else if (data.key == 114 || data.key == 210) { /* r or ^r */ + W_WriteText(metaWin, 0, metaHeight-3, W_Red, "Asking for refresh from metaservers and nearby servers", 54, 0); + ReadMetasSend(); + } + else if (data.Window == metaWin) + metaaction(&data); break; case W_EV_BUTTON: if (data.Window == metaWin) Index: dashboard.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/dashboard.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- dashboard.c 16 Jul 2008 00:16:10 -0000 1.29 +++ dashboard.c 16 Jul 2008 23:23:07 -0000 1.30 @@ -245,13 +245,13 @@ break; case T_UTIL: if (context->tournament_remain) - sprintf(timer, " %03d %c", context->tournament_remain, context->tournament_remain_units); + sprintf(timer, " %3d %c", context->tournament_remain, context->tournament_remain_units); else if (context->team_remain) - sprintf(timer, " %03d s", context->team_remain); + sprintf(timer, " %3d s", context->team_remain); else if (context->starbase_remain) - sprintf(timer, " %03d m", context->starbase_remain); + sprintf(timer, " %3d m", context->starbase_remain); else if (context->tournament_age) - sprintf(timer, " %03d %c", context->tournament_age, context->tournament_age_units); + sprintf(timer, " %3d %c", context->tournament_age, context->tournament_age_units); else timer = timeString(now - timeBank[timerType]); break; From modemhero at users.sourceforge.net Wed Jul 16 21:55:25 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 17 Jul 2008 02:55:25 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c,1.113,1.114 Message-ID: <20080717025534.B5239B442@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27353 Modified Files: local.c Log Message: Remove user config clientr.suo visual studio file. Add game paused message on local during GU_PAUSED. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -d -r1.113 -r1.114 --- local.c 12 Jul 2008 03:49:45 -0000 1.113 +++ local.c 17 Jul 2008 02:55:23 -0000 1.114 @@ -1517,20 +1517,31 @@ } #endif + if (context->gameup & GU_PAUSED)\ + { + W_WriteTTSText(w, TWINSIDE, tts_ypos, "G A M E P A U S E D", 20); + clearzone[0][clearcount] = last_tts_xpos; + clearzone[1][clearcount] = tts_ypos - W_Textheight; + clearzone[2][clearcount] = last_tts_width; + clearzone[3][clearcount] = W_Textheight; + clearcount++; + } + else + { #ifdef BEEPLITE if (tts_timer) { - tts_timer--; - if (!tts_timer) - { - /* timed out */ - last_tts_width = 0; - } - else - { - /* draw */ - W_WriteTTSText(w, TWINSIDE, tts_ypos, lastIn, tts_len); - clearzone[0][clearcount] = last_tts_xpos; + tts_timer--; + if (!tts_timer) + { + /* timed out */ + last_tts_width = 0; + } + else + { + /* draw */ + W_WriteTTSText(w, TWINSIDE, tts_ypos, lastIn, tts_len); + clearzone[0][clearcount] = last_tts_xpos; clearzone[1][clearcount] = tts_ypos - W_Textheight; clearzone[2][clearcount] = last_tts_width; clearzone[3][clearcount] = W_Textheight; @@ -1538,6 +1549,7 @@ } } #endif + } /* When cloaked, stop here. */ if (j->p_flags & PFCLOAK) From modemhero at users.sourceforge.net Thu Jul 17 17:59:51 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 17 Jul 2008 22:59:51 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c,1.114,1.115 Message-ID: <20080717230000.345F23B40C0@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12976 Modified Files: local.c Log Message: Update changes. Fix conquer/pause display. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- local.c 17 Jul 2008 02:55:23 -0000 1.114 +++ local.c 17 Jul 2008 22:59:48 -0000 1.115 @@ -1517,7 +1517,7 @@ } #endif - if (context->gameup & GU_PAUSED)\ + if ((context->gameup & GU_PAUSED) && !(context->gameup & GU_CONQUER)) { W_WriteTTSText(w, TWINSIDE, tts_ypos, "G A M E P A U S E D", 20); clearzone[0][clearcount] = last_tts_xpos; From modemhero at users.sourceforge.net Fri Jul 18 16:21:18 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 18 Jul 2008 21:21:18 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.161,NONE Message-ID: <20080718212126.CBF823B4093@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15389 Removed Files: clientr.suo Log Message: Update changes. --- clientr.suo DELETED --- From modemhero at users.sourceforge.net Fri Jul 18 16:21:13 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 18 Jul 2008 21:21:13 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.205, 1.206 Message-ID: <20080718212151.B6970B42B@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15389/resources/docs Modified Files: changes.txt Log Message: Update changes. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.205 retrieving revision 1.206 diff -u -d -r1.205 -r1.206 --- changes.txt 16 Jul 2008 00:16:51 -0000 1.205 +++ changes.txt 18 Jul 2008 21:21:11 -0000 1.206 @@ -1,4 +1,4 @@ -Netrek XP 2009, Version 1.0: (Released April-2008) +Netrek XP 2009, Version 1.0: (Released July-2008) General bug fixes: 1) Fix to cloak bug where ships would briefly be seen to flash when entering @@ -7,9 +7,12 @@ New features: 1) Addition of 3rd metaserver to the metaserver list. -2) Added support for new server feature packets (lame_refit and whydead_2). +2) Added support for new server feature packets (lame_refit, whydead_2, +generic_32_b). 3) Added new timerType option for displaying useful game-related timers like surrender, sb reconstruct, INL, and t mode duration. +4) Added game paused message to local window (at TTS location) if server is +paused, such as during an INL timeout. General changes: 1) Removed option for ship specific netrekrc file (rcfile-). Still can From modemhero at users.sourceforge.net Wed Jul 23 05:09:37 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 23 Jul 2008 10:09:37 +0000 Subject: [netrek-cvs] client/netrekxp/src input.c,1.46,1.47 Message-ID: <20080723100947.4DD3BB437@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6665 Modified Files: input.c Log Message: Fix crash bug with lockbaseorplanet. Index: input.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/input.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- input.c 19 Apr 2008 16:23:00 -0000 1.46 +++ input.c 23 Jul 2008 10:09:34 -0000 1.47 @@ -366,7 +366,7 @@ } } - for (i = 0, j = &players[i]; i < MAXPLAYER; i++, j++) + for (i = 0, j = &players[i]; i < nplayers; i++, j++) { if (j->p_status != PALIVE) continue;