[conquest] Conquest 7.2e (devel) is now available
Jon Trulson
jon at radscan.com
Sat Nov 22 16:31:44 MST 2003
At the usual place. Ordinarily I would not release an update in
such quick succession, however 7.2d had a bug in which you would get
ejected from the game when you were killed. Kind of annoying.
I also fixed conquestd to reload sysconf before updating the
metaserver so that it will properly track changes without requiring that
conquestd be killed and restarted.
Since the patch is pretty small, I've attached a universal diff
that you can apply to 7.2d in case you don't want to download the whole
7.2e.
--
Jon Trulson mailto:jon at radscan.com
ID: 1A9A2B09, FP: C23F328A721264E7 B6188192EC733962
PGP keys at http://radscan.com/~jon/PGPKeys.txt
#include <std/disclaimer.h>
You need to update your sig file. -Bryan
-------------- next part --------------
Index: README-DEV-RELEASE.txt
===================================================================
RCS file: /home/jon/src/repository/conquest/README-DEV-RELEASE.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README-DEV-RELEASE.txt 2003/11/21 02:53:18 1.3
+++ README-DEV-RELEASE.txt 2003/11/22 23:02:06 1.4
@@ -1,3 +1,13 @@
+11/22/2003
+7.2e
+
+ - fixed bug introduced in 7.2d, where when you were killed,
+ you would be booted out of the game.
+
+ - conquestd will now reload sysConf before updating the
+ metaserver so that any changes (flags, motd, etc) will be
+ kept up to date.
+
11/20/2003
7.2d
@@ -10,7 +20,9 @@
conquest -s conquest.radscan.com:1702
- - added meta server (conqmetad) and functionality to conquestd.
+ - added meta server (conqmetad) and functionality to
+ conquestd, based on a suggestion and some ideas from Josef
+ Jahn.
- meta server listens on TCP and UDP port 1700. The UDP
port is incoming only, and is used to recieve updates from
@@ -22,9 +34,10 @@
- new options added to conquestd:
- '-m' update the meta server (default: conquest.radscan.com)
+ '-m' update the meta server
- '-M <metaserver>' use metaserver <metaserver>
+ '-M <metaserver>' use metaserver <metaserver>. (default:
+ conquest.radscan.com)
'-N <myname>' tell the metaserver to use <myname> as the
server address. Otherwise conqmetad will use the src
Index: conqmetad.c
===================================================================
RCS file: /home/jon/src/repository/conquest/conqmetad.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conqmetad.c 2003/11/21 02:53:19 1.1
+++ conqmetad.c 2003/11/22 23:02:06 1.2
@@ -4,7 +4,7 @@
*
* conqmetad - the Conquest meta server. Similiar to conquestd no? :)
*
- * $Id: conqmetad.c,v 1.1 2003/11/21 02:53:19 jon Exp $
+ * $Id: conqmetad.c,v 1.2 2003/11/22 23:02:06 jon Exp $
*
* Copyright 2004 Jon Trulson under the ARTISTIC LICENSE. (See LICENSE).
***********************************************************************/
@@ -231,7 +231,7 @@
exit(1);
}
- /* allocate an open socket for incoming UDP connections */
+ /* allocate an open socket for incoming TCP connections */
if (( t = socket(AF_INET, SOCK_STREAM, 0)) < 0)
{
perror ( "TCP socket" );
@@ -263,7 +263,7 @@
/* go into infinite loop waiting for new connections */
while (TRUE)
{
- tv.tv_sec = 30; /* age servers avery 30 secs */
+ tv.tv_sec = 30; /* age servers every 30 secs */
tv.tv_usec = 0;
FD_ZERO(&readfds);
FD_SET(s, &readfds);
@@ -473,8 +473,6 @@
/* setup, listen for, and process client connections. */
metaListen();
-
- /* clog("CONNECT: client %s\n", sInfo.remotehost);*/
exit(0);
Index: conquest.c
===================================================================
RCS file: /home/jon/src/repository/conquest/conquest.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- conquest.c 2003/11/21 02:53:19 1.19
+++ conquest.c 2003/11/22 23:02:06 1.20
@@ -2,7 +2,7 @@
/************************************************************************
*
- * $Id: conquest.c,v 1.19 2003/11/21 02:53:19 jon Exp $
+ * $Id: conquest.c,v 1.20 2003/11/22 23:02:06 jon Exp $
*
* Copyright 1999-2004 Jon Trulson under the ARTISTIC LICENSE. (See LICENSE).
***********************************************************************/
@@ -991,6 +991,11 @@
sendMessage(MSG_GOD, buf);
}
+ /* set the ship reserved (locally). The server has already done this
+ but we have not processed any packets since we died. This keeps
+ menu() from booting us out of the game. */
+ Ships[Context.snum].status = SS_RESERVED;
+
ioeat();
putpmt( MTXT_DONE, MSG_LIN2 );
cdrefresh();
@@ -2931,7 +2936,7 @@
break;
}
while ( stillalive( Context.snum ) && !Context.leave );
-
+
return;
}
@@ -3331,9 +3336,6 @@
*unum = (int)ntohs(scstat->unum);
Context.snum = scstat->snum;
Ships[Context.snum].team = scstat->team;
-
- clog("conquest:welcome: SP_CLIENTSTAT: unum = %d(%d), team = %d (%d), snum = %d",
- *unum, scstat->unum, Ships[Context.snum].team, scstat->team, Context.snum);
break;
case SP_ACK:
Index: conquestd.c
===================================================================
RCS file: /home/jon/src/repository/conquest/conquestd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- conquestd.c 2003/11/21 02:53:19 1.3
+++ conquestd.c 2003/11/22 23:02:06 1.4
@@ -4,7 +4,7 @@
*
* conquestd - the Conquest server/client driver
*
- * $Id: conquestd.c,v 1.3 2003/11/21 02:53:19 jon Exp $
+ * $Id: conquestd.c,v 1.4 2003/11/22 23:02:06 jon Exp $
*
* Copyright 2003 Jon Trulson under the ARTISTIC LICENSE. (See LICENSE).
***********************************************************************/
@@ -173,7 +173,12 @@
while (TRUE)
{
if (updateMeta)
- metaUpdateServer(metaServer, myServerName, listenPort);
+ {
+ /* get any changes to sysconf so that meta updates are
+ up to date */
+ GetSysConf(TRUE);
+ metaUpdateServer(metaServer, myServerName, listenPort);
+ }
tv.tv_sec = 120; /* update meta server every 120 secs */
tv.tv_usec = 0;
@@ -750,9 +755,12 @@
Context.unum, 0))
{ /* an error, let the ai code choose some
last words and bail */
- robreply(buf);
- strncpy(ConqInfo->lastwords, buf, MAXLASTWORDS - 1);
- ConqInfo->lastwords[MAXLASTWORDS - 1] = 0;
+ if (kb == KB_CONQUER)
+ {
+ robreply(buf);
+ strncpy(ConqInfo->lastwords, buf, MAXLASTWORDS - 1);
+ ConqInfo->lastwords[MAXLASTWORDS - 1] = 0;
+ }
return;
}
Index: version.c
===================================================================
RCS file: /home/jon/src/repository/conquest/version.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- version.c 2003/11/21 02:53:19 1.26
+++ version.c 2003/11/22 23:02:06 1.27
@@ -2,14 +2,14 @@
*
* version.c - conquest's version number
*
- * $Id: version.c,v 1.26 2003/11/21 02:53:19 jon Exp $
+ * $Id: version.c,v 1.27 2003/11/22 23:02:06 jon Exp $
*
*
* Copyright 1999-2004 Jon Trulson under the ARTISTIC LICENSE. (See LICENSE).
***********************************************************************/
-const char *ConquestId = "$Id: version.c,v 1.26 2003/11/21 02:53:19 jon Exp $";
-const char *ConquestVersion = "Version 7.2d";
-const char *ConquestDate = "11/20/2003";
+const char *ConquestId = "$Id: version.c,v 1.27 2003/11/22 23:02:06 jon Exp $";
+const char *ConquestVersion = "Version 7.2e";
+const char *ConquestDate = "11/22/2003";
/* That's it! */
More information about the Conquest
mailing list