G'day Zach, Thanks for the patch, I've done some more work on it: - surely it is spelled synchronization, - there is such a thing as a gantt chart, - removed a few apparently unintended changes. Let me know if this is ready to apply. Signed-off-by: James Cameron <quozl at us.netrek.org> Sat Mar 8 18:04:14 EST 2008 netrek at gmail.com * spellchecking Performed a cursory spellcheck using the ispell library in GNU Emacs. diff -rN -u old-netrek-server/Vanilla/BUGS new-netrek-server/Vanilla/BUGS --- old-netrek-server/Vanilla/BUGS 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/BUGS 2008-03-08 21:50:47.000000000 +1100 @@ -10,13 +10,13 @@ - robots are not recognising Cas, reported by KaraokeBar, Australia, 2007-05-15 - - Twarping to base docked on base can occassionally cause a + - Twarping to base docked on base can occasionally cause a glitch where both bases head warp 60 off the galaxy map. - Triple mode blanks planet names, if server vote to dogfight or hockey, names are not restored. - - With surrenderstart=1, occassionally see "The 0 0 20 minutes before + - With surrenderstart=1, occasionally see "The 0 0 20 minutes before empire collapses" messages upon neuting a planet. - Sturgeon bug: problem with torp or plasma array in which a diff -rN -u old-netrek-server/Vanilla/CHANGES new-netrek-server/Vanilla/CHANGES --- old-netrek-server/Vanilla/CHANGES 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/CHANGES 2008-03-08 21:50:47.000000000 +1100 @@ -2,7 +2,7 @@ pl3 - pl4 : Tue Jul 13 15:42:29 PDT 1993 - Fixed daemon and gcc problem with writeable strings. - Mark Levine. + Fixed daemon and gcc problem with writable strings. - Mark Levine. Many many SYSV changes and mods for sequent machines - Kurt Siegl. rsa-server.c added to the standard distribution. - Nick Trown @@ -31,7 +31,7 @@ don't cost as much, assault's torpcost doesn't cost as much, higher wpntemp for SBs) - Nick Trown / jmn Now supports Linux. - Kurt Siegl. - Added Daemon Sychronization. - Tedd Hadley / NBT + Added Daemon Synchronization. - Tedd Hadley / NBT pl8 - 2.01pl0 : Wed Aug 18 21:54:34 PDT 1993 More fixes for robots when all players leave the game - Mark Levine. @@ -147,7 +147,7 @@ Vector torps from Calvin - Sheldon Fixed wander code - Sheldon Added code to redefine ship stats from .sysdef - Sheldon - SB contruction time is not reset out of tmode - Habig + SB construction time is not reset out of tmode - Habig Puck, Mars, and pickup use new command interface - nbt Fixed .bypass. - Habig Added more functionality to scores tool. - Habig @@ -205,7 +205,7 @@ Fix SB updates after it dies. - Habig 2.5pl3 - 2.5pl4: Added ship info packets for different ship stats - Habig - Made changes to creditting system - Habig + Made changes to crediting system - Habig Improved voting - Kantner Improved robots (commands, functionality) - Siegl Improved INL robot commands - Siegl @@ -587,7 +587,7 @@ Date: Tue, 21 Apr 1998 12:04:21 +1000 From: James Cameron <cameron at stl.dec.com> - Subject: [VANILLA-L:847] Overheat state propogated to refitted ships + Subject: [VANILLA-L:847] Overheat state propagated to refitted ships (2.8pl0 released 23-Apr-1998) diff -rN -u old-netrek-server/Vanilla/INSTALL new-netrek-server/Vanilla/INSTALL --- old-netrek-server/Vanilla/INSTALL 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/INSTALL 2008-03-08 21:50:47.000000000 +1100 @@ -41,7 +41,7 @@ These are config.h and system.mk. (If you intend to do any development work, consider typing at this stage "make -depend". This will add file dependencies to the Makefiles to optimise +depend". This will add file dependencies to the Makefiles to optimize recompilation. However, please "make rmdependencies" before submitting patches or changes back to CVS.) diff -rN -u old-netrek-server/Vanilla/NEWS new-netrek-server/Vanilla/NEWS --- old-netrek-server/Vanilla/NEWS 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/NEWS 2008-03-08 21:50:47.000000000 +1100 @@ -14,9 +14,9 @@ * pret, repair/refuel slots on switch to real t-mode * pret, fixed "1 armies" issue * pret, bot name fixes - * Fix confine after a draft has occured + * Fix confine after a draft has occurred * review LTD_STATS conversion procedure - * pet peeve, fix all occurences of "1 minutes" + * pet peeve, fix all occurrences of "1 minutes" * add ignoring/ignoredby commands * util.h - missing function declaration * util.c - add find_slot_by_ip function diff -rN -u old-netrek-server/Vanilla/PROJECTS new-netrek-server/Vanilla/PROJECTS --- old-netrek-server/Vanilla/PROJECTS 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/PROJECTS 2008-03-08 21:50:47.000000000 +1100 @@ -44,7 +44,7 @@ SCAN_FRIENDLY ... if 1 sends information about enemy ships, according to war, peace, hostility settings. Expected to be - turned on by illumunated server administrators. Default on. + turned on by illuminated server administrators. Default on. SCAN_HOSTILE ... if 1 sends information about enemy ships, according to war, peace, hostility settings. Default on. @@ -64,7 +64,7 @@ - scenario game, entire galaxy starts off as neutral, every player starts with 1 kill and 2 armies. Most planets after - 20 minutes wins. Option only 5 lives. Option respwan + 20 minutes wins. Option only 5 lives. Option respawn positioning would be interesting to balance. [credit Jerub on #netrek] @@ -242,7 +242,7 @@ overloading a variable. Example states could be PTPLAYER, PTOBSERVER, PTROBOT and PTPRACTICE. Whenever a slot changes modes, save the slot (if appropriate) and re-read stats from - .players anew as if a fresh login occured but without the + .players anew as if a fresh login occurred but without the slot assignment (which would require a client upgrade). Cleaning up the observer code is a prerequisite for diff -rN -u old-netrek-server/Vanilla/README.developers new-netrek-server/Vanilla/README.developers --- old-netrek-server/Vanilla/README.developers 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/README.developers 2008-03-08 21:50:47.000000000 +1100 @@ -124,7 +124,7 @@ keycomp/defs.h Same as ntserv/defs.h, but SURREND=5 instead of 4? Should be - link to ntserv instead? What is kecomp/ used for? + link to ntserv instead? What is keycomp/ used for? getship.c diff -rN -u old-netrek-server/Vanilla/README.releasing new-netrek-server/Vanilla/README.releasing --- old-netrek-server/Vanilla/README.releasing 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/README.releasing 2008-03-08 21:50:47.000000000 +1100 @@ -164,6 +164,6 @@ I have a template I use, so I'll notify BXA before each Vanilla release I put on the ftp site. You should probably add a notice to each Vanilla release announcement with something like "This package contains -cryptoghic software. Please be aware of the laws governing your country -regarding the use of crytography." +cryptographic software. Please be aware of the laws governing your country +regarding the use of cryptography." diff -rN -u old-netrek-server/Vanilla/REPOSITORIES new-netrek-server/Vanilla/REPOSITORIES --- old-netrek-server/Vanilla/REPOSITORIES 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/REPOSITORIES 2008-03-08 21:50:47.000000000 +1100 @@ -8,6 +8,7 @@ http://www.ninjatronics.com/darcs/netrek-server/ William U. Clark http://www.gerdesas.com/netrek/netrek-server/ John R. Dennison http://dotman.gerdesas.com/netrek/netrek-server/ Rich Hansen +http://www.club.cc.cmu.edu/~chaos/netrek-server/ Zachary Uram project diff -rN -u old-netrek-server/Vanilla/STYLE new-netrek-server/Vanilla/STYLE --- old-netrek-server/Vanilla/STYLE 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/STYLE 2008-03-08 21:50:47.000000000 +1100 @@ -1,18 +1,9 @@ Coding Style ------------ -1. for minor changes, do not change indentation, keep it consistent - with the indentation in the file you are working on, - -2. for major changes to a file, reindent the file according to 4 - below, - -3. for new files, indent the file according to 4 below, - -4. indent by either two or four spaces, or use tabs, but be - consistent within a file, preferred is four spaces, no tabs. - -An example +1. indent by either two or four spaces, or use tabs, but be + consistent within a file, preferred is four spaces, no tabs, for + example: static int foo(int a) { @@ -25,6 +16,11 @@ } } +2. for minor changes, do not change indentation, keep it consistent + with the indentation in the file you are working on, + +3. for major changes to a file, indent the file entirely. + Darcs - Sending Patches ----------------------- diff -rN -u old-netrek-server/Vanilla/docs/CREDITS new-netrek-server/Vanilla/docs/CREDITS --- old-netrek-server/Vanilla/docs/CREDITS 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/CREDITS 2008-03-08 21:50:47.000000000 +1100 @@ -3,8 +3,8 @@ there help with the code. Mark Levine - For his work on the new getentry code. - Kurt Siegl - For his work on Linux port, SYSV dependenices, and - the config.h format which elminates much of the + Kurt Siegl - For his work on Linux port, SYSV dependencies, and + the config.h format which eliminates much of the ugliness of all the defines in the code. Oh, and also for pointing out all the stupid things I do. :) Micheal Kantner - For finding all the small things that I overlook while diff -rN -u old-netrek-server/Vanilla/docs/CUSTOMIZATION new-netrek-server/Vanilla/docs/CUSTOMIZATION --- old-netrek-server/Vanilla/docs/CUSTOMIZATION 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/CUSTOMIZATION 2008-03-08 21:50:47.000000000 +1100 @@ -1,5 +1,5 @@ - Here is a more in-depth explaination into some of the features + Here is a more in-depth explanation into some of the features that can change the server. 1) config/config.h defines : @@ -24,19 +24,19 @@ NEED_EXIT - Some systems need exit to be defined in socket.c - NO_PLANET_PLAGUE - Don't allow planet plagueing. Don't use this with + NO_PLANET_PLAGUE - Don't allow planet plaguing. Don't use this with ERIKPLAGUE. PING - Allow ping stats support. This may increase the network load a little. - RSA - Use RSA verification. Some method of verification is recommeneded. + RSA - Use RSA verification. Some method of verification is recommended. RSA is the most accepted method now. SHOW_RSA - Display some messages like failed RSA verification message and type of client on entry of player. - RESETGALAXY - Everytime a conquer occurs reset the galaxy. + RESETGALAXY - Every time a conquer occurs reset the galaxy. SELF_RESET - galaxy will reset if daemon dies. @@ -65,7 +65,7 @@ NEWMASK - Use a newer tournament mask function that is less rigid than older version. Doesn't take preferences into account. - RCD - Support Reciever variable distresses. (Saves on a lot of network + RCD - Support Receiver variable distresses. (Saves on a lot of network traffic). FLAT_BONUS - 5x bonus for killing last army on a planet @@ -93,7 +93,7 @@ is always in slot g. SB_RAPID_COOLDOWN - allows for twice the normal rate of weapon - cooldown; useful on base-practice. + cool down; useful on base-practice. ALLOW_PRACTICE_ROBOT_SB - allows practice robots to be refit into starbases if defined. @@ -181,7 +181,7 @@ TOPGUN - (0 or 1) Misc things to make playing harder and only clueful players may like.. Mutually exclusive with all other non- - tandard server modes. + standard server modes. PRET - (0 or 1) Enable pre-t entertainment mode. Mutually exclusive with all other non-standard server modes. @@ -229,7 +229,7 @@ the absence of ping responses from a client. PING_GHOSTBUST_INTERVAL - ( >0) based on PING_GHOSTBUST and PING_FREQ, - the number of unaswered pings before ghostbusting a player. + the number of unanswered pings before ghostbusting a player. GHOSTBUST_TIMER - ( >0 ) Timer setting to ghostbust a client using the normal ghostbust routines. @@ -273,7 +273,7 @@ (not implemented yet..). In addition ship characteristics can be changed. The list of - charactistics that can be changed are: + characteristics that can be changed are: TURNS, ACCS, TORPDAMAGE, PHASERDAMAGE, PHASERFUSE, PLASMADAMAGE, TORPSPEED, TORPFUSE, TORPTURNS, PLASMASPEED, PLASMAFUSE, PLAMSATURNS, MAXSPEED, REPAIR, MAXFUEL, TORPCOST, PLASMACOST, PHASERCOST, diff -rN -u old-netrek-server/Vanilla/docs/DEBUG.HELP new-netrek-server/Vanilla/docs/DEBUG.HELP --- old-netrek-server/Vanilla/docs/DEBUG.HELP 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/DEBUG.HELP 2008-03-08 21:50:47.000000000 +1100 @@ -1,5 +1,5 @@ -Common messsages and what to do: +Common messages and what to do: I get "server not listening" from the client diff -rN -u old-netrek-server/Vanilla/docs/DEVNOTES.SHORT new-netrek-server/Vanilla/docs/DEVNOTES.SHORT --- old-netrek-server/Vanilla/docs/DEVNOTES.SHORT 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/DEVNOTES.SHORT 2008-03-08 21:50:47.000000000 +1100 @@ -8,7 +8,7 @@ PS: This is a beta release. 2 things are missing. -PLAYER, WARNING,TORP amd message is working... Test it out. +PLAYER, WARNING,TORP and message is working... Test it out. Happy Easter Break! @@ -36,11 +36,11 @@ 16.04.93: ntserv/socket.c rewrote updateMessages. ( Was really to clumsy.) - LOGPACKETS loggs size only if in SHORT mode. + LOGPACKETS logs size only if in SHORT mode. updateforce changed: plasmatorps are now handled like normal torpinfo. [ Sidenote about my implementation: I think i have some good - ideas, but the overrall implementation is not really shining. + ideas, but the overall implementation is not really shining. My programming skills are not so good....] client/socket.c changed the code a bit .look at the diffs. @@ -96,7 +96,7 @@ 23.04.93 cleaned up the code, updateSmall ('-') is working. changed newplanet Routine to Berkley style redraw. - Can someome implement a second key for UpdateSmall+? + Can someone implement a second key for UpdateSmall+? ( Do not know which key to choose.) And a different menu for the short code. ( Because ',' is for the pingwindow. And i think the SHORT switch should go into the @@ -105,7 +105,7 @@ test it . The best to test the new system would be a inl server. Then you can do a limited release of the client and play some scrimmages with the new code. Where can i find the latest *stable* - INL sourcen? + INL sources? Bye Heiko Wengler @@ -114,7 +114,7 @@ Heiko Wengler -29.04.93 removed a TFREE bug. (introduced by simply copying sourcecode +29.04.93 removed a TFREE bug. (introduced by simply copying source code without changing one line of code.) H.W. @@ -148,7 +148,7 @@ HW -21.05.93 Cleaned the tools up. Added in every pmesage() function +21.05.93 Cleaned the tools up. Added in every pmessage() function an DINVALID flag. Implemented threshold idea. compile in with -DSHORT_THRESHOLD. Not defined because server is sluggy @@ -164,19 +164,19 @@ 9.06.93 Client/server fix from Tedd Hadley (Torps.) -26.06.93 SP_S_YOU_SS is now sended with UDP. +26.06.93 SP_S_YOU_SS is now sent with UDP. ( Hadley.) -26.06.93 SP_S_YOU_SS is now sended with UDP. +26.06.93 SP_S_YOU_SS is now sent with UDP. ( Hadley.) -26.06.93 SP_S_YOU_SS is now sended with UDP. +26.06.93 SP_S_YOU_SS is now sent with UDP. ( Hadley.) -26.06.93 SP_S_YOU_SS is now sended with UDP. +26.06.93 SP_S_YOU_SS is now sent with UDP. ( Hadley.) -26.06.93 SP_S_YOU_SS is now sended with UDP. +26.06.93 SP_S_YOU_SS is now sent with UDP. ( Hadley.) 9.06.93 Client/server fix from Tedd Hadley (Torps.) diff -rN -u old-netrek-server/Vanilla/docs/DS new-netrek-server/Vanilla/docs/DS --- old-netrek-server/Vanilla/docs/DS 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/DS 2008-03-08 21:50:47.000000000 +1100 @@ -9,7 +9,7 @@ the daemon completes move(). Likewise, there's no way to predict how many ntserv processes are active simultaneously. - With daemon synchronization, the daemon signals the ntserv proceses + With daemon synchronization, the daemon signals the ntserv process when it completes move(). This helps guarantee that the ntserv processes are updating the client only after the daemon is finished with that cycle and ensures that the clients get the most recent diff -rN -u old-netrek-server/Vanilla/docs/INSTALL.NOTES new-netrek-server/Vanilla/docs/INSTALL.NOTES --- old-netrek-server/Vanilla/docs/INSTALL.NOTES 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/INSTALL.NOTES 2008-03-08 21:50:47.000000000 +1100 @@ -6,7 +6,7 @@ The steps are really as easy as the following: 1) Ftp everything you need (server, res-rsa, xsg) -2) decrypt (rsa-only) and uncompress/gunzip everthing. +2) decrypt (rsa-only) and uncompress/gunzip everything. 3) Make two directories (you probably already have one of them) netrekroot (you probably have this one) netrekroot/serverdir diff -rN -u old-netrek-server/Vanilla/docs/README.LTD new-netrek-server/Vanilla/docs/README.LTD --- old-netrek-server/Vanilla/docs/README.LTD 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/README.LTD 2008-03-08 21:50:47.000000000 +1100 @@ -322,7 +322,7 @@ (osba) [ogged sb armies] Number of armies on board an enemy SB you ogged. This stat - is updated seperately from (oat), armies you ogged on other + is updated separately from (oat), armies you ogged on other ships. (ofc) [ogged friendly carrier] diff -rN -u old-netrek-server/Vanilla/docs/README.SHORT new-netrek-server/Vanilla/docs/README.SHORT --- old-netrek-server/Vanilla/docs/README.SHORT 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/README.SHORT 2008-03-08 21:50:47.000000000 +1100 @@ -15,7 +15,7 @@ Date: 24 May 1993 14:49:13 GMT Hello! Here is the Readme to SHORT_PACKETS. You need a new client and -the server must have SHORT_PACKETS to play withit. The actual client +the server must have SHORT_PACKETS to play with it. The actual client informations how you can switch SHORT_PACKETS on could be wrong. Short Packets Code by Tedd Hadley and Heiko Wengler. @@ -41,7 +41,7 @@ threshold is specified the server tries to not overload the connection. This option could be not implemented in the server. You should give as a threshold the number of bytes per second you wanna give from your -bandwith. For example if you set the threshold to 500 bytes. And you +bandwidth. For example if you set the threshold to 500 bytes. And you are playing with 5 updates/sec. You have a threshold of 500/updates = 100bytes/update. The server checks after every update if he wrote more than the limit. If yes the server skips your next update and you get a @@ -50,16 +50,16 @@ Minimum limit per update is 60 bytes. (Threshold = 60 * updates then.) If you set it to 0 Server ends testing. -If you wanna calculate your bandwith requirements you should count the +If you wanna calculate your bandwidth requirements you should count the tcp/ip overhead of 64 bytes to the actual data. For example if you -wanna play with a 9600 Baud modem. You have a bandwith of 1200 bytes. +wanna play with a 9600 Baud modem. You have a bandwidth of 1200 bytes. you can subtract 200 bytes for client-server communication. So you have 1000 bytes to play with. With 5 updates you need under tcp/ip -(5*64=)320 bytes for headers. You have then ~650 bytes for serverdata. +(5*64=)320 bytes for headers. You have then ~650 bytes for server data. That means you should set the threshold to 650 bytes. (130 bytes per -update are much. All playermovement(16 players) + SP_S_YOU + 16 Torps). +update are much. All player movement(16 players) + SP_S_YOU + 16 Torps). I do not think that you ever get 16 player packets in one update. That -leaves you with some more "weaponsdata" :-). If you have another +leaves you with some more "weapons data" :-). If you have another protocol you must compute the overhead by yourself. And any limit smaller than 500 bytes/update means that after an UpdateAll the next update is skipped. @@ -142,11 +142,11 @@ SP_S_TORP: byte range ----------------------- -0 0-7 Packettype +0 0-7 Packet type 1 0-7 Bitset describing which torps are in this packet. 2 0-7 Torpnumber of first torp( num*8=torpnumber) 3 A number of 9 Bit pairs. Each describing one torp. - (The 9 bit numbers are the torpcoordinates in pixel-coordinates.) + (The 9 bit numbers are the torp coordinates in pixel-coordinates.) All rounded up to 4 byte boundaries. SP_S_YOU and SP_S_YOU_SS are the result of dividing SP_YOU into two @@ -273,7 +273,7 @@ torp.c changed all warnings. smessage.c added DINVALID flag to pmessage and pmessage2. -warning.c implemented short message sendings +warning.c implemented short message sending of warnings. daemonII.c implemented SHORT_DAEMON messages. ( Killmess, Planetmessages.) @@ -290,7 +290,7 @@ Client: socket.c , data.c --- All coordinates are in the clientcoordinatesystem. (0-499 = 9 Bits) +-- All coordinates are in the client coordinate system. (0-499 = 9 Bits) -- UpdateAll: The client resets all weapon info by himself. The server sends only active weapons data. ( torps that fly around or a player phasers you.) diff -rN -u old-netrek-server/Vanilla/docs/README.basep new-netrek-server/Vanilla/docs/README.basep --- old-netrek-server/Vanilla/docs/README.basep 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/README.basep 2008-03-08 21:50:47.000000000 +1100 @@ -3,7 +3,7 @@ The server has the base practice code compiled into it. However, to use it you will have to have the robots that aren't included in this code. You will have to get them from Tedd Hadley (hadley at uci.edu). Please -don't bother him unless you are serious about setting up a base pratice +don't bother him unless you are serious about setting up a base practice server. Setting up BASE PRACTICE @@ -13,7 +13,7 @@ Since the robot source code is quite a mess, I'll usually send a binary on request (email hadley at uci.edu) - A few robot binaries are also loacted at + A few robot binaries are also located at ftp://ftp.risc.uni-linz.ac.at/pub/netrek/bin.misc/ config.h: diff -rN -u old-netrek-server/Vanilla/docs/README.keycomp new-netrek-server/Vanilla/docs/README.keycomp --- old-netrek-server/Vanilla/docs/README.keycomp 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/README.keycomp 2008-03-08 21:50:47.000000000 +1100 @@ -1,7 +1,7 @@ rsa_keycap -- sample key descriptions file. Each key entry contains these fields: - key name : a unique key indentifier currently constructed by concatenating + key name : a unique key identifier currently constructed by concatenating abbreviations for client type , author, and binary architecture. client type : (ct=) a string identifying the client type creator : (cr=) the email address of the author or person who compiled diff -rN -u old-netrek-server/Vanilla/docs/README.mars new-netrek-server/Vanilla/docs/README.mars --- old-netrek-server/Vanilla/docs/README.mars 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/README.mars 2008-03-08 21:50:47.000000000 +1100 @@ -3,7 +3,7 @@ The mars robot overseers the players when run. It puts the server into -dog-fighting mode and handles all tournament activites. To end the tourney +dog-fighting mode and handles all tournament activities. To end the tourney mode simply kill the mars robot and the server will revert to normal execution. This is a first release of the mars robot so a few bugs are expected. diff -rN -u old-netrek-server/Vanilla/docs/README.motd new-netrek-server/Vanilla/docs/README.motd --- old-netrek-server/Vanilla/docs/README.motd 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/README.motd 2008-03-08 21:50:47.000000000 +1100 @@ -1,6 +1,6 @@ FILES - convert.c -- simple translator for 60x10 graphics charcters + convert.c -- simple translator for 60x10 graphics characters motd_logo.MASTER -- logo (design yourself -- sample UCI logo given) motd_local.MASTER -- server-specific motd top50 -- show top 50 scores by rank and hours. @@ -12,7 +12,7 @@ Since they are difficult to enter with a standard text editor, the 'convert' program is provided which translates special characters to the corresponding graphics character. A description of the special characters follows. - Special characters can be escaped by preceeding with '\'. + Special characters can be escaped by preceding with '\'. - -- horizontal bar _ -- lower horizontal bar diff -rN -u old-netrek-server/Vanilla/docs/README.newbie new-netrek-server/Vanilla/docs/README.newbie --- old-netrek-server/Vanilla/docs/README.newbie 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/README.newbie 2008-03-08 21:50:47.000000000 +1100 @@ -28,7 +28,7 @@ server keeps running via MIN_NUM_PLAYERS. If the gethostname() call in newbie.c returns the wrong thing then -define TREKSERVER to something appropiate. Shouldn't be necessary +define TREKSERVER to something appropriate. Shouldn't be necessary unless you are multihoming. robotd/robot.c: diff -rN -u old-netrek-server/Vanilla/docs/README.puck new-netrek-server/Vanilla/docs/README.puck --- old-netrek-server/Vanilla/docs/README.puck 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/README.puck 2008-03-08 21:50:47.000000000 +1100 @@ -71,7 +71,7 @@ 3) Offsides code: It has been started and is fully functional, but not much fun to play with. It will be improved in future - releases. I do NOT recommentd using it. + releases. I do NOT recommend using it. Enable via #define OFFSIDE 4) Player Eject by voting: Works great but is a potential @@ -84,7 +84,7 @@ last about 8 minutes longer. Disable via #define SHORT_GAME (i.e clock always ticks) -6) Loquaciouns Announcer: Announces each time puck possession changes. +6) Loquacious Announcer: Announces each time puck possession changes. Enable via #define ANNOUNCER 7) Restructured the control flow of the game. Is now in a more @@ -106,9 +106,9 @@ speed. i.e. Fly warp 12 into the side, you still use warp 12 fuel and change angle at the warp 12 rate. These are #IFDEF's Enable via #define WALL_BOUNCE - Enable vie #deinfe GOAL_CLEAR + Enable via #define GOAL_CLEAR - Known feature: if orbitting a goal planet, you can enter + Known feature: if orbiting a goal planet, you can enter the goal area. If you want into the goal, you must go slow... 2) Sitout code: send "sitout" to puck, and you are teleported out @@ -166,7 +166,7 @@ planets are immediately at 2 armies and slots are held. More of a technicality than anything else. -8) some other cosmetic changes probably occured, and they should be +8) some other cosmetic changes probably occurred, and they should be documented in the code. I tried to credit everyone with their contributions whenever possible. diff -rN -u old-netrek-server/Vanilla/docs/README.scores new-netrek-server/Vanilla/docs/README.scores --- old-netrek-server/Vanilla/docs/README.scores 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/README.scores 2008-03-08 21:50:47.000000000 +1100 @@ -75,7 +75,7 @@ INL->ALL SCORE: FED is winning by planet count [tie break] Each score is followed by the winning team under that scoring system. -Here, FED is winning by planet count. Continous score is tied. If +Here, FED is winning by planet count. Continuous score is tied. If the game were to end immediately, FED would win by the planet count tie breaker. Please see the WINNING CONDITIONS section below on how to interpret these messages. @@ -147,7 +147,7 @@ Continuous WIN loss Game goes to EXTRA TIME. Planets loss WIN - In the first EXTRA TIME mode, all ships are oblierated like + In the first EXTRA TIME mode, all ships are obliterated like sudden death OT. Exactly 5 minutes are added, and game play resumes. At the end of 5 minutes, the above rules are used to determine the winner. If the game is tied by rule 5, then an diff -rN -u old-netrek-server/Vanilla/docs/README.update new-netrek-server/Vanilla/docs/README.update --- old-netrek-server/Vanilla/docs/README.update 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/README.update 2008-03-08 21:50:47.000000000 +1100 @@ -14,7 +14,7 @@ 3. It gets the list and then forks and execs rsa_keycomp with the -c option to make the new .reserved and report on any new keys produced. Note: You can still use the exclude - files and such described in the keycomp README. The ouput + files and such described in the keycomp README. The output for the daemon/rsa_keycomp will be appended to what you made ERROR_FILE in defs.h in ntserv. @@ -22,7 +22,7 @@ motd_logo.MASTER, append the key list, and then the other info on the end (motd_local.MASTER). Then it will make a new best players list and put this on the end. Note: The - files motd_logo.MASTER, and lotd_local.MASTER are converted + files motd_logo.MASTER, and motd_local.MASTER are converted from ascii to 6x10 font which has more characters. Look at README.motd for a description of these. diff -rN -u old-netrek-server/Vanilla/docs/RSS new-netrek-server/Vanilla/docs/RSS --- old-netrek-server/Vanilla/docs/RSS 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/RSS 2008-03-08 21:50:47.000000000 +1100 @@ -83,7 +83,7 @@ int p_pkls_c_s; /* packet loss (client to server) */ int p_pkls_s_c; /* packet loss (server to client) */ not yet done -- racial, wins and losses by race, (coqn, geno, surr, base), +- racial, wins and losses by race, (conq, geno, surr, base), ok - t-mode, session begin, session end with struct status values, gantt chart showing players who were there, icons per pick/take/death diff -rN -u old-netrek-server/Vanilla/docs/XSG.doc new-netrek-server/Vanilla/docs/XSG.doc --- old-netrek-server/Vanilla/docs/XSG.doc 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/XSG.doc 2008-03-08 21:50:47.000000000 +1100 @@ -91,7 +91,7 @@ O Options menu Q Quit V Rotate bitmap display of local planets - B Rotate bitmap dispaly of galactic planets + B Rotate bitmap display of galactic planets l Lock on to player/planet (also button 1) S Show status window of a previously selected player w Show war window of a previously selected player diff -rN -u old-netrek-server/Vanilla/docs/logging.doc new-netrek-server/Vanilla/docs/logging.doc --- old-netrek-server/Vanilla/docs/logging.doc 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/logging.doc 2008-03-08 21:50:47.000000000 +1100 @@ -9,15 +9,15 @@ CONFIG OPTIONS logall=<1/0> log all player generated messages - loggod=<1/0> log messages to GOD, or preceeded by GOD: + loggod=<1/0> log messages to GOD, or preceded by GOD: DESCRIPTION If logall is set, all messages sent by players are logged. This option must be set before the daemon is started. The daemon - starts a seperate program ('logmes') if this option is given. + starts a separate program ('logmes') if this option is given. - If loggod is set, only messages preceeded by "GOD:" ("god:") are logged. + If loggod is set, only messages preceded by "GOD:" ("god:") are logged. The log files store each message in the following format: diff -rN -u old-netrek-server/Vanilla/docs/multicast-server-discovery new-netrek-server/Vanilla/docs/multicast-server-discovery --- old-netrek-server/Vanilla/docs/multicast-server-discovery 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/multicast-server-discovery 2008-03-08 21:50:47.000000000 +1100 @@ -130,7 +130,7 @@ test query program. See parsemeta.c in the client source for additional details on making -the query and procesisng the responses. +the query and processing the responses. Verification diff -rN -u old-netrek-server/Vanilla/docs/players-file-redesign.txt new-netrek-server/Vanilla/docs/players-file-redesign.txt --- old-netrek-server/Vanilla/docs/players-file-redesign.txt 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/players-file-redesign.txt 2008-03-08 21:50:47.000000000 +1100 @@ -57,25 +57,25 @@ prefixes the string with LIBDIR pledit/main.c passes name to edit_file() - (would be superceded by sql database access) + (would be superseded by sql database access) tools/html.c sequential read of whole file - (would be superceded by sql database access) + (would be superseded by sql database access) tools/ltd_dump.c multiple sequential reads of whole file tools/mergescores.c erase current file and write a batch of records to a new file - (would be superceded by sql database access) + (would be superseded by sql database access) tools/newscores.c erase current file and write a batch of records to a new file - (would be superceded by sql database access) + (would be superseded by sql database access) tools/ntpasswd.c find record and update tools/scores.c sequential read of whole file tools/text.c sequential read of whole file - (would be superceded by sql database access) + (would be superseded by sql database access) tools/trimscores.c erase current file and write a batch of records to a new file tools/update.c diff -rN -u old-netrek-server/Vanilla/docs/players.CHANGES_bronco_old new-netrek-server/Vanilla/docs/players.CHANGES_bronco_old --- old-netrek-server/Vanilla/docs/players.CHANGES_bronco_old 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/players.CHANGES_bronco_old 2008-03-08 21:50:47.000000000 +1100 @@ -88,7 +88,7 @@ * UDP. UDP v1.0 installed. * Session statistic query. Sending yourself (or any other single -player) a '?' produces a session statisitc query, listing the t-mode +player) a '?' produces a session statistic query, listing the t-mode planets/armies/wins/losses and corresponding ratings and ratio for the current session. diff -rN -u old-netrek-server/Vanilla/docs/sample_sysdef.in new-netrek-server/Vanilla/docs/sample_sysdef.in --- old-netrek-server/Vanilla/docs/sample_sysdef.in 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/sample_sysdef.in 2008-03-08 21:50:47.000000000 +1100 @@ -122,7 +122,7 @@ # Reference: ntserv/daemonII.c check_scummers) CHECKSCUM=3 # -# Do full reverse/forward lookup on IP addreses to check for matching +# Do full reverse/forward lookup on IP addresses to check for matching # DNS entries, and make mismatches show in a 'WHOIS'/'@' (0 = no, 1 = yes) IP_CHECK_DNS=1 # @@ -352,7 +352,7 @@ # + humans) that is maintained at all times. If there are less humans # than this number, the rest of the slots will be filled with robots # until this number of slots is reached. If there are an equal number -# or more huamans than this number, there will be no robots in game. +# or more humans than this number, there will be no robots in game. MIN_NEWBIE_SLOTS=12 # # Maximum number of newbie server players to allow at once @@ -375,7 +375,7 @@ # Save t-mode galaxy during transition from t-mode to pre-t mode PRET_SAVE_GALAXY=1 # -# Number of seconds the saved t-mode galaxy is elegible to be restored +# Number of seconds the saved t-mode galaxy is eligible to be restored # if t-mode starts up again. PRET_GALAXY_LIFETIME=600 # diff -rN -u old-netrek-server/Vanilla/docs/tools.doc new-netrek-server/Vanilla/docs/tools.doc --- old-netrek-server/Vanilla/docs/tools.doc 2008-03-08 21:50:47.000000000 +1100 +++ new-netrek-server/Vanilla/docs/tools.doc 2008-03-08 21:50:47.000000000 +1100 @@ -51,7 +51,7 @@ Usage: mess Like message, only you can enter multi-line messages, which get sent in a -batch (so you don't have to keep running "mesage" over and over). Also allows +batch (so you don't have to keep running "message" over and over). Also allows multiple recipients (so you can send to "0123" instead of just "0"). newscores @@ -329,7 +329,7 @@ MAXLOAD is the maximum load average allowed before the game shuts itself down. ** Under UTS, if MAXLOAD is set to "0.0", then the game will shut down. No -comparison with the actual load averge is performed. +comparison with the actual load average is performed. CHAOS is a boolean flag; if TRUE, then "chaos mode" is turned on. This has the following effects: -- James Cameron mailto:quozl at us.netrek.org http://quozl.netrek.org/