From modemhero at users.sourceforge.net Thu Sep 30 17:06:54 2010 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 30 Sep 2010 22:06:54 +0000 Subject: [netrek-cvs] client/netrekxp/win32 config.h,1.32,1.33 Message-ID: Update of /cvsroot/netrek/client/netrekxp/win32 In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2642/win32 Modified Files: config.h Log Message: Update build instructions for Visual Studio 2010. Fix conflict with hypot and different versions of MS header files. Index: config.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/win32/config.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- config.h 9 Jun 2009 02:23:00 -0000 1.32 +++ config.h 30 Sep 2010 22:06:52 -0000 1.33 @@ -196,7 +196,10 @@ #endif /* For math.h, really */ +#if _MSC_VER < 1500 /* versions lower than VC9 may require this */ #define hypot _hypot +#endif + /* for io.h */ #define read _read #define close _close From modemhero at users.sourceforge.net Thu Sep 30 17:06:54 2010 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 30 Sep 2010 22:06:54 +0000 Subject: [netrek-cvs] client/netrekxp build.cmd, 1.34, 1.35 clientr.sln, 1.3, 1.4 compile.txt, 1.17, 1.18 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2642 Modified Files: build.cmd clientr.sln compile.txt Log Message: Update build instructions for Visual Studio 2010. Fix conflict with hypot and different versions of MS header files. Index: clientr.sln =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.sln,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- clientr.sln 1 Mar 2007 07:35:44 -0000 1.3 +++ clientr.sln 30 Sep 2010 22:06:52 -0000 1.4 @@ -1,11 +1,11 @@ ??? -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clientr", "clientr.vcproj", "{AF2EDB01-9BF0-463A-96EF-046B5845BAE8}" +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C++ Express 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clientr", "clientr.vcxproj", "{AF2EDB01-9BF0-463A-96EF-046B5845BAE8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curslib", "src\cursors\curslib.vcproj", "{74EFAF4D-D9A0-421D-8A94-08DBB03D533C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curslib", "src\cursors\curslib.vcxproj", "{74EFAF4D-D9A0-421D-8A94-08DBB03D533C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winkey", "src\winkey\winkey.vcproj", "{DEBF4D2E-001E-47DA-A88C-8FF90C55C6ED}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winkey", "src\winkey\winkey.vcxproj", "{DEBF4D2E-001E-47DA-A88C-8FF90C55C6ED}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Index: compile.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/compile.txt,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- compile.txt 16 Jul 2009 02:13:23 -0000 1.17 +++ compile.txt 30 Sep 2010 22:06:52 -0000 1.18 @@ -1,4 +1,4 @@ -This source tree was tested with Borland C Builder 5.5, and Microsoft Visual C++ 2005 +This source tree was tested with Borland C Builder 5.5, and Microsoft Visual C++ 2005/2010 Express Edition. The client can also be compiled with MS Visual C++ 6.0, and the instructions below explain how to do so. However, this compiler is no longer supported by the Netrek XP 2009 author as it is not free software (everything else needed for compiling is free). @@ -22,8 +22,9 @@ Refer to the SDL website for how to install it with your compiler/IDE. You will also need zlib, get the compiled DLL, lib, and headers here at: -http://www.zlib.net/zlib123-dll.zip +http://www.zlib.net/zlib125-dll.zip and follow the USAGE.txt for installation instructions for your compiler +Note: Version number of zlib file may need to be changed, check web site for most recent version. If you're building with MS Visual C++: @@ -39,7 +40,7 @@ If you're building with Microsoft Visual Studio 2005 -This is the preferred compiler. You will need the SDK from the web, as the software +This is a preferred compiler. You will need the SDK from the web, as the software doesn't come with the necessary files. Additionally, DirectX SDK is probably needed too, for the SDL support. You will also need the HTML help workshop (from Microsoft) to compile the help file. If you use the studio files that come with the source, @@ -50,6 +51,13 @@ http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/ Especially important are steps 3 and 4. Step 4 was necessary to get winkey to compile. +If you're building with Microsoft Visual Studio 2010 + +This is a preferred compiler. The SDK that comes with the compiler apparently has the +necessary files unlike with 2005. Additionally, DirectX SDK is probably needed too, +for the SDL support. You will also need the HTML help workshop (from Microsoft) to +compile the help file. + Step 3: -------- Open command prompt in the source tree directory and run build.cmd. Note that this build Index: build.cmd =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- build.cmd 9 May 2009 21:21:41 -0000 1.34 +++ build.cmd 30 Sep 2010 22:06:52 -0000 1.35 @@ -1,5 +1,5 @@ set InstCWD="\netrek_files" -set HelpCompiler="C:\Program Files\HTML Help Workshop\hhc.exe" +set HelpCompiler="C:\Program Files (x86)\HTML Help Workshop\hhc.exe" rem set Compiler=VCC rem set Compiler=BCC set Compiler=CYGWIN From modemhero at users.sourceforge.net Thu Sep 30 21:08:35 2010 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 01 Oct 2010 02:08:35 +0000 Subject: [netrek-cvs] client/netrekxp/include proto.h,1.74,1.75 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28207/include Modified Files: proto.h Log Message: Bug fix: Paradise team logos were not initiliazed before they were freed during game paramamter packet recepit. Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- proto.h 10 Jun 2009 23:25:44 -0000 1.74 +++ proto.h 1 Oct 2010 02:08:33 -0000 1.75 @@ -1136,6 +1136,7 @@ void initialize_context (void); // Paradise handlers void build_default_configuration (void); +void load_default_teamlogos (void); void load_default_teams (void); void initialize_thingies(void); void handlePacket32 (unsigned char *sbuf); From modemhero at users.sourceforge.net Thu Sep 30 21:08:35 2010 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 01 Oct 2010 02:08:35 +0000 Subject: [netrek-cvs] client/netrekxp/src enter.c, 1.19, 1.20 socket.c, 1.77, 1.78 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28207/src Modified Files: enter.c socket.c Log Message: Bug fix: Paradise team logos were not initiliazed before they were freed during game paramamter packet recepit. Index: enter.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/enter.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- enter.c 16 Jul 2008 00:16:10 -0000 1.19 +++ enter.c 1 Oct 2010 02:08:33 -0000 1.20 @@ -54,6 +54,7 @@ initialize_plasmas(); initialize_phasers(); load_default_teams(); + load_default_teamlogos(); initialize_thingies(); status2 = (struct status2 *) malloc(sizeof(*status2)); status = (struct status *) malloc(sizeof(*status)); Index: socket.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -d -r1.77 -r1.78 --- socket.c 24 Jun 2009 00:52:22 -0000 1.77 +++ socket.c 1 Oct 2010 02:08:33 -0000 1.78 @@ -3760,6 +3760,23 @@ strcpy(teaminfo[4].shortname, "ALL"); } +void +load_default_teamlogos(void) +{ + int i = number_of_teams; + + switch (i) { /* TODO: add actual logos */ + case 4: + teaminfo[3].shield_logo = W_StoreBitmap(1, 1, (char*)&i, w); + case 3: + teaminfo[2].shield_logo = W_StoreBitmap(1, 1, (char*)&i, w); + case 2: + teaminfo[1].shield_logo = W_StoreBitmap(1, 1, (char*)&i, w); + case 1: + teaminfo[0].shield_logo = W_StoreBitmap(1, 1, (char*)&i, w); + } +} + load_generic_teams(void) { /* needs to be converted to xpm */ @@ -3775,7 +3792,7 @@ teaminfo[-1].letter = 'I'; strcpy(teaminfo[-1].shortname, "IND"); -// load_default_teamlogos(); /* loads the first 4 team logos */ + load_default_teamlogos(); /* loads the first 4 team logos */ for (i = 0; i < number_of_teams; i++) { sprintf(teaminfo[i].name, "Team #%d", i);