From modemhero at users.sourceforge.net Mon Jul 16 18:44:19 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 16 Jul 2007 23:44:19 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.198, 1.199 Message-ID: <20070716234429.5E1E33B407F@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18740/resources/docs Modified Files: changes.txt Log Message: Preparation for release. Macros cleaned up for content and language, release dates noted. Minor paradise bug fixes. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.198 retrieving revision 1.199 diff -u -d -r1.198 -r1.199 --- changes.txt 25 May 2007 03:36:45 -0000 1.198 +++ changes.txt 16 Jul 2007 23:44:17 -0000 1.199 @@ -1,4 +1,4 @@ -Netrek XP 2006, Version 1.3: +Netrek XP 2006, Version 1.3: (Released July-2007) User interface: 1) War window now says "Re-program" instead of "Save" for changing war settings. From modemhero at users.sourceforge.net Mon Jul 16 18:44:19 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 16 Jul 2007 23:44:19 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.152, 1.153 clientr.suo, 1.136, 1.137 Message-ID: <20070716234429.36ABE3B405E@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18740 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Preparation for release. Macros cleaned up for content and language, release dates noted. Minor paradise bug fixes. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.152 retrieving revision 1.153 diff -u -d -r1.152 -r1.153 --- NetrekXP to do list.C 12 Jun 2007 01:23:14 -0000 1.152 +++ NetrekXP to do list.C 16 Jul 2007 23:44:16 -0000 1.153 @@ -1,7 +1,6 @@ List for the installer: 1) there should be some sort of chance to give default resolution in GUI, which then maps windows accordingly. -2) fix netrekrc append so that it doesn't keep adding new lines to the netrekrc Things not gonna happen, or server problems: 2) torp_other and plasma_other not working right due to lack of torp fuse info @@ -33,6 +32,7 @@ rect doesn't take these into account. 4) With expanded tactical ..can now see ships at galactic coordinates (-500,-500), if you fly into the NW corner of the galaxy. this was never anticipated! +5) hideconsole: on/off Paradise issues: Motd paging system gutted for sake of simplicity @@ -46,6 +46,7 @@ Still missing asteroids and (flashing) warpbeacons. Info window not working right with paradise. Need popup box that works, when connecting to wrong server type +CV army capacity is wrong Wish list: 1) Rewrite graphics engine using SDL Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.136 retrieving revision 1.137 diff -u -d -r1.136 -r1.137 Binary files /tmp/cvsAYqQbE and /tmp/cvspw3CMd differ From modemhero at users.sourceforge.net Mon Jul 16 18:44:20 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 16 Jul 2007 23:44:20 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c, 1.106, 1.107 map.c, 1.60, 1.61 Message-ID: <20070716234429.43F573B407E@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18740/src Modified Files: local.c map.c Log Message: Preparation for release. Macros cleaned up for content and language, release dates noted. Minor paradise bug fixes. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- local.c 12 Jun 2007 01:23:18 -0000 1.106 +++ local.c 16 Jul 2007 23:44:18 -0000 1.107 @@ -2841,8 +2841,7 @@ { i = j->p_no; - if (!j->p_ndrone) - return; + if (!j->p_ndrone) continue; count = 0; for (h = i * npthingies; h < npthingies * (i + 1); h++) Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- map.c 12 Jun 2007 01:23:18 -0000 1.60 +++ map.c 16 Jul 2007 23:44:18 -0000 1.61 @@ -277,6 +277,8 @@ int i; struct player *j; + if (x < 0 || y < 0) return; + x /= SIZE; y /= SIZE; @@ -782,6 +784,7 @@ && (l->pl_info & me->p_team) #ifdef PARADISE && (PL_TYPE(*l) != PLSTAR) + && (PL_TYPE(*l) != PLWHOLE) #endif ) { @@ -1603,7 +1606,7 @@ mclearacount++; /* Check for overwriting planets */ - checkRedraw(k->t_x, k->t_y); + checkRedraw(th->t_x, th->t_y); } #endif } From modemhero at users.sourceforge.net Mon Jul 16 18:44:20 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 16 Jul 2007 23:44:20 +0000 Subject: [netrek-cvs] client/netrekxp/resources/netrekrc netrekrc.txt, 1.2, 1.3 Message-ID: <20070716234429.1C17BB3EB@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/netrekrc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18740/resources/netrekrc Modified Files: netrekrc.txt Log Message: Preparation for release. Macros cleaned up for content and language, release dates noted. Minor paradise bug fixes. Index: netrekrc.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/netrekrc/netrekrc.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- netrekrc.txt 25 May 2007 03:36:45 -0000 1.2 +++ netrekrc.txt 16 Jul 2007 23:44:17 -0000 1.3 @@ -874,14 +874,9 @@ macro.0.A:% __ __ ______ __ Zoom in/out! Anti-packet loss, macro.0.A:% / \ / /__/_ __/______ / /__ observers see all weapons, etc. macro.0.A:% / /\ \/ / -_)/ / / __/ -_) '_/ Plus 50 updates/sec support! -macro.0.A:% /_/ \__/\__//_/ /_/ \__/_/\_\ XP 2006, v1.3, released May 2007 +macro.0.A:% /_/ \__/\__//_/ /_/ \__/_/\_\ XP 2006, v1.3, released July 2007 macro.0.A:% Get it today at http://www.netrek.org -macro.a.A:. o Just | Squeal boy... -macro.a.A:. //\ %p: ABUSED! Plain | just like a -macro.a.A:. o )/ Wrong (tm) | hog! -macro.a.A:. //<<\\ - macro.P.A:% \~~\ _ _ ,----------------------------------, macro.P.A:% \**\___\/ \............| %u: Sucks to be you! macro.P.A:% X*####*+~~\_\ '----------------------------------' @@ -901,7 +896,7 @@ macro.f.A:% (~)-=_ %p: _/~~~\~~~~~~) ******* macro.f.A:% <~~~]/`) MAJOR _- )~)~~~ /+ + /* ... moi?? -macro.f.A:% (~~~]L/\ FUCKING (_/~) / < /@* +macro.f.A:% (~~~]L/\ #$%^ING (_/~) / < /@* macro.f.A:% (~~] . TWINK -\___L~) |~~~ |* macro.f.A:% ~~\ ~ \__/\ @@ -915,9 +910,9 @@ macro.c.A:% | |_| |___ _ _| | _| | (oo)\_______ out of a wet paper bag. macro.c.A:% | _ / _ \ '_| |/ /_| (__)\ )\/\ %u: KILL HORKER macro.c.A:% |_| |_\___/_| |_|\_(_) ||----W |<---------- Me = cow of prey -macro.c.A:% .MOooooooooooooooooo! || ||.,#@,. <-- You = piece of shit +macro.c.A:% .MOooooooooooooooooo! || ||.,#@,. <-- You = piece of crap -macro.C.A:% Nothing fucks _____---=======---_____ . Yo: >>%p<< +macro.C.A:% Nothing screws _____---=======---_____ . Yo: >>%p<< macro.C.A:% you up _====____\ /.. ..\ /____====_ In Space no one macro.C.A:% like a + / / ---\__O__/--- \ \ can hear you macro.C.A:% CA \_\ . /_/ . Suck! @@ -1013,12 +1008,6 @@ macro.4.A:% @ ^^^^@~ () () hostility. macro.4.A:% _| _| (_)-(_) -macro.5.A:% /~~/ Oh, My Pussy Hurts! I Better Call: (952) 943-8700 -macro.5.A:% ~// -macro.5.A:% __// /~) /~~/ /~) /~/~/ /| /| / /| / /~~~ /~~) -macro.5.A:% /__/ /-< / / /~< / /~| / | / / | / /~~ /~~| -macro.5.A:% }_ /__/ /__/ /__/ / / |/ |/ / |/ /___ / \ - macro.6.A:. @ (. .) @ . ' . ___ %u (%p): macro.6.A:. \ VVVV/ . (: .) You are the weakest twink, macro.6.A:. / ^^^^__| ~~~ GOODBYE!! @@ -1030,11 +1019,6 @@ macro.7.A:% | / \_ | | \ _ ._ o _ _| | | macro.7.A:% / \ | | |_/ (/_ | | | (/_ (_| | | -macro.8.A:% ___ -macro.8.A:% ::====( )__ - Lean over for that Sodomy, -macro.8.A:% o/__ <--- /~~~~~~~~~\ %u. -macro.8.A:% | (\ \O.O.O.O.O/ - macro.9.A:% . . /\_.----. macro.9.A:% All your base . : \_/ / / \ macro.9.A:% are belong to us! < < / / // /\ \o/ @@ -1048,7 +1032,7 @@ macro.^n.A:% _ _ _____ _____ _ macro.^n.A:% | \ | || _ || _ | | | It's %u (%p) -macro.^n.A:% | |\| || |_| || |_| | |_| Great, now we're fucked! +macro.^n.A:% | |\| || |_| || |_| | |_| Great, now we're screwed! macro.^n.A:% |_| \_||_____||_____| (_) macro.).A:/* Join the netrek clue game mailing list today! At */ @@ -1057,7 +1041,7 @@ macro.).A:/* 10pm EST/7pm PST */ macro.(.A:/* Get the latest version of Netrek XP 2006 today! */ -macro.(.A:/* Current version is 1.3, released May 2007 */ +macro.(.A:/* Current version is 1.3, released July 2007 */ macro.(.A:/* Download it at http://www.netrek.org/files/NetrekXP_2006/ */ mac.e.T: Escorting %g (%d%%D %s%%S %f%%F) From playnetrek at users.sourceforge.net Mon Jul 16 19:08:41 2007 From: playnetrek at users.sourceforge.net (Joe Evango) Date: Tue, 17 Jul 2007 00:08:41 +0000 Subject: [netrek-cvs] client/netrekxp/configuration-program Form1.frm, 1.8, 1.9 Form3.frm, 1.3, 1.4 netrekconfigxp2006.vbp, 1.1, 1.2 netrekconfigxp2006.vbw, 1.1, 1.2 netrekrc.cfg, 1.1, NONE Message-ID: <20070717000850.880863B405E@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/configuration-program In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32581 Modified Files: Form1.frm Form3.frm netrekconfigxp2006.vbp netrekconfigxp2006.vbw Removed Files: netrekrc.cfg Log Message: Removed the append method used previously with find/replace so there is only one instance of each config option. Fixed bug found with the showHints option. Fixed bug found with showMySpeed option. Fixed bug with det own torps keymapping. Index: Form3.frm =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/configuration-program/Form3.frm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Form3.frm 16 May 2007 01:11:09 -0000 1.3 +++ Form3.frm 17 Jul 2007 00:08:37 -0000 1.4 @@ -1488,9 +1488,15 @@ ' Removed the repeated append functionality and replaced it with an imported rc file with default setting. ' Options available in the config utility are added at the bottom of the file. These options are excluded from the ' imported file and appended only once to the bottom of the imported rc file. Options are now only specified one time. -' If a netrekrc file already exists it is save in the netrek root install folder as netrek.sav. -' In order for the program to function there will need to be a file named netrekrc in the root of where it is executed +' If a netrekrc.txt file already exists it is save in the netrek root install folder as netrek.sav. +' In order for the program to function there will need to be a file named netrekrc.txt in the root of where it is executed ' and a file named netrekrc.cfg in the docs folder. Fixed several bugs that have been reported. +' +' Program notes from Joe - 7/16/07 +' Finally able to add find/replace functionality and get rid of the old method of appending data to the end of the rc file. +' Fixed a bug in the detown keymapping. +' Fixed bug with showMySpeed option + 'swaps the classic mode/xp mode images when the checkbox value changes @@ -1505,15 +1511,11 @@ End If End Sub - - - Private Sub Command1_Click() -'Saves your current netrekrc to netrekrc.sav and copies a static netrek config file from the docs directory - - FileCopy ".\netrekrc", ".\netrekrc.sav" - FileCopy ".\docs\netrekrc.cfg", ".\netrekrc" +'Saves your current netrekrc.txt to netrekrc.sav + FileCopy ".\netrekrc.txt", ".\netrekrc.sav" + Dim warp As Integer @@ -1686,7 +1688,7 @@ tiptxt = "showHints: on" End If - If tips = 0 Then + If tips <> 1 Then tiptxt = "showHints: off" End If @@ -1726,7 +1728,7 @@ speedtxt = "showMySpeed: on" End If - If tips <> 1 Then + If speed <> 1 Then speedtxt = "showMySpeed: off" End If @@ -1915,7 +1917,6 @@ keymap25 = Text1(24) + tractoroff End If - If planetlist = Text1(25) Then keymap26 = "" Else @@ -1968,9 +1969,9 @@ MsgBox "The key '" + Text1(a) + "' is defined more than once. This will cause problems while playing. Please remove the duplicate controls and click on Finish." Exit For End If - Next a - - + + Next a + For c = 0 To 30 If Text1(c) = "h" Then speckey = 1 @@ -1993,8 +1994,6 @@ If duplicate = 0 And speckey = 0 And blank = 0 Then - ' Open the file for append. - Open ".\netrekrc" For Append As fnum2 ' Add the command. If Combo1 = "Torpedoes" And Combo2 = "Phasers" Then @@ -2032,83 +2031,73 @@ keymap = "keymap:" + keymap1 + keymap2 + keymap3 + keymap4 + keymap5 + keymap6 + keymap7 + keymap8 + keymap9 + keymap10 + keymap11 + keymap12 + keymap13 + keymap14 + keymap15 + keymap16 + keymap17 + keymap18 + keymap19 + keymap20 + keymap21 + keymap22 + keymap23 + keymap24 + keymap25 + keymap26 + keymap27 + keymap28 + keymap29 + keymap30 + keymap31 keytag1 = "###Configuration below was added on - " + currentdate - Print #fnum2, Chr(13) - Print #fnum2, Chr(13) - Print #fnum2, keytag1 - Print #fnum2, Chr(13) - Print #fnum2, "# Key mapping" - Print #fnum2, "# Define you keymap here. The format is newkey defaultkey. For example, the" - Print #fnum2, "# default key for shield toggle is 's', if you want to remap shield toggle to" - Print #fnum2, "# 'q', you would put 'qs' in your keymap. Shields would still be mapped to" - Print #fnum2, "# 's' as well as now being on 'q'. Adding a mapping doesn't delete the old" - Print #fnum2, "# one. If you want shields on 'w' as well, put 'ws' in your keymap. If you" - Print #fnum2, "# had instead put 'wq', it would have mapped quit, the default action of 'q'," - Print #fnum2, "# onto 'w'." - Print #fnum2, keymap - Print #fnum2, Chr(13) - Print #fnum2, "# Mouse button mapping" - Print #fnum2, "# Button map lets you map the mouse buttons. Unfortunately, it works in a" - Print #fnum2, "# different way than keymap. The format is . To map" - Print #fnum2, "# shields onto button 1 (the left one), you would put '1s' in your keymap." - Print #fnum2, "# The buttonmap works through the keymap, so if you have shields mapped to" - Print #fnum2, "# 'q', putting '1q' would make button 1 shields and not quit. Buttons 4 and" - Print #fnum2, "# 5 are support for Microsoft Xbuttons. If you have a wheel mouse, the up" - Print #fnum2, "# wheel is button 6 and the down wheel is button 7. There is also support" - Print #fnum2, "# for shifted, controled, and control-shifted mouse actions, see the netrek" - Print #fnum2, "# help file for more details." - Print #fnum2, buttonmap - Print #fnum2, Chr(13) - Print #fnum2, "# Show hints window" - Print #fnum2, tiptxt - Print #fnum2, Chr(13) - Print #fnum2, "# What type of ship bitmaps to use" - Print #fnum2, "# 0 - mono" - Print #fnum2, "# 1 - new color bitmaps (default)" - Print #fnum2, "# 2 - old color bitmaps" - Print #fnum2, "# 3 - shaded old color bitmaps" - Print #fnum2, "# 4 - experimental high res bitmaps" - Print #fnum2, mode1 - Print #fnum2, Chr(13) - Print #fnum2, "# Use colored bitmaps for torps and plasmas" - Print #fnum2, mode2 - Print #fnum2, Chr(13) - Print #fnum2, "# Type of planet bitmaps on local map" - Print #fnum2, "# 0 - Bronco (default)" - Print #fnum2, "# 1 - Moo" - Print #fnum2, "# 2 - Rabbitear" - Print #fnum2, "# 3 - New color" - Print #fnum2, mode4 - Print #fnum2, Chr(13) - Print #fnum2, "# Type of planet bitmaps on galactic map" - Print #fnum2, "# 0 - Bronco (default)" - Print #fnum2, "# 1 - Moo" - Print #fnum2, "# 2 - Rabbitear" - Print #fnum2, "# 3 - New color" - Print #fnum2, mode5 - Print #fnum2, Chr(13) - - Print #fnum2, "# Highlight galactic planets by race and army status" - Print #fnum2, mode6 - Print #fnum2, "# Use beeplite" - Print #fnum2, mode10 + ' Open files for find/replace. + fnum2 = FreeFile + Open ".\netrekrc.sav" For Input As fnum2 - - Print #fnum2, Chr(13) - Print #fnum2, "# Enable layered, stereo sound" - Print #fnum2, soundtxt - Print #fnum2, Chr(13) - Print #fnum2, "# Draw background stars" - Print #fnum2, starstxt - Print #fnum2, Chr(13) - Print #fnum2, "# Draw warp streaks while transwarping to starbase" - Print #fnum2, warptxt - Print #fnum2, Chr(13) - Print #fnum2, "# Show det circle around your ship" - Print #fnum2, dettxt - Print #fnum2, Chr(13) - Print #fnum2, "# Show my speed on local" - Print #fnum2, speedtxt + fnum4 = FreeFile + Open ".\netrekrc.txt" For Output As fnum4 + + While Not EOF(fnum2) + Line Input #fnum2, text_line + If text_line Like "keymap:*" Then + text_line = keymap + End If + If text_line Like "buttonmap:*" Then + text_line = buttonmap + End If + If text_line Like "sound:*" Then + text_line = soundtxt + End If + + If text_line Like "warpStreaks:*" Then + text_line = warptxt + End If + + If text_line Like "showMySpeed:*" Then + text_line = speedtxt + End If + + If text_line Like "showStars:*" Then + text_line = starstxt + End If + + If text_line Like "showHints:*" Then + text_line = tiptxt + End If + + If text_line Like "detCircle:*" Then + text_line = dettxt + End If + + If text_line Like "colorClient:*" Then + text_line = mode1 + End If + + If text_line Like "colorWeapons:*" Then + text_line = mode2 + End If + + If text_line Like "planetBitmap:*" Then + text_line = mode4 + End If + + If text_line Like "planetBitmapGalaxy:*" Then + text_line = mode5 + End If + + If text_line Like "planetHighlighting:*" Then + text_line = mode6 + End If + + If text_line Like "useLite:*" Then + text_line = mode10 + End If + + Print #fnum4, text_line + Wend Close fnum2 + Close fnum4 ' Opens the controls you chose in notepad for reference Open ".\controls.txt" For Output As #fnum3 @@ -2202,3 +2191,4 @@ End If End Sub + Index: netrekconfigxp2006.vbw =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/configuration-program/netrekconfigxp2006.vbw,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- netrekconfigxp2006.vbw 16 May 2007 01:12:21 -0000 1.1 +++ netrekconfigxp2006.vbw 17 Jul 2007 00:08:37 -0000 1.2 @@ -1,2 +1,2 @@ Form3 = 52, 110, 847, 630, , -62, -9, 651, 494, C -Form1 = 254, 308, 947, 952, , 44, 44, 805, 688, C +Form1 = 254, 308, 947, 952, Z, 44, 44, 805, 688, C Index: netrekconfigxp2006.vbp =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/configuration-program/netrekconfigxp2006.vbp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- netrekconfigxp2006.vbp 16 May 2007 01:12:18 -0000 1.1 +++ netrekconfigxp2006.vbp 17 Jul 2007 00:08:37 -0000 1.2 @@ -6,17 +6,17 @@ HelpFile="" Title="netrekconfig" ExeName32="netrekconfigXP2006.exe" -Path32="..\..\..\NetrekConfig2006" +Path32="..\..\..\..\netrek" Command32="" Name="Netrek_XP_2006_Configurator" HelpContextID="0" CompatibleMode="0" -MajorVer=1 +MajorVer=2 MinorVer=0 -RevisionVer=4 +RevisionVer=0 AutoIncrementVer=0 ServerSupportFiles=0 -VersionComments="Copyright (C) 2007 Joe Evango - Netrek XP 2006 Configuration Program v1.4 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. To contact the author email joe at playnetrek.org" +VersionComments="Copyright (C) 2007 Joe Evango - Netrek XP 2006 Configuration Program v2.0 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. To contact the author email joe at playnetrek.org" VersionCompanyName="www.PlayNetrek.org" VersionProductName="Netrek XP 2006 Configuration Program" CompilationType=0 --- netrekrc.cfg DELETED --- Index: Form1.frm =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/configuration-program/Form1.frm,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Form1.frm 16 May 2007 01:10:46 -0000 1.8 +++ Form1.frm 17 Jul 2007 00:08:37 -0000 1.9 @@ -1470,7 +1470,7 @@ ' 'To contact the author email joe at playnetrek.org ' -' Program notes from Joe 4/15/07- +' Program notes from Joe - 4/15/07 ' Code contains some comments, pretty easy to follow the logic. ' ' This utility writes to the netrekrc file and assumes it is in located the same folder as the utility so if the @@ -1492,7 +1492,11 @@ ' If a netrekrc file already exists it is save in the netrek root install folder as netrek.sav ' In order for the program to function there will need to be a file named netrekrc in the root of where it is executed ' and a file named netrekrc.cfg in the docs folder. Fixed several bugs that have been reported. - +' +' Program notes from Joe - 7/16/07 +' Finally able to add find/replace functionality and get rid of the old method of appending data to the end of the rc file. +' Fixed a bug in the detown keymapping in form1. +' Fixed bug with showMySpeed option @@ -1508,16 +1512,11 @@ End If End Sub - - - - Private Sub Command1_Click() -'Saves your current netrekrc to netrekrc.sav and copies a static netrek config file from the docs directory - FileCopy ".\netrekrc", ".\netrekrc.sav" - FileCopy ".\docs\netrekrc.cfg", ".\netrekrc" - +'Saves your current netrekrc.txt to netrekrc.sav + FileCopy ".\netrekrc.txt", ".\netrekrc.sav" + Dim warp As Integer Dim det As Integer Dim speed As Integer @@ -1563,7 +1562,6 @@ Dim docking As String Dim messaging As String - Dim tips As Integer Dim tiptxt As String @@ -1608,7 +1606,6 @@ Dim keymap29 As String Dim keymap30 As String Dim keymap31 As String - Dim keytag1 As String Dim keytag2 As String @@ -1639,12 +1636,9 @@ Dim currentdate As String currentdate = Date - fnum3 = FreeFile - fnum2 = FreeFile -'default keymappings - + 'default keymappings torpedo = "t" phaser = "p" shield = "s" @@ -1691,7 +1685,7 @@ tiptxt = "showHints: on" End If - If tips = 0 Then + If tips <> 0 Then tiptxt = "showHints: off" End If @@ -1720,9 +1714,7 @@ If det <> 1 Then dettxt = "detCircle: off" End If - - - + If (Check9.Value = vbChecked) Then speed = 1 End If @@ -1731,12 +1723,10 @@ speedtxt = "showMySpeed: on" End If - If tips <> 1 Then + If speed <> 1 Then speedtxt = "showMySpeed: off" End If - - If (Check5.Value = vbChecked) Then sound = 1 End If @@ -1749,13 +1739,10 @@ soundtxt = "sound: off" End If - - If (Check3.Value = vbChecked) Then stars = 1 End If - If stars = 1 Then starstxt = "showStars: on" End If @@ -1862,17 +1849,18 @@ Else keymap16 = Text1(15) + quit End If + If detown = Text1(16) Then - keymap = "" + keymap17 = "" Else keymap17 = Text1(16) + detown End If -'no if statement used for detting enemy torps. If no changes are made to the default keymap it creates a blanks "keymap:" -'entry in the netrekrc which does not override any previous keymap changes listed in netrek. By doing this it will create -'a "keymap:dd" entry, simply reassigning the det enemy torps key back to itself and overriding any previous keymap entries - - keymap18 = Text1(17) + detenemy + If detenemy = Text1(17) Then + keymap18 = "" + Else + keymap18 = Text1(17) + detenemy + End If If plasma = Text1(18) Then keymap19 = "" @@ -1928,7 +1916,7 @@ keymap28 = Text1(27) + docking End If If volumeup = Text1(28) Then - keymap29 = "" + keymap29 = "" Else keymap29 = Text1(28) + volumeup End If @@ -1995,9 +1983,7 @@ If duplicate = 0 And speckey = 0 And blank = 0 Then - ' Open the file for append. - Open ".\netrekrc" For Append As fnum2 - + ' Add the command. If Combo1 = "Torpedoes" And Combo2 = "Phasers" Then buttonmap = "buttonmap:" + "1" + Text1(0) + "2" + Text1(1) @@ -2034,85 +2020,77 @@ keymap = "keymap:" + keymap1 + keymap2 + keymap3 + keymap4 + keymap5 + keymap6 + keymap7 + keymap8 + keymap9 + keymap10 + keymap11 + keymap12 + keymap13 + keymap14 + keymap15 + keymap16 + keymap17 + keymap18 + keymap19 + keymap20 + keymap21 + keymap22 + keymap23 + keymap24 + keymap25 + keymap26 + keymap27 + keymap28 + keymap29 + keymap30 + keymap31 keytag1 = "###Configuration below was added on - " + currentdate - Print #fnum2, Chr(13) - Print #fnum2, Chr(13) - Print #fnum2, keytag1 - Print #fnum2, Chr(13) - Print #fnum2, "# Key mapping" - Print #fnum2, "# Define you keymap here. The format is newkey defaultkey. For example, the" - Print #fnum2, "# default key for shield toggle is 's', if you want to remap shield toggle to" - Print #fnum2, "# 'q', you would put 'qs' in your keymap. Shields would still be mapped to" - Print #fnum2, "# 's' as well as now being on 'q'. Adding a mapping doesn't delete the old" - Print #fnum2, "# one. If you want shields on 'w' as well, put 'ws' in your keymap. If you" - Print #fnum2, "# had instead put 'wq', it would have mapped quit, the default action of 'q'," - Print #fnum2, "# onto 'w'." - Print #fnum2, keymap - Print #fnum2, Chr(13) - Print #fnum2, "# Mouse button mapping" - Print #fnum2, "# Button map lets you map the mouse buttons. Unfortunately, it works in a" - Print #fnum2, "# different way than keymap. The format is . To map" - Print #fnum2, "# shields onto button 1 (the left one), you would put '1s' in your keymap." - Print #fnum2, "# The buttonmap works through the keymap, so if you have shields mapped to" - Print #fnum2, "# 'q', putting '1q' would make button 1 shields and not quit. Buttons 4 and" - Print #fnum2, "# 5 are support for Microsoft Xbuttons. If you have a wheel mouse, the up" - Print #fnum2, "# wheel is button 6 and the down wheel is button 7. There is also support" - Print #fnum2, "# for shifted, controled, and control-shifted mouse actions, see the netrek" - Print #fnum2, "# help file for more details." - Print #fnum2, buttonmap - Print #fnum2, Chr(13) - Print #fnum2, "# Show hints window" - Print #fnum2, tiptxt - Print #fnum2, Chr(13) - Print #fnum2, "# What type of ship bitmaps to use" - Print #fnum2, "# 0 - mono" - Print #fnum2, "# 1 - new color bitmaps (default)" - Print #fnum2, "# 2 - old color bitmaps" - Print #fnum2, "# 3 - shaded old color bitmaps" - Print #fnum2, "# 4 - experimental high res bitmaps" - Print #fnum2, mode1 - Print #fnum2, Chr(13) - Print #fnum2, "# Use colored bitmaps for torps and plasmas" - Print #fnum2, mode2 - Print #fnum2, Chr(13) - Print #fnum2, "# Type of planet bitmaps on local map" - Print #fnum2, "# 0 - Bronco (default)" - Print #fnum2, "# 1 - Moo" - Print #fnum2, "# 2 - Rabbitear" - Print #fnum2, "# 3 - New color" - Print #fnum2, mode4 - Print #fnum2, Chr(13) - Print #fnum2, "# Type of planet bitmaps on galactic map" - Print #fnum2, "# 0 - Bronco (default)" - Print #fnum2, "# 1 - Moo" - Print #fnum2, "# 2 - Rabbitear" - Print #fnum2, "# 3 - New color" - Print #fnum2, mode5 - Print #fnum2, Chr(13) - - Print #fnum2, "# Highlight galactic planets by race and army status" - Print #fnum2, mode6 - Print #fnum2, "# Use beeplite" - Print #fnum2, mode10 + ' Open files for find/replace. + fnum2 = FreeFile + Open ".\netrekrc.sav" For Input As fnum2 - - Print #fnum2, Chr(13) - Print #fnum2, "# Enable layered, stereo sound" - Print #fnum2, soundtxt - Print #fnum2, Chr(13) - Print #fnum2, "# Draw background stars" - Print #fnum2, starstxt - Print #fnum2, Chr(13) - Print #fnum2, "# Draw warp streaks while transwarping to starbase" - Print #fnum2, warptxt - Print #fnum2, Chr(13) - Print #fnum2, "# Show det circle around your ship" - Print #fnum2, dettxt - Print #fnum2, Chr(13) - Print #fnum2, "# Show my speed on local" - Print #fnum2, speedtxt + fnum4 = FreeFile + Open ".\netrekrc.txt" For Output As fnum4 + + While Not EOF(fnum2) + Line Input #fnum2, text_line + If text_line Like "keymap:*" Then + text_line = keymap + End If + If text_line Like "buttonmap:*" Then + text_line = buttonmap + End If + If text_line Like "sound:*" Then + text_line = soundtxt + End If + + If text_line Like "warpStreaks:*" Then + text_line = warptxt + End If + + If text_line Like "showMySpeed:*" Then + text_line = speedtxt + End If + + If text_line Like "showStars:*" Then + text_line = starstxt + End If + + If text_line Like "showHints:*" Then + text_line = tiptxt + End If + + If text_line Like "detCircle:*" Then + text_line = dettxt + End If + + If text_line Like "colorClient:*" Then + text_line = mode1 + End If + + If text_line Like "colorWeapons:*" Then + text_line = mode2 + End If + + If text_line Like "planetBitmap:*" Then + text_line = mode4 + End If + + If text_line Like "planetBitmapGalaxy:*" Then + text_line = mode5 + End If + + If text_line Like "planetHighlighting:*" Then + text_line = mode6 + End If + + If text_line Like "useLite:*" Then + text_line = mode10 + End If + + Print #fnum4, text_line + Wend Close fnum2 - + Close fnum4 + + ' Opens the controls you chose in notepad for reference + fnum3 = FreeFile Open ".\controls.txt" For Output As #fnum3 Print #fnum3, "These are the controls you have chosen:" Print #fnum3, Chr(13) @@ -2204,3 +2182,4 @@ Text1(30) = Text1(30) End If End Sub + From modemhero at users.sourceforge.net Sat Jul 28 18:20:49 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 28 Jul 2007 23:20:49 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.153, 1.154 clientr.suo, 1.137, 1.138 Message-ID: <20070728232100.6AF363B402E@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8281 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Removed 3rd metaserver as agreed upon. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.153 retrieving revision 1.154 diff -u -d -r1.153 -r1.154 --- NetrekXP to do list.C 16 Jul 2007 23:44:16 -0000 1.153 +++ NetrekXP to do list.C 28 Jul 2007 23:20:45 -0000 1.154 @@ -33,6 +33,8 @@ 4) With expanded tactical ..can now see ships at galactic coordinates (-500,-500), if you fly into the NW corner of the galaxy. this was never anticipated! 5) hideconsole: on/off +6) Tractor on/off and pressor on/off option, rather than just tractor on, pressor on. +Maybe with enforced state? Paradise issues: Motd paging system gutted for sake of simplicity Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.137 retrieving revision 1.138 diff -u -d -r1.137 -r1.138 Binary files /tmp/cvslFQTTn and /tmp/cvsg6AnPH differ From modemhero at users.sourceforge.net Sat Jul 28 18:20:49 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 28 Jul 2007 23:20:49 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c,1.98,1.99 Message-ID: <20070728232100.6F2563B404B@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8281/src Modified Files: data.c Log Message: Removed 3rd metaserver as agreed upon. Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.98 retrieving revision 1.99 diff -u -d -r1.98 -r1.99 --- data.c 12 Jun 2007 01:23:17 -0000 1.98 +++ data.c 28 Jul 2007 23:20:47 -0000 1.99 @@ -254,7 +254,7 @@ #ifdef META /* Metaservers list - comma delimited */ -char *metaServer = "metaserver.us.netrek.org, metaserver2.us.netrek.org, metaserver.servegame.org"; +char *metaServer = "metaserver.us.netrek.org, metaserver2.us.netrek.org"; int metaPort = 3521; int metaVerbose = 0; char *metaCache = NULL; From modemhero at users.sourceforge.net Sat Jul 28 19:57:59 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 29 Jul 2007 00:57:59 +0000 Subject: [netrek-cvs] client/netrekxp/win32/zlib - New directory Message-ID: <20070729005808.27CA83B402E@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/win32/zlib In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24863/zlib Log Message: Directory /cvsroot/netrek/client/netrekxp/win32/zlib added to the repository From modemhero at users.sourceforge.net Sat Jul 28 20:38:46 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 29 Jul 2007 01:38:46 +0000 Subject: [netrek-cvs] client/netrekxp/src cowmain.c, 1.34, 1.35 data.c, 1.99, 1.100 defaults.c, 1.87, 1.88 main.c, 1.14, 1.15 option.c, 1.50, 1.51 Message-ID: <20070729013856.9E8B23B402E@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11781/src Modified Files: cowmain.c data.c defaults.c main.c option.c Log Message: Added hideConsole netrekrc.txt option. Added zlib1.dll for paradise support. Index: cowmain.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/cowmain.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- cowmain.c 28 Apr 2007 12:09:51 -0000 1.34 +++ cowmain.c 29 Jul 2007 01:38:41 -0000 1.35 @@ -781,6 +781,9 @@ resetdefaults (); newwin (display_host, name); + if (hideConsole) + FreeConsole (); + #ifdef META if (usemeta) { Index: main.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- main.c 14 May 2007 02:56:41 -0000 1.14 +++ main.c 29 Jul 2007 01:38:44 -0000 1.15 @@ -73,7 +73,6 @@ #endif LineToConsole (" [-D] output debug info\n"); - LineToConsole (" [-n] hide console window\n"); LineToConsole (" [-u] show usage\n"); LineToConsole (" [-v] display client version info\n"); @@ -88,7 +87,6 @@ { int usage = 0; int err = 0; - int hideConsole = 0; char *name, *ptr; int i; time_t tm; @@ -360,10 +358,6 @@ case 'D': /* add debug info */ debug++; break; - - case 'n': /* hide console window */ - hideConsole = 1; - break; case 'v': /* output version info */ LineToConsole ("%s %s\n", version, mvers); @@ -395,12 +389,10 @@ if (usage || err) { printUsage (name); - if (hideConsole) - FreeConsole (); +// if (hideConsole) +// FreeConsole (); exit (err); } - if (hideConsole) - FreeConsole (); #ifdef GATEWAY if (!hset) use_trekhopd = 0; /* allow use via normal connections */ Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.87 retrieving revision 1.88 diff -u -d -r1.87 -r1.88 --- defaults.c 18 May 2007 19:54:37 -0000 1.87 +++ defaults.c 29 Jul 2007 01:38:43 -0000 1.88 @@ -245,6 +245,12 @@ NULL } }, + {"hideConsole", &hideConsole, RC_BOOL, + { + "Hide the DOS console window", + NULL + } + }, {"highlightFriendlyPhasers", &highlightFriendlyPhasers, RC_BOOL, { "Highlight friendly phasers", @@ -1897,6 +1903,7 @@ showPlanetNames = booleanDefault ("showPlanetNames", 1); reportKills = booleanDefault ("reportKills", reportKills); fullBitmapRotation = booleanDefault ("fullBitmapRotation", fullBitmapRotation); + hideConsole = booleanDefault ("hideConsole", hideConsole); udpDebug = intDefault ("udpDebug", udpDebug); udpClientSend = intDefault ("udpClientSend", udpClientSend); Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- option.c 18 May 2007 19:54:38 -0000 1.50 +++ option.c 29 Jul 2007 01:38:44 -0000 1.51 @@ -359,6 +359,7 @@ {1, "", &playerListMessaging, 0, 0, 0, plistmessagingmess, NULL}, {1, "have only msg key start msg", &messageKeyOnly, 0, 0, 0, NULL, NULL}, {1, "beep on private message", &beepOnPrivateMessage, 0, 0, 0, NULL, NULL}, + {1, "hide console window", &hideConsole, 0, 0, 0, NULL, NULL}, {1, "done", ¬done, 0, 0, 0, NULL, NULL}, {-1, NULL, 0, 0, 0, 0, NULL, NULL} }; Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.99 retrieving revision 1.100 diff -u -d -r1.99 -r1.100 --- data.c 28 Jul 2007 23:20:47 -0000 1.99 +++ data.c 29 Jul 2007 01:38:41 -0000 1.100 @@ -912,3 +912,4 @@ int scaleFactor = 40; /* allows for scaling of tactical window */ 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 */ From modemhero at users.sourceforge.net Sat Jul 28 20:38:47 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 29 Jul 2007 01:38:47 +0000 Subject: [netrek-cvs] client/netrekxp/win32/zlib zlib1.dll,NONE,1.1 Message-ID: <20070729013855.CC71B3B402E@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/win32/zlib In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11781/win32/zlib Added Files: zlib1.dll Log Message: Added hideConsole netrekrc.txt option. Added zlib1.dll for paradise support. --- NEW FILE: zlib1.dll --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Sat Jul 28 20:38:40 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 29 Jul 2007 01:38:40 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.91,1.92 Message-ID: <20070729013919.72B643B402E@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11781/include Modified Files: data.h Log Message: Added hideConsole netrekrc.txt option. Added zlib1.dll for paradise support. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.91 retrieving revision 1.92 diff -u -d -r1.91 -r1.92 --- data.h 12 Jun 2007 01:23:17 -0000 1.91 +++ data.h 29 Jul 2007 01:38:38 -0000 1.92 @@ -823,4 +823,5 @@ extern int scaleFactor; /* allows for scaling of tactical window */ 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 */ #endif /* _h_data */ From modemhero at users.sourceforge.net Sat Jul 28 20:38:40 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 29 Jul 2007 01:38:40 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.154, 1.155 build.cmd, 1.31, 1.32 clientr.suo, 1.138, 1.139 Message-ID: <20070729013920.127A6B3EB@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11781 Modified Files: NetrekXP to do list.C build.cmd clientr.suo Log Message: Added hideConsole netrekrc.txt option. Added zlib1.dll for paradise support. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.154 retrieving revision 1.155 diff -u -d -r1.154 -r1.155 --- NetrekXP to do list.C 28 Jul 2007 23:20:45 -0000 1.154 +++ NetrekXP to do list.C 29 Jul 2007 01:38:35 -0000 1.155 @@ -32,7 +32,6 @@ rect doesn't take these into account. 4) With expanded tactical ..can now see ships at galactic coordinates (-500,-500), if you fly into the NW corner of the galaxy. this was never anticipated! -5) hideconsole: on/off 6) Tractor on/off and pressor on/off option, rather than just tractor on, pressor on. Maybe with enforced state? Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.138 retrieving revision 1.139 diff -u -d -r1.138 -r1.139 Binary files /tmp/cvsWMspJB and /tmp/cvsf1a7ha differ Index: build.cmd =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- build.cmd 12 Jun 2007 01:23:14 -0000 1.31 +++ build.cmd 29 Jul 2007 01:38:35 -0000 1.32 @@ -524,6 +524,7 @@ copy resources\sounds\*.wav %InstCWD%\netrek\sounds copy resources\sounds\*.ogg %InstCWD%\netrek\sounds copy win32\SDL\*.dll %InstCWD%\netrek +copy win32\zlib\*.dll %InstCWD%\netrek if /I "%Compiler%" == "BCC" copy src\cursors\curslib.dll %InstCWD%\netrek\bitmaps if /I "%Compiler%" == "BCC" copy src\winkey\winkey.dll %InstCWD%\netrek\bitmaps From modemhero at users.sourceforge.net Sat Jul 28 20:38:42 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 29 Jul 2007 01:38:42 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.55, 1.56 Message-ID: <20070729013922.2F748B3EB@smtpgrey-2.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11781/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Added hideConsole netrekrc.txt option. Added zlib1.dll for paradise support. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- generalconfig.html 25 Apr 2007 07:21:49 -0000 1.55 +++ generalconfig.html 29 Jul 2007 01:38:39 -0000 1.56 @@ -357,6 +357,16 @@ +hideConsole +Hide DOS console window + +
    +
  • on
    • +
  • off (default)
    • +
+ + + highlightFriendlyPhasers Highlight phasers of friendly players From modemhero at users.sourceforge.net Sat Jul 28 20:38:43 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 29 Jul 2007 01:38:43 +0000 Subject: [netrek-cvs] client/netrekxp/resources/netrekrc netrekrc.txt, 1.3, 1.4 Message-ID: <20070729013922.3AF623B402E@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/netrekrc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11781/resources/netrekrc Modified Files: netrekrc.txt Log Message: Added hideConsole netrekrc.txt option. Added zlib1.dll for paradise support. Index: netrekrc.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/netrekrc/netrekrc.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- netrekrc.txt 16 Jul 2007 23:44:17 -0000 1.3 +++ netrekrc.txt 29 Jul 2007 01:38:40 -0000 1.4 @@ -132,6 +132,9 @@ # Draw a tic mark indicating your ship's direction headingTic: off +# Hide the DOS console window +hideConsole: off + # Highlight friendly phasers highlightFriendlyPhasers: off From modemhero at users.sourceforge.net Sat Jul 28 20:38:43 2007 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 29 Jul 2007 01:38:43 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.199, 1.200 netrekrc_options.txt, 1.54, 1.55 Message-ID: <20070729013923.4D85E3B402E@smtpgrey-1.real-time.com> Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11781/resources/docs Modified Files: changes.txt netrekrc_options.txt Log Message: Added hideConsole netrekrc.txt option. Added zlib1.dll for paradise support. Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- netrekrc_options.txt 25 Apr 2007 07:21:46 -0000 1.54 +++ netrekrc_options.txt 29 Jul 2007 01:38:39 -0000 1.55 @@ -66,6 +66,7 @@ 16 colors (but only works if forceDisplay = 0). fullBitmapRotation: (on/off) draw old bitmap sets to 256 angles instead of 32 headingTic: (on/off) draw a tic mark indicating your ship's direction +hideConsole: (on/off) hide DOS console window highlightFriendlyPhasers: (on/off) use white color for friendly phasers ignoreCaps: (on/off) ignore CapsLock key state indshipbmpfile: (path) - old color bitmaps Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.199 retrieving revision 1.200 diff -u -d -r1.199 -r1.200 --- changes.txt 16 Jul 2007 23:44:17 -0000 1.199 +++ changes.txt 29 Jul 2007 01:38:39 -0000 1.200 @@ -286,6 +286,10 @@ 4 new(ish) feature packets which actually increase bandwidth use. 35) INL servers will no longer save in the UDP metacache file, so they won't show up on the metaserver listing unless people are actually on the server. +36) New netrekrc option "hideConsole: on/(off)" to control whether to have a +DOS-style console window that shows connect messages, feature packet negotiation, +error messages, etc. Default is on. Provides easy way to close the client in +case it hangs (the X button in upper right corner of console window). Netrek XP 2006, Version 1.2: (Released Mar-2007) - added "messageKeyOnly: (on)/off" so that you will only start messages with the actual