From modemhero at users.sourceforge.net Sun Jun 15 17:59:47 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 15 Jun 2008 22:59:47 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.164, 1.165 clientr.suo, 1.150, 1.151 Message-ID: <20080615225956.18FDDB42C@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28920 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Minor todo list change. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.164 retrieving revision 1.165 diff -u -d -r1.164 -r1.165 --- NetrekXP to do list.C 19 Apr 2008 20:02:57 -0000 1.164 +++ NetrekXP to do list.C 15 Jun 2008 22:59:44 -0000 1.165 @@ -11,7 +11,7 @@ 8) newbie/pret: monitor vs full_hostname 9) on daemon exit in newbie/pret, kill any hosed bot slots 10) end game bots are stupid, and on timericide don't act right -11) feature packet for rank names and requirements + Things that are sorta fixed, but could use improvement: 1) Border issue - quite complex problem, how to know the borders to obey after the bitmap Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.150 retrieving revision 1.151 diff -u -d -r1.150 -r1.151 Binary files /tmp/cvsKgqWUW and /tmp/cvsvZCa4u differ From modemhero at users.sourceforge.net Sun Jun 15 19:05:49 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 16 Jun 2008 00:05:49 +0000 Subject: [netrek-cvs] client/netrekxp/src socket.c,1.45,1.46 Message-ID: <20080616000559.66179B42A@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3559/src Modified Files: socket.c Log Message: Update build script to point to new RSA key. Initialize # of plasma torps per ship - was causing plasma sound to play erroneously sometimes on connect to server. Index: socket.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- socket.c 19 Apr 2008 20:03:05 -0000 1.45 +++ socket.c 16 Jun 2008 00:05:47 -0000 1.46 @@ -2887,6 +2887,7 @@ players[i].p_cloakphase = 0; players[i].p_no = i; players[i].p_ntorp = 0; + players[i].p_nplasmatorp = 0; players[i].p_stats2.st_rank = 0; players[i].p_stats2.st_royal = 0; players[i].p_ndrone = 0; From modemhero at users.sourceforge.net Sun Jun 15 19:05:49 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 16 Jun 2008 00:05:49 +0000 Subject: [netrek-cvs] client/netrekxp build.cmd, 1.32, 1.33 clientr.suo, 1.151, 1.152 Message-ID: <20080616000559.654903B408E@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3559 Modified Files: build.cmd clientr.suo Log Message: Update build script to point to new RSA key. Initialize # of plasma torps per ship - was causing plasma sound to play erroneously sometimes on connect to server. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.151 retrieving revision 1.152 diff -u -d -r1.151 -r1.152 Binary files /tmp/cvsMHeuxw and /tmp/cvsx332ST differ Index: build.cmd =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- build.cmd 29 Jul 2007 01:38:35 -0000 1.32 +++ build.cmd 16 Jun 2008 00:05:44 -0000 1.33 @@ -1,4 +1,4 @@ -set RSAKey="\netrek_files\rsa\NetrekXP-2006v3-RSA-Key-Win32.secret" +set RSAKey="\netrek_files\rsa\NetrekXP-2009-RSA-Key-Win32.secret" set InstCWD="\netrek_files" set HelpCompiler="C:\Program Files\HTML Help Workshop\hhc.exe" rem set Compiler=VCC From modemhero at users.sourceforge.net Mon Jun 16 18:48:57 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 16 Jun 2008 23:48:57 +0000 Subject: [netrek-cvs] client/netrekxp/src newwin.c,1.75,1.76 Message-ID: <20080616234907.5BA8CB429@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11648/src Modified Files: newwin.c Log Message: Minor fix, assign mgear bitmap to mapw instead of w Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- newwin.c 19 Apr 2008 16:23:00 -0000 1.75 +++ newwin.c 16 Jun 2008 23:48:54 -0000 1.76 @@ -900,7 +900,7 @@ LR_DEFAULTCOLOR); mgear_bitmap = W_StoreBitmap3 ("bitmaps/paradise/gear.bmp", - BMP_GEAR_WIDTH, BMP_GEAR_HEIGHT, BMP_GEARBMP, w, + BMP_GEAR_WIDTH, BMP_GEAR_HEIGHT, BMP_GEARBMP, mapw, LR_DEFAULTCOLOR); mfuel_bitmap = W_StoreBitmap3 ("bitmaps/planlibm/color/fuel.bmp", From modemhero at users.sourceforge.net Mon Jun 16 18:48:56 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 16 Jun 2008 23:48:56 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.152,1.153 Message-ID: <20080616234907.5F43BB42C@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11648 Modified Files: clientr.suo Log Message: Minor fix, assign mgear bitmap to mapw instead of w Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.152 retrieving revision 1.153 diff -u -d -r1.152 -r1.153 Binary files /tmp/cvsmHfV3d and /tmp/cvsZgpjke differ From modemhero at users.sourceforge.net Sat Jun 21 08:31:43 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 21 Jun 2008 13:31:43 +0000 Subject: [netrek-cvs] client/netrekxp/src socket.c,1.46,1.47 Message-ID: <20080621133152.0E51FB431@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31010/src Modified Files: socket.c Log Message: Add new server BADVERSION codes. Patch by Quozl. Index: socket.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- socket.c 16 Jun 2008 00:05:47 -0000 1.46 +++ socket.c 21 Jun 2008 13:31:41 -0000 1.47 @@ -2316,25 +2316,51 @@ return; nextSocket = newsocket; } + +static void +handleBadVersionSorry (char *reason) +{ + MessageBox(NULL, reason, "Try again later", MB_OK); + LineToConsole ("%s\n", reason); + LineToConsole ("Sorry, but you cannot play netrek now.\n"); + LineToConsole ("Try again later.\n"); +} + +#define BADVERSION_SOCKET 0 /* CP_SOCKET version does not match, exiting */ +#define BADVERSION_DENIED 1 /* access denied by netrekd */ +#define BADVERSION_NOSLOT 2 /* no slot on queue */ +#define BADVERSION_BANNED 3 /* banned */ +#define BADVERSION_DOWN 4 /* game shutdown by server */ +#define BADVERSION_SILENCE 5 /* daemon stalled */ +#define BADVERSION_SELECT 6 /* internal error */ + void handleBadVersion (struct badversion_spacket *packet) { switch (packet->why) { - case 0: + case BADVERSION_SOCKET: LineToConsole ("Sorry, this is an invalid client version.\n"); LineToConsole ("You need a new version of the client code.\n"); break; - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - MessageBox(NULL, "Sorry, but you cannot play netrek now.", "Try again later", MB_OK); - LineToConsole ("Sorry, but you cannot play netrek now.\n"); - LineToConsole ("Try again later.\n"); + case BADVERSION_DENIED: + handleBadVersionSorry("Access denied by server."); + break; + case BADVERSION_NOSLOT: + handleBadVersionSorry("No free slots on server queue."); + break; + case BADVERSION_BANNED: + handleBadVersionSorry("Banned from server."); + break; + case BADVERSION_DOWN: + handleBadVersionSorry("Game shutdown by server."); + break; + case BADVERSION_SILENCE: + handleBadVersionSorry("Server daemon stalled, internal error."); + break; + case BADVERSION_SELECT: + handleBadVersionSorry("Server reports internal error."); break; default: LineToConsole ("Unknown message from handleBadVersion.\n"); From modemhero at users.sourceforge.net Sat Jun 21 08:31:42 2008 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 21 Jun 2008 13:31:42 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.153,1.154 Message-ID: <20080621133152.17A9B3B40A0@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31010 Modified Files: clientr.suo Log Message: Add new server BADVERSION codes. Patch by Quozl. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.153 retrieving revision 1.154 diff -u -d -r1.153 -r1.154 Binary files /tmp/cvsZGQPut and /tmp/cvsdlaBGC differ