From modemhero at users.sourceforge.net Fri Jun 2 16:06:56 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 02 Jun 2006 21:06:56 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs README for Win95, Win98, and WinME.TXT, 1.1, 1.2 changes.txt, 1.61, 1.62 netrekrc, 1.2, 1.3 netrekrc_options.txt, 1.10, 1.11 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21888/resources/docs Modified Files: README for Win95, Win98, and WinME.TXT changes.txt netrekrc netrekrc_options.txt Log Message: Version number change from 4 4 0 4 to 1 0 0 0 Hopefully fixed redraw problem with beeplite not refreshing planets on the planet map Changed to constant border redraw vs. only redraw border on alert change - fixes some problems with the new bitmap sets Fix to detcircle and shield drawing for observers watching someone who cloaked..it would miss a draw during the cloak cycle Added "rotatePlanets: (on)/off" to use rotating planet graphics, only works with new planet bitmaps Rotating planets! Well, just the unknown (?) planet for now, lack of art is the holdup, it might be awhile till the rest of the planets are done Fixed tractor/pressors which overlap window border so that they don't overwrite border Fixed continueTractors option (it wasn't working at all) Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- netrekrc 30 May 2006 01:10:35 -0000 1.2 +++ netrekrc 2 Jun 2006 21:06:54 -0000 1.3 @@ -233,6 +233,9 @@ # Report kills reportKills: on +# Rotate planets (only works with new planet bitmaps) +rotatePlanets: on + # Save options with comments saveBig: on @@ -675,6 +678,12 @@ # Keys that will trigger macro without going to macro mode singleMacro: EF +macro.0.A:% __ __ ______ __ Want to see some better graphics? +macro.0.A:% / \ / /__/_ __/______ / /__ Want a better sounding client? +macro.0.A:% / /\ \/ / -_)/ / / __/ -_) '_/ +macro.0.A:% /_/ \__/\__//_/ /_/ \__/_/\_\ XP 2006, v1.0 +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! @@ -787,12 +796,6 @@ macro.T.A:% _/oo OOOOO oo` ooo ooo to hop on board! macro.T.A:% -+-+-+-+-+-+-+-+-+-+-+-+-+-+ -macro.0.A:% ***PUBLIC SERVICE ANNOUNCEMENT*** -macro.0.A:% Hit shift O (that's O the letter, not zero) to bring up the netrek -macro.0.A:% menus. You will be on page zero. See the bar that says updates -macro.0.A:% per second? If it doesn't say 10 updates per second, you should -macro.0.A:% change it! Click on the box until it gets to 10 updates per second! - macro.1.A:% |\__/,| (`\ macro.1.A:% Mew! - |o o |__ _) ) I'm coming after you, macro.1.A:% n n._ _.( T ) ` / Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- netrekrc_options.txt 28 May 2006 23:05:12 -0000 1.10 +++ netrekrc_options.txt 2 Jun 2006 21:06:54 -0000 1.11 @@ -202,6 +202,7 @@ romshipGbmpfile: (path) - your own ship's grayscale bitmaps romshipTbmpfile: (path) - shaded color bitmaps romshipMbmpfile: (path) - mono bitmaps +rotatePlanets: (on/off) rotate planets (only works with new planet bitmaps) saveFile: (path) path to saved options file saveBig: (on/off) save options with remarks saveBeeplite: (on/off) save beeplite macros to saveFile Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- changes.txt 30 May 2006 01:10:35 -0000 1.61 +++ changes.txt 2 Jun 2006 21:06:54 -0000 1.62 @@ -1,4 +1,17 @@ -Version TBA: +Version 1.1: +- hopefully fixed redraw problem with beeplite not refreshing planets on the planet map + +Netrek XP 2006, Version 1.0: (Released 01-Jun-2006) +- changed to constant border redraw vs. only redraw border on alert change - fixes some + problems with the new bitmap sets +- fix to detcircle and shield drawing for observers watching someone who cloaked..it would + miss a draw during the cloak cycle +- added "rotatePlanets: (on)/off" to use rotating planet graphics, only works with new + planet bitmaps +- rotating planets! Well, just the unknown (?) planet for now, lack of art is the holdup, + it might be awhile till the rest of the planets are done +- fixed tractor/pressors which overlap window border so that they don't overwrite border +- fixed continueTractors option (it wasn't working at all) - changed default team window size from 8 to 7 lines - fixed some inconsistencies in how a few RCDs were named - "taking" renamed to "take", "generic" renamed to "help", "help3 and help4" renamed to "help1 and help2", and @@ -14,11 +27,11 @@ - planet kill messages now show armies dooshed (if any) - fixed colorful phasers to work as intended (cycle through 4 colors and then your team color). This feature hasn't worked right since netrek moved to 10 updates/sec. -- added a better default netrekrc file (my personal file), which has a better keymap, window - placements, and macros than your average rc :). Plus it has all the settable rc options - listed. The format of the netrekrc is nearly identical to that of the netrek.sav file - that can be generated in game from the options menu. Currently the only difference between - the two is custom pbserver/servernick/servertype settings. +- added a better default netrekrc file (my personal file), which has a better keymap (designed + by Niclas Fredriksson), window placements, and macros than your average rc :). Plus it has + all the settable rc options listed. The format of the netrekrc is nearly identical to + that of the netrek.sav file that can be generated in game from the options menu. Currently + the only difference between the two is custom observer/servernick/servertype settings. - fixed bug with observers with short packets on which was causing incorrect drawing of local map in the case of losing player/planet lock (most noticeable effect was a single background star being drawn at all times, instead of the usual blank local). @@ -60,11 +73,14 @@ the choice to change map display planets too! And have map and local planets use different bitmap sets. Can be changed via planets menu. - fixed bug where map window border wasn't being redrawn on death -- shortpackets is now "off" by default. This may be changed at a later date, but for now, - they are off, mainly due to short packets only reporting ship heading to 16 positions, whereas - all bitmap sets in this client use 32 positions, or in the case of the new highres bitmaps, - 256 positions. Some other minor quibbles with short packets on is that observers do not - get geno messages, and shield/cloak status for warp 0 players are not sent by short packets. +- shortpackets is now "on" by default. There are some problems with short packets, such as + only reporting ship heading to 16 positions, whereas all bitmap sets in this client use + 32 positions, or in the case of the new highres bitmaps, 256 positions. Some other minor + quibbles with short packets on is that observers do not get geno messages, and + shield/cloak status for warp 0 players are not sent by short packets. However, short + packets allows client side customization of how data is displayed, as well as reducing + bandwith, so it is the default. Hopefully these will be fixed server side in the near + future. - fix to problem with bottom and right borders in certain windows (like map) getting overwritten - new planet bitmaps! Using Defcom's art. Changeable via planets menu. - client now recognizes planets that are flagged as "core": this shows up in planet list menu, Index: README for Win95, Win98, and WinME.TXT =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/README for Win95, Win98, and WinME.TXT,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- README for Win95, Win98, and WinME.TXT 31 May 2006 03:59:27 -0000 1.1 +++ README for Win95, Win98, and WinME.TXT 2 Jun 2006 21:06:54 -0000 1.2 @@ -1,3 +1,9 @@ +As Windows 95/98/ME user, please use the executable labeled netrek9598ME, rather than +netrek. The reason for two executables is due to a font resource problem, that requires +the client to be compiled different to work on older vs newer operating systems. +I acknowledge this is not the best solution, I will try to have it fixed in a future +version. + The following options will NOT work with Windows 95/98/ME. In fact, they are very likely to crash the client, so do not use them. From modemhero at users.sourceforge.net Fri Jun 2 16:06:56 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 02 Jun 2006 21:06:56 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.43, 1.44 clientr.suo, 1.19, 1.20 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21888 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Version number change from 4 4 0 4 to 1 0 0 0 Hopefully fixed redraw problem with beeplite not refreshing planets on the planet map Changed to constant border redraw vs. only redraw border on alert change - fixes some problems with the new bitmap sets Fix to detcircle and shield drawing for observers watching someone who cloaked..it would miss a draw during the cloak cycle Added "rotatePlanets: (on)/off" to use rotating planet graphics, only works with new planet bitmaps Rotating planets! Well, just the unknown (?) planet for now, lack of art is the holdup, it might be awhile till the rest of the planets are done Fixed tractor/pressors which overlap window border so that they don't overwrite border Fixed continueTractors option (it wasn't working at all) Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- NetrekXP to do list.C 31 May 2006 03:59:26 -0000 1.43 +++ NetrekXP to do list.C 2 Jun 2006 21:06:54 -0000 1.44 @@ -24,6 +24,8 @@ When obs quits, their state is K_WINNER ..and they see the new geno bitmap. 3) The new smooth turning only working on self, not obs or others - short packets only send headings of 16 positions. +4) Others speed only sent to 16..messed up for obs locked onto puck in hockey, +or twarpers Things that are sorta fixed, but could use improvement: 1) rewrite placement/refresh of new resource bitmaps to work better with a scaled tactical @@ -33,6 +35,7 @@ is rotated. Only solution so far is to ignore borders with scaled bitmaps. 4) AddFontResourceEx caused problems with win 98 machines. Commented out, and using old AddFontResource function. +5) planet resource placement and refresh (for new planet bitmaps) will need adjusting if local is scaled Things to do: 1) Add warning hull. @@ -49,8 +52,8 @@ 8) Is there a cpu leak with double buffering? 9) Use masking for things like player team/letter display on galactic. Ship draw on tactical (have it overwrite the planet/wrench/gas/army for example, not just combine colors). -10) mono kil scout rotation seems off -11) Get square planet bitmaps from defcom so I can turn them into mapped rotating globes. +10) Get square planet bitmaps so I can turn them into mapped rotating globes. +11) more transparent det circle Stas's list: - color coded playerlist. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 Binary files /tmp/cvsEpnqyb and /tmp/cvsCpvLo7 differ From modemhero at users.sourceforge.net Fri Jun 2 16:06:57 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 02 Jun 2006 21:06:57 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.12, 1.13 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21888/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Version number change from 4 4 0 4 to 1 0 0 0 Hopefully fixed redraw problem with beeplite not refreshing planets on the planet map Changed to constant border redraw vs. only redraw border on alert change - fixes some problems with the new bitmap sets Fix to detcircle and shield drawing for observers watching someone who cloaked..it would miss a draw during the cloak cycle Added "rotatePlanets: (on)/off" to use rotating planet graphics, only works with new planet bitmaps Rotating planets! Well, just the unknown (?) planet for now, lack of art is the holdup, it might be awhile till the rest of the planets are done Fixed tractor/pressors which overlap window border so that they don't overwrite border Fixed continueTractors option (it wasn't working at all) Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- generalconfig.html 28 May 2006 23:05:12 -0000 1.12 +++ generalconfig.html 2 Jun 2006 21:06:54 -0000 1.13 @@ -825,6 +825,16 @@ path +rotatePlanets +Rotate planets (only works with new planet bitmaps) + +
    +
  • on (default)
    • +
  • off
    • +
+ + + saveBig Save options with comments From modemhero at users.sourceforge.net Fri Jun 2 16:06:57 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 02 Jun 2006 21:06:57 +0000 Subject: [netrek-cvs] client/netrekxp/resources/planlibm/color munknown.bmp, NONE, 1.1 unknown.bmp, 1.2, 1.3 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/planlibm/color In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21888/resources/planlibm/color Modified Files: unknown.bmp Added Files: munknown.bmp Log Message: Version number change from 4 4 0 4 to 1 0 0 0 Hopefully fixed redraw problem with beeplite not refreshing planets on the planet map Changed to constant border redraw vs. only redraw border on alert change - fixes some problems with the new bitmap sets Fix to detcircle and shield drawing for observers watching someone who cloaked..it would miss a draw during the cloak cycle Added "rotatePlanets: (on)/off" to use rotating planet graphics, only works with new planet bitmaps Rotating planets! Well, just the unknown (?) planet for now, lack of art is the holdup, it might be awhile till the rest of the planets are done Fixed tractor/pressors which overlap window border so that they don't overwrite border Fixed continueTractors option (it wasn't working at all) Index: unknown.bmp =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/planlibm/color/unknown.bmp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsRdQcXy and /tmp/cvsXkffpv differ --- NEW FILE: munknown.bmp --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Fri Jun 2 16:06:56 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 02 Jun 2006 21:06:56 +0000 Subject: [netrek-cvs] client/netrekxp/include bitmaps.h, 1.10, 1.11 data.h, 1.27, 1.28 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21888/include Modified Files: bitmaps.h data.h Log Message: Version number change from 4 4 0 4 to 1 0 0 0 Hopefully fixed redraw problem with beeplite not refreshing planets on the planet map Changed to constant border redraw vs. only redraw border on alert change - fixes some problems with the new bitmap sets Fix to detcircle and shield drawing for observers watching someone who cloaked..it would miss a draw during the cloak cycle Added "rotatePlanets: (on)/off" to use rotating planet graphics, only works with new planet bitmaps Rotating planets! Well, just the unknown (?) planet for now, lack of art is the holdup, it might be awhile till the rest of the planets are done Fixed tractor/pressors which overlap window border so that they don't overwrite border Fixed continueTractors option (it wasn't working at all) Index: bitmaps.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- bitmaps.h 20 May 2006 17:09:39 -0000 1.10 +++ bitmaps.h 2 Jun 2006 21:06:54 -0000 1.11 @@ -153,6 +153,10 @@ // Untouched planet #define BMP_PLANET_UNKNOWN 9 +#define BMP_PLANET_UNKNOWN_NR 10 + +// Map version of unknown planet +#define BMP_PLANET_MUNKNOWN 11 // Resources #define BMP_ARMYBMP 10 @@ -167,4 +171,4 @@ #define BMP_CPLANET_WIDTH 120 #define BMP_CPLANET_HEIGHT 120 - +#define CPLANET_VIEWS 16 Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- data.h 31 May 2006 03:59:27 -0000 1.27 +++ data.h 2 Jun 2006 21:06:54 -0000 1.28 @@ -47,6 +47,7 @@ extern struct planet pdata[]; extern unsigned int oldalert; +extern int alertBorderColor; extern int remap[]; extern int udcounter; extern char *title; @@ -228,6 +229,7 @@ extern int showLock; extern int planetBitmap; extern int planetBitmapGalaxy; +extern int rotatePlanets; extern int logging; extern int continueTractor; extern int tcounter; @@ -311,7 +313,10 @@ ori_bitmapsHR[NUM_TYPES], ind_bitmapsHR[NUM_TYPES]; // Planets -extern W_Icon planet_unknown, mplanet_unknown; +extern W_Icon planet_unknown_bitmap; +extern W_Icon planet_unknown[CPLANET_VIEWS]; +extern W_Icon planet_unknown_NR; +extern W_Icon mplanet_unknown; extern W_Icon planet_bitmaps[8], mplanet_bitmaps[8]; extern W_Icon planet_earth[NUMTEAMS], planet_klingus[NUMTEAMS], planet_orion[NUMTEAMS], planet_romulus[NUMTEAMS], planet_agri1[NUMTEAMS], planet_agri2[NUMTEAMS], From modemhero at users.sourceforge.net Fri Jun 2 16:06:57 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 02 Jun 2006 21:06:57 +0000 Subject: [netrek-cvs] client/netrekxp/src dashboard.c, 1.9, 1.10 data.c, 1.30, 1.31 death.c, 1.9, 1.10 defaults.c, 1.22, 1.23 local.c, 1.36, 1.37 map.c, 1.16, 1.17 mswindow.c, 1.29, 1.30 newwin.c, 1.34, 1.35 option.c, 1.20, 1.21 parsemeta.c, 1.9, 1.10 stampver.inf, 1.3, 1.4 vccnetrek.rc, 1.2, 1.3 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21888/src Modified Files: dashboard.c data.c death.c defaults.c local.c map.c mswindow.c newwin.c option.c parsemeta.c stampver.inf vccnetrek.rc Log Message: Version number change from 4 4 0 4 to 1 0 0 0 Hopefully fixed redraw problem with beeplite not refreshing planets on the planet map Changed to constant border redraw vs. only redraw border on alert change - fixes some problems with the new bitmap sets Fix to detcircle and shield drawing for observers watching someone who cloaked..it would miss a draw during the cloak cycle Added "rotatePlanets: (on)/off" to use rotating planet graphics, only works with new planet bitmaps Rotating planets! Well, just the unknown (?) planet for now, lack of art is the holdup, it might be awhile till the rest of the planets are done Fixed tractor/pressors which overlap window border so that they don't overwrite border Fixed continueTractors option (it wasn't working at all) Index: death.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/death.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- death.c 22 May 2006 08:27:53 -0000 1.9 +++ death.c 2 Jun 2006 21:06:55 -0000 1.10 @@ -54,11 +54,12 @@ { W_ChangeBorder (w, gColor); W_ChangeBorder (mapw, gColor); + alertBorderColor = gColor; } + else + alertBorderColor = W_White; W_ChangeBorder (baseWin, gColor); oldalert = PFGREEN; - if (doubleBuffering) /* Force a border refresh */ - oldalert = 0; } if (W_IsMapped (statwin)) { Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- mswindow.c 31 May 2006 03:59:27 -0000 1.29 +++ mswindow.c 2 Jun 2006 21:06:55 -0000 1.30 @@ -566,7 +566,11 @@ free (planet_bitmaps[5]); free (planet_bitmaps[6]); free (planet_bitmaps[7]); - free (planet_unknown); + for (i = 0; i < CPLANET_VIEWS; i++) + { + free (planet_unknown[i]); + } + free (planet_unknown_NR); free (mplanet_bitmaps[0]); free (mplanet_bitmaps[1]); free (mplanet_bitmaps[2]); @@ -576,7 +580,7 @@ free (mplanet_bitmaps[6]); free (mplanet_bitmaps[7]); free (mplanet_unknown); - + free (army_bitmap); free (marmy_bitmap); free (wrench_bitmap); @@ -3129,7 +3133,7 @@ register int Md /* Major direction */ , md; /* minor direction */ /* 3 blank, 1 solid... etc. -SAC */ int dashdesc[] = { 10, 1 }; - + RECT r; DBHEADER_VOID; dashdesc[0] = tpDotDist; @@ -3146,7 +3150,7 @@ SelectPalette (hdc, NetrekPalette, FALSE); RealizePalette (hdc); } - + border = win->border; x0 += border; y0 += border; @@ -3154,6 +3158,12 @@ y1 += border; d2 = abs (x0 - x1); d3 = abs (y0 - y1); + // Get cliprect so tractor lines don't overdraw border + r.left = border; + r.right = win->ClipRect.right; + r.top = border; + r.bottom = win->ClipRect.bottom; + if (d2 > d3) { /* Major axis is x */ @@ -3170,7 +3180,7 @@ while ((Md == 1 ? x0 <= x1 : x0 >= x1)) { - if (dp & 1) // An odd number + if (dp & 1 && (x0 > r.left && x0 < r.right)) // An odd number SetPixel (hdc, x0, y0, colortable[color].rgb); dc--; if (dc < 1) @@ -3210,7 +3220,7 @@ while ((Md == 1 ? y0 <= y1 : y0 >= y1)) { - if (dp & 1) // An odd number + if (dp & 1 && (y0 > r.top && y0 < r.bottom)) // An odd number SetPixel (hdc, x0, y0, colortable[color].rgb); dc--; if (dc < 1) Index: dashboard.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/dashboard.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- dashboard.c 29 May 2006 23:59:53 -0000 1.9 +++ dashboard.c 2 Jun 2006 21:06:55 -0000 1.10 @@ -886,9 +886,9 @@ if ((planets[me->p_planet].pl_flags & PLREPAIR) &&(obs || !(planets[me->p_planet].pl_owner & (plr->p_swar | plr->p_hostile)))) me->p_subshield += me->p_ship.s_repair * 4; - if (me->p_flags & PFDOCK) - me->p_subshield += me->p_ship.s_repair * 6; } + if (me->p_flags & PFDOCK) + me->p_subshield += me->p_ship.s_repair * 6; /* Calculate time needed to repair shields */ shieldrate = (float)(me->p_subshield)/(float)100.0; shieldtime = (int)(shieldneeded/shieldrate); @@ -908,9 +908,9 @@ if ((planets[me->p_planet].pl_flags & PLREPAIR) && (obs || !(planets[me->p_planet].pl_owner & (plr->p_swar | plr->p_hostile)))) me->p_subdamage += me->p_ship.s_repair * 2; - if (me->p_flags & PFDOCK) - me->p_subdamage += me->p_ship.s_repair * 3; } + if (me->p_flags & PFDOCK) + me->p_subdamage += me->p_ship.s_repair * 3; /* Calculate time needed to repair hull */ hullrate = (float)(me->p_subdamage)/(float)100.0; hulltime = (int)(hullneeded/hullrate); Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- newwin.c 30 May 2006 01:10:36 -0000 1.34 +++ newwin.c 2 Jun 2006 21:06:55 -0000 1.35 @@ -637,12 +637,25 @@ BMP_CPLANET_HEIGHT); } - /* Load the unknown planet bitmap */ - planet_unknown = + /* Load the rotating unknown planet bitmap */ + planet_unknown_bitmap = W_StoreBitmap3 ("bitmaps/planlibm/color/unknown.bmp", - BMP_CPLANET_WIDTH, BMP_CPLANET_HEIGHT, BMP_PLANET_UNKNOWN, w, - LR_DEFAULTCOLOR); + BMP_CPLANET_WIDTH, BMP_CPLANET_HEIGHT * CPLANET_VIEWS, + BMP_PLANET_UNKNOWN, w, LR_DEFAULTCOLOR); + /* Make pointers to the rotating unknown bitmaps */ + for (j = 0; j < CPLANET_VIEWS; j++) + { + planet_unknown[j] = + W_PointBitmap2 (planet_unknown_bitmap, 0, j, BMP_CPLANET_WIDTH, + BMP_CPLANET_HEIGHT); + } + /* Load the non-rotating unknown planet bitmap - use map version of bitmap */ + planet_unknown_NR = + W_StoreBitmap3 ("bitmaps/planlibm/color/munknown.bmp", + BMP_CPLANET_WIDTH, BMP_CPLANET_HEIGHT, BMP_PLANET_UNKNOWN_NR, w, + LR_DEFAULTCOLOR); + /* Load the resource bitmaps */ army_bitmap = W_StoreBitmap3 ("bitmaps/planlibm/color/army.bmp", @@ -728,11 +741,11 @@ W_PointBitmap2 (mplanet_bitmaps[7], j, 0, BMP_CPLANET_WIDTH, BMP_CPLANET_HEIGHT); } - + /* Load the unknown planet bitmap */ mplanet_unknown = - W_StoreBitmap3 ("bitmaps/planlibm/color/unknown.bmp", - BMP_CPLANET_WIDTH, BMP_CPLANET_HEIGHT, BMP_PLANET_UNKNOWN, mapw, + W_StoreBitmap3 ("bitmaps/planlibm/color/munknown.bmp", + BMP_CPLANET_WIDTH, BMP_CPLANET_HEIGHT, BMP_PLANET_MUNKNOWN, mapw, LR_DEFAULTCOLOR); /* Load the resource bitmaps */ @@ -1082,6 +1095,7 @@ planetBitmap = intDefault ("planetBitmap", planetBitmap); planetBitmapGalaxy = intDefault ("planetBitmapGalaxy", planetBitmapGalaxy); + rotatePlanets = booleanDefault ("rotatePlanets", rotatePlanets); loadplanetsC(); // Always load new color planet bitmaps..for now loadmplanetsC(); switch (planetBitmap) // Case 3 = new color, but we never use Planlib @@ -2035,7 +2049,7 @@ void redrawQuit (void) { - W_WriteText (qwin, 5, 5, textColor, "Quit NetrekXP", 13, W_RegularFont); + W_WriteText (qwin, 5, 5, textColor, "Quit Netrek XP", 14, W_RegularFont); } #define CLOCK_BDR 0 @@ -2092,7 +2106,7 @@ ty = 2*(cy - W_Textheight / 2)/3; W_MaskText (qwin, tx, ty, W_Black, buf, strlen (buf), W_RegularFont); - cp = "Quit NetrekXP"; + cp = "Quit Netrek XP"; } else { Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- local.c 29 May 2006 23:59:53 -0000 1.36 +++ local.c 2 Jun 2006 21:06:55 -0000 1.37 @@ -35,7 +35,7 @@ #else static int clearline[4][MAXPLAYER + 2 * MAXPLAYER]; #endif - +static int planet_frame = 0; #ifdef SOUND static int sound_phaser = 0; static int sound_other_phaser = 0; @@ -396,9 +396,14 @@ } return planet_bits[i]; } - else + else // Unknown planet { - return planet_unknown; + if ((planet_frame >= CPLANET_VIEWS - 1) || (planet_frame < 0)) + planet_frame = 0; + if (rotatePlanets) + return planet_unknown[planet_frame]; + else + return planet_unknown_NR; } } @@ -560,10 +565,10 @@ } if (planetBitmap == 3) // Needs adjusting { - clearzone[0][clearcount] = dx - (7 * BMP_PLANET_WIDTH / 8); + clearzone[0][clearcount] = dx - (7 * BMP_PLANET_WIDTH / 8 + 1); clearzone[1][clearcount] = dy - (5 * BMP_PLANET_HEIGHT / 6); - clearzone[2][clearcount] = 7 * BMP_PLANET_WIDTH / 4 + 1; - clearzone[3][clearcount] = 4 * BMP_PLANET_HEIGHT / 3 + 1; + clearzone[2][clearcount] = 7 * BMP_PLANET_WIDTH / 4 + 2; + clearzone[3][clearcount] = 4 * BMP_PLANET_HEIGHT / 3; } else { @@ -574,6 +579,7 @@ } clearcount++; } + planet_frame++; } @@ -994,8 +1000,8 @@ W_WriteBitmap (dx - (cloak_width / 2), dy - (cloak_height / 2), cloakicon, playerColor (j), w); - if (!myPlayer (j)) /* if myplayer draw the - * shield */ + if (!myPlayer (j) && !isObsLockPlayer(j)) + /* if my player, or observing that player, draw the shield */ continue; } @@ -1005,7 +1011,7 @@ if ((useLite && emph_player_seq_n[j->p_no] > 0) && (liteflag & LITE_PLAYERS_LOCAL)) { - int seq_n = emph_player_seq_n[j->p_no] % emph_player_seql_frames; + int seq_n = emph_player_seq_n[j->p_no] % emph_player_seql_frames; W_WriteBitmap (dx - (emph_player_seql_width / 2), dy - (emph_player_seql_height / 2), emph_player_seql[seq_n], @@ -1648,7 +1654,7 @@ } } } - else if (!(j->p_flags & PFPRESS || j->p_flags & PFTRACT)) + else if ((myPlayer(j) || isObsLockPlayer(j))&& !(j->p_flags & PFPRESS || j->p_flags & PFTRACT)) tcounter = 2; } } @@ -2193,7 +2199,6 @@ int ex, ey, sx, sy; #endif - #ifdef HOCKEY_LINES if (showHockeyLinesLocal && hockey_mode ()) for (sl = local_hockey_lines + NUM_HOCKEY_LINES - 1; @@ -2344,12 +2349,10 @@ { W_ChangeBorder (w, gColor); W_ChangeBorder (mapw, gColor); + alertBorderColor = gColor; } else - { - W_ChangeBorder (w, W_White); - W_ChangeBorder (mapw, W_White); - } + alertBorderColor = W_White; W_ChangeBorder (baseWin, gColor); #if defined(SOUND) @@ -2369,12 +2372,10 @@ { W_ChangeBorder (w, yColor); W_ChangeBorder (mapw, yColor); + alertBorderColor = yColor; } else - { - W_ChangeBorder (w, W_White); - W_ChangeBorder (mapw, W_White); - } + alertBorderColor = W_White; W_ChangeBorder (baseWin, yColor); #if defined(SOUND) @@ -2398,12 +2399,10 @@ { W_ChangeBorder (w, rColor); W_ChangeBorder (mapw, rColor); + alertBorderColor = rColor; } else - { - W_ChangeBorder (w, W_White); - W_ChangeBorder (mapw, W_White); - } + alertBorderColor = W_White; W_ChangeBorder (baseWin, rColor); #if defined(SOUND) @@ -2416,6 +2415,12 @@ break; } } + /* Force a border redraw */ + else + { + W_ChangeBorder (w, alertBorderColor); + W_ChangeBorder (mapw, alertBorderColor); + } #if defined(SOUND) if (newSound) Index: stampver.inf =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/stampver.inf,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- stampver.inf 21 Apr 2006 12:00:07 -0000 1.3 +++ stampver.inf 2 Jun 2006 21:06:55 -0000 1.4 @@ -1,5 +1,5 @@ ;StampVer information file -FileVersion=4.4.0.4 -ProductVersion=4.4.0.4 -;FileFormat=%a.%b.%c Build %04d (%td %tb %tY) -;ProductFormat=%a.%b.%c Build %04d +;FileVersion=1.0.0.0 +;ProductVersion=0.0.0.0 +;FileFormat=%a.%b.%c.%d +;ProductFormat=%a.%b.%c.%d Index: vccnetrek.rc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/vccnetrek.rc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- vccnetrek.rc 12 May 2006 01:58:38 -0000 1.2 +++ vccnetrek.rc 2 Jun 2006 21:06:55 -0000 1.3 @@ -3,8 +3,8 @@ MAIN ICON DISCARDABLE "main.ico" 1 VERSIONINFO -FILEVERSION 4, 4, 0, 4 -PRODUCTVERSION 4, 4, 0, 4 +FILEVERSION 1, 0, 0, 0 +PRODUCTVERSION 1, 0, 0, 0 { BLOCK "StringFileInfo" { BLOCK "040904E4" { Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- map.c 31 May 2006 03:59:27 -0000 1.16 +++ map.c 2 Jun 2006 21:06:55 -0000 1.17 @@ -40,12 +40,16 @@ * Local Variables: * * roughMap[x][y] -- Rough map of planets to help find overlaps. - * roughMap2[x][y] -- Secondary rought map, to help with overlap. + * roughMap2[x][y] -- Secondary rough map, to help with overlap. + * roughMap3[x][y] -- Rough map of new planets to help find overlaps. + * roughMap4[x][y] -- Secondary rough map for new planets, to help with overlap. * initialized -- Has initPlanets() been called? */ static signed char roughMap[DETAIL][DETAIL]; static signed char roughMap2[DETAIL][DETAIL]; +static signed char roughMap3[DETAIL][DETAIL]; +static signed char roughMap4[DETAIL][DETAIL]; static int initialized = 0; @@ -79,7 +83,7 @@ int startX, startY; int endX, endY; struct planet *pl; - const int pRadius = BMP_MPLANET_WIDTH * GWIDTH / WINSIDE / 2; + int pRadius; const int tHeight = W_Textheight * GWIDTH / WINSIDE; const int tWidth = W_Textwidth * GWIDTH / WINSIDE; @@ -89,9 +93,20 @@ { roughMap[x][y] = -1; roughMap2[x][y] = -1; + roughMap3[x][y] = -1; + roughMap4[x][y] = -1; } } - + /* Treating the planet a little bigger makes beeplite flashes redraw planets more + consistently - I don't think this function was written with the possibility of a + ship cutting out twice it's normal size on the galactic map. The player's ship gets + assigned to a x,y point and that is intersected with the rough planet map in a + checkredraw call, which doesn't work so good if the player ship is beeplite highlited */ +#ifdef BEEPLITE + pRadius = 3 * BMP_MPLANET_WIDTH * GWIDTH / WINSIDE / 5; +#else + pRadius = BMP_MPLANET_WIDTH * GWIDTH / WINSIDE / 2; +#endif for (k = 0, pl = planets; k < MAXPLANETS; k++, pl++) { /* @@ -130,33 +145,17 @@ } } } - - initialized = 1; -} - - -#ifdef none /* Debugging code */ - -/******************************************************************************/ -/*** showRegions() -/******************************************************************************/ -void -showRegions (void) -/* - * Make a rough map of the location of all the planets to help decide - * whether a ship is possibly overlapping a planet. - */ -{ - int x, y, k; - int startX, startY, centre; - int endX, endY; - struct planet *pl; - const int pRadius = BMP_MPLANET_WIDTH * GWIDTH / WINSIDE / 2; - const int tHeight = W_Textheight * GWIDTH / WINSIDE; - const int tWidth = W_Textwidth * GWIDTH / WINSIDE; - + /* Now loop for the new planet bitmaps, which are roughly 50% wider */ + pRadius = 3 * BMP_MPLANET_WIDTH * GWIDTH / WINSIDE / 4; for (k = 0, pl = planets; k < MAXPLANETS; k++, pl++) { + /* + Size of planet is pRadius but a ship will touch the planet if + it is one character away horizontally or half a character + vertically. Also remember the planet name at the bottom. + This name can stick out about half a character to the right. + */ + startX = (pl->pl_x - pRadius - tWidth) / SIZE; endX = (pl->pl_x + pRadius + tWidth + (tWidth / 2)) / SIZE; @@ -166,27 +165,28 @@ if (startX < 0) startX = 0; - if (endX > DETAIL) - endX = DETAIL; + if (endX >= DETAIL) + endX = DETAIL - 1; if (startY < 0) startY = 0; - if (endY > DETAIL) - endY = DETAIL; - - startX = startX * SIZE * WINSIDE / GWIDTH; - startY = startY * SIZE * WINSIDE / GWIDTH; - endX = (endX * SIZE + SIZE - 1) * WINSIDE / GWIDTH; - endY = (endY * SIZE + SIZE - 1) * WINSIDE / GWIDTH; + if (endY >= DETAIL) + endY = DETAIL - 1; - W_MakeLine (mapw, startX, startY, startX, endY, W_White); - W_MakeLine (mapw, startX, startY, endX, startY, W_White); - W_MakeLine (mapw, endX, endY, startX, endY, W_White); - W_MakeLine (mapw, endX, endY, endX, startY, W_White); + for (x = startX; x <= endX; x++) + { + for (y = startY; y <= endY; y++) + { + if (roughMap3[x][y] == -1) + roughMap3[x][y] = (char) k; + else + roughMap4[x][y] = (char) k; + } + } } + initialized = 1; } -#endif /* none */ /* Debugging code */ /******************************************************************************/ /*** checkRedraw() @@ -205,17 +205,36 @@ x /= SIZE; y /= SIZE; - i = roughMap[x][y]; - - if (i != -1) + if (planetBitmapGalaxy != 3) { - planets[i].pl_flags |= PLREDRAW; - - i = roughMap2[x][y]; + i = roughMap[x][y]; if (i != -1) { planets[i].pl_flags |= PLREDRAW; + + i = roughMap2[x][y]; + + if (i != -1) + { + planets[i].pl_flags |= PLREDRAW; + } + } + } + else + { + i = roughMap3[x][y]; + + if (i != -1) + { + planets[i].pl_flags |= PLREDRAW; + + i = roughMap4[x][y]; + + if (i != -1) + { + planets[i].pl_flags |= PLREDRAW; + } } } } @@ -323,7 +342,7 @@ } return mplanet_bits[i]; } - else + else // Unknown planet { return mplanet_unknown; } @@ -430,9 +449,9 @@ /* XFIX */ if (planetBitmapGalaxy == 3) // Needs adjusting - W_ClearArea (mapw, odx - 7 * BMP_MPLANET_WIDTH / 8 - 1, + W_ClearArea (mapw, odx - (7 * BMP_MPLANET_WIDTH / 8 + 1), ody - (5 * BMP_MPLANET_HEIGHT / 6), - 7 * BMP_MPLANET_WIDTH / 4, 4 * BMP_MPLANET_HEIGHT / 3); + 7 * BMP_MPLANET_WIDTH / 4 + 2, 4 * BMP_MPLANET_HEIGHT / 3); else W_ClearArea (mapw, odx - (BMP_MPLANET_WIDTH / 2), ody - (BMP_MPLANET_HEIGHT / 2), @@ -448,9 +467,9 @@ /* XFIX */ if (planetBitmapGalaxy == 3) // Needs adjusting - W_ClearArea (mapw, dx - 7 * BMP_MPLANET_WIDTH / 8 - 5, - dy - (5 * BMP_MPLANET_HEIGHT / 6) - 4, - 7 * BMP_MPLANET_WIDTH / 4 + 8, 4 * BMP_MPLANET_HEIGHT / 3 + 8); + W_ClearArea (mapw, dx - (7 * BMP_MPLANET_WIDTH / 8 + 5), + dy - (5 * BMP_MPLANET_HEIGHT / 6 + 4), + 7 * BMP_MPLANET_WIDTH / 4 + 10, 4 * BMP_MPLANET_HEIGHT / 3 + 8); else W_ClearArea (mapw, dx - (BMP_MPLANET_WIDTH / 2 + 4), @@ -465,7 +484,7 @@ #ifdef BEEPLITE if (useLite && emph_planet_seq_n[l->pl_no] > 0) { - int seq_n = emph_planet_seq_n[l->pl_no] % emph_planet_seq_frames; + int seq_n = emph_planet_seq_n[l->pl_no] % emph_planet_seq_frames; if (planetBitmapGalaxy == 3) { @@ -890,7 +909,7 @@ if ((useLite && emph_player_seq_n[i] > 0) && (liteflag & LITE_PLAYERS_MAP)) { - int seq_n = emph_player_seq_n[i] % emph_player_seq_frames; + int seq_n = emph_player_seq_n[i] % emph_player_seq_frames; W_WriteBitmap(dx - (emph_player_seq_width / 2 - 1), dy - (emph_player_seq_height / 2 + 1), Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- data.c 28 May 2006 23:05:12 -0000 1.30 +++ data.c 2 Jun 2006 21:06:55 -0000 1.31 @@ -61,6 +61,7 @@ * system support */ int niftyNewMessages = 1; unsigned int oldalert = 0; +int alertBorderColor = 0; int remap[16] = { 0, 1, 2, 0, 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0 }; int messpend = 0; #ifdef XTRA_MESSAGE_UI @@ -107,6 +108,7 @@ int planetBitmap = 0; int planetBitmapGalaxy = 0; +int rotatePlanets = 1; int logging = 0; int continueTractor = 1; @@ -209,7 +211,7 @@ #ifdef SHORT_PACKETS int why_dead = 0; -int tryShort = 0; /* for .xtrekrc option */ +int tryShort = 1; /* for .xtrekrc option */ int tryShort1 = 0; int recv_short = 0; int recv_mesg = 1; @@ -313,7 +315,10 @@ ori_bitmapsHR[NUM_TYPES], ind_bitmapsHR[NUM_TYPES]; // Planets -W_Icon planet_unknown, mplanet_unknown; +W_Icon planet_unknown_bitmap; +W_Icon planet_unknown[CPLANET_VIEWS]; +W_Icon planet_unknown_NR; +W_Icon mplanet_unknown; W_Icon planet_bitmaps[8], mplanet_bitmaps[8]; W_Icon planet_earth[NUMTEAMS], planet_klingus[NUMTEAMS], planet_orion[NUMTEAMS], planet_romulus[NUMTEAMS], planet_agri1[NUMTEAMS], planet_agri2[NUMTEAMS], Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- parsemeta.c 25 May 2006 08:43:57 -0000 1.9 +++ parsemeta.c 2 Jun 2006 21:06:55 -0000 1.10 @@ -435,7 +435,7 @@ } free (sockbuf); - metaWindowName = "NetrekXP MetaServer List"; + metaWindowName = "Netrek XP 2006 MetaServer List"; return 1; } Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- option.c 28 May 2006 23:05:12 -0000 1.20 +++ option.c 2 Jun 2006 21:06:55 -0000 1.21 @@ -279,6 +279,7 @@ {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, {1, "", &planetBitmap, 0, 0, 0, planetbitmapmess, &planetbitmaprange}, {1, "", &planetBitmapGalaxy, 0, 0, 0, planetbitmapgalaxymess, &planetbitmapgalaxyrange}, + {1, "rotate planets (new planets only)", &rotatePlanets, 0, 0, 0, NULL, NULL}, {1, "show planet names on local", &showPlanetNames, 0, 0, 0, NULL, NULL}, {1, "show army count on orbit", &showArmy, 0, 0, 0, NULL, NULL}, {1, "show owner on galactic", &showPlanetOwner, 0, 0, 0, NULL, NULL}, @@ -903,7 +904,6 @@ W_ClearWindow (w); W_ClearWindow (mapw); redrawall = 1; - oldalert = 0; /* Force a border refresh */ } else if (op->op_option == &partitionPlist) RedrawPlayerList (); Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- defaults.c 28 May 2006 23:05:12 -0000 1.22 +++ defaults.c 2 Jun 2006 21:06:55 -0000 1.23 @@ -445,6 +445,12 @@ NULL } }, + {"rotatePlanets", &rotatePlanets, RC_BOOL, + { + "Rotate planets (only works with new planet bitmaps)", + NULL + } + }, {"saveBig", &saveBig, RC_BOOL, { "Save options with comments", From modemhero at users.sourceforge.net Sat Jun 3 02:03:44 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Jun 2006 07:03:44 +0000 Subject: [netrek-cvs] client/netrekxp/resources/sounds nt_message1.wav, NONE, 1.1 nt_message3.wav, 1.1, NONE Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/sounds In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28852/resources/sounds Added Files: nt_message1.wav Removed Files: nt_message3.wav Log Message: Fixed beeplite TTS with detcircle and doublebuffering, at the same time rewriting the text messaging code to display and clear text in a more intelligent fashion Fixed beeplite sounds with newSound --- NEW FILE: nt_message1.wav --- (This appears to be a binary file; contents omitted.) --- nt_message3.wav DELETED --- From modemhero at users.sourceforge.net Sat Jun 3 02:03:44 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Jun 2006 07:03:44 +0000 Subject: [netrek-cvs] client/netrekxp/include proto.h, 1.23, 1.24 sound.h, 1.7, 1.8 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28852/include Modified Files: proto.h sound.h Log Message: Fixed beeplite TTS with detcircle and doublebuffering, at the same time rewriting the text messaging code to display and clear text in a more intelligent fashion Fixed beeplite sounds with newSound Index: sound.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/sound.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- sound.h 1 May 2006 00:55:10 -0000 1.7 +++ sound.h 3 Jun 2006 07:03:42 -0000 1.8 @@ -77,6 +77,8 @@ OTHER_FIRE_TORP_WAV, INTRO_WAV, MESSAGE_WAV, + MESSAGE1_WAV, + MESSAGE2_WAV, PHASER_WAV, PHASER_OTHER_WAV, PLASMA_HIT_WAV, Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- proto.h 29 May 2006 00:18:09 -0000 1.23 +++ proto.h 3 Jun 2006 07:03:42 -0000 1.24 @@ -739,10 +739,6 @@ W_Icon icon, W_Color color, W_Window window); -void W_EraseTTSText (W_Window window, - int last_tts_xpos, - int tts_ypos, - int last_tts_width); void W_WriteTTSText (W_Window window, int max_width, int tts_ypos, From modemhero at users.sourceforge.net Sat Jun 3 02:03:44 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Jun 2006 07:03:44 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.62,1.63 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28852/resources/docs Modified Files: changes.txt Log Message: Fixed beeplite TTS with detcircle and doublebuffering, at the same time rewriting the text messaging code to display and clear text in a more intelligent fashion Fixed beeplite sounds with newSound Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- changes.txt 2 Jun 2006 21:06:54 -0000 1.62 +++ changes.txt 3 Jun 2006 07:03:42 -0000 1.63 @@ -1,4 +1,7 @@ Version 1.1: +- fixed beeplite TTS with detcircle and doublebuffering, at the same time rewriting the + text messaging code to display and clear text in a more intelligent fashion +- fixed beeplite sounds with newSound - hopefully fixed redraw problem with beeplite not refreshing planets on the planet map Netrek XP 2006, Version 1.0: (Released 01-Jun-2006) From modemhero at users.sourceforge.net Sat Jun 3 02:03:44 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Jun 2006 07:03:44 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.44, 1.45 clientr.suo, 1.20, 1.21 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28852 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Fixed beeplite TTS with detcircle and doublebuffering, at the same time rewriting the text messaging code to display and clear text in a more intelligent fashion Fixed beeplite sounds with newSound Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- NetrekXP to do list.C 2 Jun 2006 21:06:54 -0000 1.44 +++ NetrekXP to do list.C 3 Jun 2006 07:03:42 -0000 1.45 @@ -15,6 +15,7 @@ 6) look into swar/war in repair time, with obs and plr - doesn't seem to be any way for an obs to know what the war decs are of the person he is observing. Best solution is to just have server send repair time and planet orbit info. +7) xtkill team and teleport not working right Things that go wrong when short packets are on: 1) cloaking/shields at warp 0 doesn't update someone else's tactical on what you did if @@ -53,7 +54,9 @@ 9) Use masking for things like player team/letter display on galactic. Ship draw on tactical (have it overwrite the planet/wrench/gas/army for example, not just combine colors). 10) Get square planet bitmaps so I can turn them into mapped rotating globes. -11) more transparent det circle +12) phaser burst % not working right with short packet and ATT +14) ships near newplanets blink in and out of galactic +15) bug with lock icon and new get planet orbit code Stas's list: - color coded playerlist. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 Binary files /tmp/cvs2By1ql and /tmp/cvsn7L9hK differ From modemhero at users.sourceforge.net Sat Jun 3 02:03:44 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Jun 2006 07:03:44 +0000 Subject: [netrek-cvs] client/netrekxp/src beeplite.c, 1.9, 1.10 local.c, 1.37, 1.38 mswindow.c, 1.30, 1.31 redraw.c, 1.7, 1.8 sound.c, 1.14, 1.15 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv28852/src Modified Files: beeplite.c local.c mswindow.c redraw.c sound.c Log Message: Fixed beeplite TTS with detcircle and doublebuffering, at the same time rewriting the text messaging code to display and clear text in a more intelligent fashion Fixed beeplite sounds with newSound Index: redraw.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/redraw.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- redraw.c 18 May 2006 07:15:35 -0000 1.7 +++ redraw.c 3 Jun 2006 07:03:42 -0000 1.8 @@ -104,31 +104,6 @@ W_ClearArea (warnw, 5, 5, W_Textwidth * warncount, W_Textheight); warncount = 0; } - -#ifdef BEEPLITE - if (tts_timer) - { - tts_timer--; - if (!tts_timer) - { - /* timed out */ - W_EraseTTSText(w, last_tts_xpos, tts_ypos, last_tts_width); - last_tts_width = 0; - } - else if (tts_timer == tts_time - 1 && last_tts_width) - { - /* first draw -- erase previous */ - W_EraseTTSText(w, last_tts_xpos, tts_ypos, last_tts_width); - /* draw new */ - W_WriteTTSText(w, WINSIDE, tts_ypos, lastIn, tts_len); - } - else - { - /* regular draw */ - W_WriteTTSText(w, WINSIDE, tts_ypos, lastIn, tts_len); - } - } -#endif local (); /* redraw local window */ Index: beeplite.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/beeplite.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- beeplite.c 28 May 2006 23:05:12 -0000 1.9 +++ beeplite.c 3 Jun 2006 07:03:42 -0000 1.10 @@ -204,49 +204,89 @@ } break; -/* The sound files don't even exist in standard client, and - are not loaded into SDL library currently - can change at - a later time. */ +/* SDL sounds sent to default (MESSAGE_WAV) for sounds not in client yet */ #ifdef SOUND - if (!newSound) - { case '1': if (F_beeplite_flags & LITE_SOUNDS) - Play_Sound(MESSAGE1_SOUND); + { + if (newSound) + Play_Sound(MESSAGE1_WAV); + else + Play_Sound(MESSAGE1_SOUND); + } break; case '2': if (F_beeplite_flags & LITE_SOUNDS) - Play_Sound(MESSAGE2_SOUND); + { + if (newSound) + Play_Sound(MESSAGE2_WAV); + else + Play_Sound(MESSAGE2_SOUND); + } break; case '3': if (F_beeplite_flags & LITE_SOUNDS) - Play_Sound(MESSAGE3_SOUND); + { + if (newSound) + Play_Sound(MESSAGE_WAV); + else + Play_Sound(MESSAGE3_SOUND); + } break; case '4': if (F_beeplite_flags & LITE_SOUNDS) - Play_Sound(MESSAGE4_SOUND); + { + if (newSound) + Play_Sound(MESSAGE_WAV); + else + Play_Sound(MESSAGE4_SOUND); + } break; case '5': if (F_beeplite_flags & LITE_SOUNDS) - Play_Sound(MESSAGE5_SOUND); + { + if (newSound) + Play_Sound(MESSAGE_WAV); + else + Play_Sound(MESSAGE5_SOUND); + } break; case '6': if (F_beeplite_flags & LITE_SOUNDS) - Play_Sound(MESSAGE6_SOUND); + { + if (newSound) + Play_Sound(MESSAGE_WAV); + else + Play_Sound(MESSAGE6_SOUND); + } break; case '7': if (F_beeplite_flags & LITE_SOUNDS) - Play_Sound(MESSAGE7_SOUND); + { + if (newSound) + Play_Sound(MESSAGE_WAV); + else + Play_Sound(MESSAGE7_SOUND); + } break; case '8': if (F_beeplite_flags & LITE_SOUNDS) - Play_Sound(MESSAGE8_SOUND); + { + if (newSound) + Play_Sound(MESSAGE_WAV); + else + Play_Sound(MESSAGE8_SOUND); + } break; case '9': if (F_beeplite_flags & LITE_SOUNDS) - Play_Sound(MESSAGE9_SOUND); + { + if (newSound) + Play_Sound(MESSAGE_WAV); + else + Play_Sound(MESSAGE9_SOUND); + } break; - } #endif /* Text between: /| | will be displayed with TTS */ Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- local.c 2 Jun 2006 21:06:55 -0000 1.37 +++ local.c 3 Jun 2006 07:03:42 -0000 1.38 @@ -1120,7 +1120,29 @@ clearcount++; } } - + +#ifdef BEEPLITE + if (tts_timer) + { + tts_timer--; + if (!tts_timer) + { + /* timed out */ + last_tts_width = 0; + } + else + { + /* draw */ + W_WriteTTSText(w, WINSIDE, tts_ypos, lastIn, tts_len); + clearzone[0][clearcount] = last_tts_xpos; + clearzone[1][clearcount] = tts_ypos - W_Textheight; + clearzone[2][clearcount] = last_tts_width; + clearzone[3][clearcount] = W_Textheight; + clearcount++; + } + } +#endif + if (j->p_flags & PFCLOAK) /* when cloaked stop here */ continue; Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- mswindow.c 2 Jun 2006 21:06:55 -0000 1.30 +++ mswindow.c 3 Jun 2006 07:03:42 -0000 1.31 @@ -711,7 +711,7 @@ #endif //Register our class - wc.cbSize = sizeof(WNDCLASSEX); + wc.cbSize = sizeof(WNDCLASSEX); wc.style = CS_NOCLOSE | CS_HREDRAW | CS_VREDRAW; //Don't allow them to close windows wc.lpfnWndProc = NetrekWndProc; wc.cbClsExtra = 0; @@ -5278,26 +5278,17 @@ } #ifdef BEEPLITE -void W_EraseTTSText(W_Window window, int last_tts_xpos, int tts_ypos, int last_tts_width) -{ - tts_ypos -= W_Textheight; - last_tts_xpos -= 3; - last_tts_width += 3; - - W_ClearArea(window, last_tts_xpos, tts_ypos, last_tts_width, W_Textheight); -} - -void W_WriteTTSText(W_Window window, int max_width, int tts_ypos, char *str, int len) +void W_WriteTTSText(W_Window window, int max_width, int y, char *str, int len) { register int x; - HDC hdc; + register int border; SIZE ext; - FNHEADER_VOID; - - tts_ypos -= W_Textheight; + DBHEADER_VOID; - hdc = GetDC(win->hwnd); + y -= W_Textheight; + border = win->border; + if (NetrekPalette) { SelectPalette(hdc, NetrekPalette, FALSE); @@ -5306,14 +5297,18 @@ SetTextColor(hdc, colortable[GREY].rgb); SetBkMode(hdc, TRANSPARENT); + SelectObject (hdc, (HFONT) W_HighlightFont); GetTextExtentPoint32 (hdc, str, len, &ext); x = (max_width - ext.cx)/2; - if (x < 0) - x = 4; - TextOut(hdc, x, tts_ypos, str, len); - ReleaseDC(win->hwnd, hdc); - last_tts_xpos = x; + x += border; + y += border; + + ExtTextOut (hdc, x, y, ETO_CLIPPED | ETO_OPAQUE, NULL, str, len, NULL); + last_tts_xpos = x - border; last_tts_width = ext.cx; + + if (!sdb || !doubleBuffering || !ingame) + ReleaseDC (win->hwnd, hdc); } #endif Index: sound.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- sound.c 29 May 2006 23:59:53 -0000 1.14 +++ sound.c 3 Jun 2006 07:03:42 -0000 1.15 @@ -111,6 +111,8 @@ newsounds[OTHER_FIRE_TORP_WAV] = Mix_LoadWAV(DATAFILE("nt_fire_torp_other.wav")); newsounds[INTRO_WAV] = Mix_LoadWAV(DATAFILE("nt_intro.wav")); newsounds[MESSAGE_WAV] = Mix_LoadWAV(DATAFILE("nt_message.wav")); + newsounds[MESSAGE1_WAV] = Mix_LoadWAV(DATAFILE("nt_message1.wav")); + newsounds[MESSAGE2_WAV] = Mix_LoadWAV(DATAFILE("nt_message2.wav")); newsounds[PHASER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser.wav")); newsounds[PHASER_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser_other.wav")); newsounds[PLASMA_HIT_WAV] = Mix_LoadWAV(DATAFILE("nt_plasma_hit.wav")); From modemhero at users.sourceforge.net Sat Jun 3 16:52:13 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Jun 2006 21:52:13 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.63,1.64 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7387/resources/docs Modified Files: changes.txt Log Message: Fixed bug with lock icon and orbiting Fixed short packet phaser stats for phaser hits > 1024 damage (only noticeable with ATTs, server sends phaser hit packet as long packet instead) Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- changes.txt 3 Jun 2006 07:03:42 -0000 1.63 +++ changes.txt 3 Jun 2006 21:52:11 -0000 1.64 @@ -1,4 +1,7 @@ Version 1.1: +- fixed bug with lock icon and orbiting +- fixed short packet phaser stats for phaser hits > 1024 damage (only noticeable with ATTs, + server sends phaser hit packet as long packet instead) - fixed beeplite TTS with detcircle and doublebuffering, at the same time rewriting the text messaging code to display and clear text in a more intelligent fashion - fixed beeplite sounds with newSound From modemhero at users.sourceforge.net Sat Jun 3 16:52:13 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Jun 2006 21:52:13 +0000 Subject: [netrek-cvs] client/netrekxp/src dashboard.c, 1.10, 1.11 local.c, 1.38, 1.39 warning.c, 1.7, 1.8 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7387/src Modified Files: dashboard.c local.c warning.c Log Message: Fixed bug with lock icon and orbiting Fixed short packet phaser stats for phaser hits > 1024 damage (only noticeable with ATTs, server sends phaser hit packet as long packet instead) Index: dashboard.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/dashboard.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- dashboard.c 2 Jun 2006 21:06:55 -0000 1.10 +++ dashboard.c 3 Jun 2006 21:52:11 -0000 1.11 @@ -860,6 +860,7 @@ int hulltime = 0; int shieldneeded, hullneeded; float shieldrate = 0.0, hullrate = 0.0; + short planet; struct player *plr; if ((me->p_flags & (PFPLOCK | PFOBSERV)) == (PFPLOCK | PFOBSERV)) @@ -882,9 +883,9 @@ /* And since observers don't get war flags, assume that if ship is orbiting a repair planet in repair mode, the planet is friendly - best we can do until server sends us more info */ - me->p_planet = get_closest_planet(me->p_x, me->p_y); - if ((planets[me->p_planet].pl_flags & PLREPAIR) - &&(obs || !(planets[me->p_planet].pl_owner & (plr->p_swar | plr->p_hostile)))) + planet = get_closest_planet(me->p_x, me->p_y); + if ((planets[planet].pl_flags & PLREPAIR) + &&(obs || !(planets[planet].pl_owner & (plr->p_swar | plr->p_hostile)))) me->p_subshield += me->p_ship.s_repair * 4; } if (me->p_flags & PFDOCK) @@ -904,9 +905,9 @@ /* And since observers don't get war flags, assume that if ship is orbiting a repair planet in repair mode, the planet is friendly - best we can do until server sends us more info */ - me->p_planet = get_closest_planet(me->p_x, me->p_y); - if ((planets[me->p_planet].pl_flags & PLREPAIR) - && (obs || !(planets[me->p_planet].pl_owner & (plr->p_swar | plr->p_hostile)))) + planet = get_closest_planet(me->p_x, me->p_y); + if ((planets[planet].pl_flags & PLREPAIR) + && (obs || !(planets[planet].pl_owner & (plr->p_swar | plr->p_hostile)))) me->p_subdamage += me->p_ship.s_repair * 2; } if (me->p_flags & PFDOCK) Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- local.c 3 Jun 2006 07:03:42 -0000 1.38 +++ local.c 3 Jun 2006 21:52:11 -0000 1.39 @@ -528,7 +528,7 @@ } if (showArmy && (me->p_flags & PFORBIT) - && (me->p_planet = get_closest_planet(me->p_x, me->p_y)) == l->pl_no) + && (get_closest_planet(me->p_x, me->p_y) == l->pl_no)) { char armbuf[4]; int armbuflen; Index: warning.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/warning.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- warning.c 20 May 2006 03:55:23 -0000 1.7 +++ warning.c 3 Jun 2006 21:52:11 -0000 1.8 @@ -27,7 +27,7 @@ void warning (char *text) { - int doPhaser, doRefit, doDeclare; + int doPhaser, doRefit, doDeclare, damage = 0; time_t curtime; struct tm *tm; char newtext[128]; @@ -50,16 +50,30 @@ delay = time (0) + DECLARETIME; #ifdef PHASER_STATS - if (!recv_short) /* Gotta parse phaser info for long packets here */ + if (doPhaser) /* Parse out damage */ { - if (strncmp(text, "You destroyed the plasma", 24) == 0) /* Plasma hit */ + char *d; + d = &text[warncount]; + /* find the last number in the string, should be damage */ + while (!isdigit(*d) && d > text) + d--; + while (d > text && isdigit(*d)) + d--; + if (d > text) + damage = atoi(d); + } + /* Gotta parse phaser info for long packets here, or for phaser hits with + damage > 1024, which are sent as a long packet by server */ + if (!recv_short || damage > 1024) + { + if (!recv_short && strncmp(text, "You destroyed the plasma", 24) == 0) /* Plasma hit */ { phaserStatTry++; phaserStatHit++; /* Record as an average damage hit so as not to skew overall average */ phaserStatDamage += phaserStatDamage / phaserStatTry; } - if (strncmp(text, "Phaser missed", 13) == 0) /* Miss */ + if (!recv_short && strncmp(text, "Phaser missed", 13) == 0) /* Miss */ { phaserStatTry++; if (phaserStats) @@ -77,16 +91,6 @@ } if (doPhaser) /* Parse out damage and record to average */ { - char *d; - register int damage; - d = &text[warncount]; - /* find the last number in the string, should be damage */ - while (!isdigit(*d) && d > text) - d--; - while (d > text && isdigit(*d)) - d--; - if (d > text) - damage = atoi(d); phaserStatTry++; phaserStatHit++; phaserStatDamage += damage; @@ -97,7 +101,7 @@ sprintf (newtext, "%s [%3d%%] [%2u]", text, phaserStatTry ? (phaserStatHit * 100) / phaserStatTry : 0, phaserStatTry ? phaserStatDamage / phaserStatTry : 0); - warncount += 13; + warncount += 14; W_WriteText (warnw, 5, 5, textColor, newtext, warncount, W_RegularFont); } From modemhero at users.sourceforge.net Sat Jun 3 16:52:13 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 03 Jun 2006 21:52:13 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.45, 1.46 clientr.suo, 1.21, 1.22 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7387 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Fixed bug with lock icon and orbiting Fixed short packet phaser stats for phaser hits > 1024 damage (only noticeable with ATTs, server sends phaser hit packet as long packet instead) Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- NetrekXP to do list.C 3 Jun 2006 07:03:42 -0000 1.45 +++ NetrekXP to do list.C 3 Jun 2006 21:52:11 -0000 1.46 @@ -15,7 +15,6 @@ 6) look into swar/war in repair time, with obs and plr - doesn't seem to be any way for an obs to know what the war decs are of the person he is observing. Best solution is to just have server send repair time and planet orbit info. -7) xtkill team and teleport not working right Things that go wrong when short packets are on: 1) cloaking/shields at warp 0 doesn't update someone else's tactical on what you did if @@ -27,6 +26,11 @@ send headings of 16 positions. 4) Others speed only sent to 16..messed up for obs locked onto puck in hockey, or twarpers +5) More detail on problem with whydead not updating with SP on. It's not just an observer thing, +for players too, the first update where pstatus changes, whydead is not sent. Only on 2nd update. +Now for regular players, not a problem, as they get several explosion updates on geno, so on 2nd explosion +frame they get the proper whydead. But observers just go to quit screen. So they don't have updated +whydead until next update. Things that are sorta fixed, but could use improvement: 1) rewrite placement/refresh of new resource bitmaps to work better with a scaled tactical @@ -54,9 +58,7 @@ 9) Use masking for things like player team/letter display on galactic. Ship draw on tactical (have it overwrite the planet/wrench/gas/army for example, not just combine colors). 10) Get square planet bitmaps so I can turn them into mapped rotating globes. -12) phaser burst % not working right with short packet and ATT -14) ships near newplanets blink in and out of galactic -15) bug with lock icon and new get planet orbit code +11) ships near newplanets blink in and out of galactic Stas's list: - color coded playerlist. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 Binary files /tmp/cvs4a95B0 and /tmp/cvsVCqo2P differ From modemhero at users.sourceforge.net Tue Jun 6 00:14:16 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 06 Jun 2006 05:14:16 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.31, 1.32 newwin.c, 1.35, 1.36 parsemeta.c, 1.10, 1.11 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9616/src Modified Files: data.c newwin.c parsemeta.c Log Message: Fixed typo in metaserver2 name Changed the key to pick ATT from X to *, to be consistent with the key for refitting More spacing fixes Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- newwin.c 2 Jun 2006 21:06:55 -0000 1.35 +++ newwin.c 6 Jun 2006 05:14:14 -0000 1.36 @@ -1506,7 +1506,7 @@ case 'g': *s_type = SGALAXY; break; - case 'X': + case '*': *s_type = ATT; break; case 'a': Index: parsemeta.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- parsemeta.c 2 Jun 2006 21:06:55 -0000 1.10 +++ parsemeta.c 6 Jun 2006 05:14:14 -0000 1.11 @@ -746,7 +746,7 @@ int sock; char buf[80]; struct servers *slist; - int x; + int x; #ifdef DEBUG LineToConsole ("Got meta window action, y=%d\n", data->y); @@ -761,12 +761,12 @@ LineToConsole ("Attempting to observe on port %d...\n", xtrekPort); } serverName = strdup (slist->address); - serverType = metaGetServerType (slist->typeflag); + serverType = metaGetServerType (slist->typeflag); #ifdef RSA useRsa = slist->RSA_client; #endif - slist->status = statusConnecting; + slist->status = statusConnecting; metarefresh (data->y); LineToConsole ("Checking %s on port %d\n", serverName, xtrekPort); @@ -785,25 +785,25 @@ } } else if (data->y == num_servers) /* Quit selected */ - { - W_WriteText (metaWin, 0, num_servers, W_Yellow, "Quit", 4, 0); - metadone(); + { + W_WriteText (metaWin, 0, num_servers, W_Yellow, "Quit", 4, 0); + metadone(); terminate (0); - } - else if (data->y == num_servers + 1) /* Help Line */ - { - x = data->x / W_Textwidth; - if (x >= 0 && x <= 19) /* Netrek Home Page */ - ShellExecute (NULL, "open", "http://www.netrek.org", NULL, NULL, SW_SHOWNORMAL); - else if (x >= 21 && x <= 35) /* Newbie Manual */ - ShellExecute (NULL, "open", "http://genocide.netrek.org/beginner/newbie.php", NULL, NULL, SW_SHOWNORMAL); - else if (x >= 37 && x <= 43) /* Forums */ - ShellExecute (NULL, "open", "http://groups-beta.google.com/group/rec.games.netrek", NULL, NULL, SW_SHOWNORMAL); - else if (x >= 45 && x <= 49) /* FAQ */ - ShellExecute (NULL, "open", "http://www.inl.org/netrek/netrekFAQ.html", NULL, NULL, SW_SHOWNORMAL); - else if (x >= 51 && x <= 67) /* Dogfight Manual */ - ShellExecute (NULL, "open", "http://cha.rlie.nl/dfmanual/", NULL, NULL, SW_SHOWNORMAL); - } + } + else if (data->y == num_servers + 1) /* Help Line */ + { + x = data->x / W_Textwidth; + if (x >= 0 && x <= 19) /* Netrek Home Page */ + ShellExecute (NULL, "open", "http://www.netrek.org", NULL, NULL, SW_SHOWNORMAL); + else if (x >= 21 && x <= 35) /* Newbie Manual */ + ShellExecute (NULL, "open", "http://genocide.netrek.org/beginner/newbie.php", NULL, NULL, SW_SHOWNORMAL); + else if (x >= 37 && x <= 43) /* Forums */ + ShellExecute (NULL, "open", "http://groups-beta.google.com/group/rec.games.netrek", NULL, NULL, SW_SHOWNORMAL); + else if (x >= 45 && x <= 49) /* FAQ */ + ShellExecute (NULL, "open", "http://www.inl.org/netrek/netrekFAQ.html", NULL, NULL, SW_SHOWNORMAL); + else if (x >= 51 && x <= 67) /* Dogfight Manual */ + ShellExecute (NULL, "open", "http://cha.rlie.nl/dfmanual/", NULL, NULL, SW_SHOWNORMAL); + } } @@ -1057,7 +1057,7 @@ readfds.fd_count = 1; readfds.fd_array[0] = s; Timeout.tv_sec = waittime / 1000; - Timeout.tv_usec = waittime % 1000; + Timeout.tv_usec = waittime % 1000; nRet=(select(1, &readfds, NULL, NULL, &Timeout)); return nRet; @@ -1072,7 +1072,7 @@ int elapsed; // waiting time for icmp replies between loops DWORD timestamp; // begin timestamp just before echo reply waiting loop u_short nSeq; // icmp ping request sequence number - DWORD rtt; // round trip time in milliseconds + DWORD rtt; // round trip time in milliseconds SOCKET rawSocket; struct sockaddr_in saDest; struct sockaddr_in saSrc; @@ -1095,7 +1095,7 @@ return (unsigned long) -1; } - while (!thread_ready) + while (!thread_ready) { // Flood ping all netrek servers at once for (i = 0; i < num_servers; ++i) Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- data.c 2 Jun 2006 21:06:55 -0000 1.31 +++ data.c 6 Jun 2006 05:14:14 -0000 1.32 @@ -227,7 +227,7 @@ #ifdef META /* Metaservers list */ char *metaServer[] = {"metaserver.us.netrek.org", - "metaserever2.us.netrek.org"}; + "metaserver2.us.netrek.org"}; int metaPort = 3521; char *metaCache = NULL; #ifdef METAPING From modemhero at users.sourceforge.net Tue Jun 6 00:14:16 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 06 Jun 2006 05:14:16 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs README for Win95, Win98, and WinME.TXT, 1.2, 1.3 changes.txt, 1.64, 1.65 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9616/resources/docs Modified Files: README for Win95, Win98, and WinME.TXT changes.txt Log Message: Fixed typo in metaserver2 name Changed the key to pick ATT from X to *, to be consistent with the key for refitting More spacing fixes Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- changes.txt 3 Jun 2006 21:52:11 -0000 1.64 +++ changes.txt 6 Jun 2006 05:14:13 -0000 1.65 @@ -1,4 +1,6 @@ Version 1.1: +- fixed typo in metaserver2 name +- changed the key to pick ATT from X to *, to be consistent with the key for refitting - fixed bug with lock icon and orbiting - fixed short packet phaser stats for phaser hits > 1024 damage (only noticeable with ATTs, server sends phaser hit packet as long packet instead) Index: README for Win95, Win98, and WinME.TXT =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/README for Win95, Win98, and WinME.TXT,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- README for Win95, Win98, and WinME.TXT 2 Jun 2006 21:06:54 -0000 1.2 +++ README for Win95, Win98, and WinME.TXT 6 Jun 2006 05:14:13 -0000 1.3 @@ -12,6 +12,9 @@ planetBitmap: 3 planetBitmapGalaxy: 3 +If you use your old netrekrc, please add newClock: off, as the default for the new +clock is "on". + So in conclusion, don't have any of those above options in your netrekrc, and the client should work fine! Also, I would recommend not switching between ship or planet bitmaps in game via options menu, as it may also break your client. Just choose a bitmap set From modemhero at users.sourceforge.net Tue Jun 6 00:14:15 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 06 Jun 2006 05:14:15 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.46, 1.47 clientr.suo, 1.22, 1.23 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9616 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Fixed typo in metaserver2 name Changed the key to pick ATT from X to *, to be consistent with the key for refitting More spacing fixes Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- NetrekXP to do list.C 3 Jun 2006 21:52:11 -0000 1.46 +++ NetrekXP to do list.C 6 Jun 2006 05:14:13 -0000 1.47 @@ -59,6 +59,13 @@ (have it overwrite the planet/wrench/gas/army for example, not just combine colors). 10) Get square planet bitmaps so I can turn them into mapped rotating globes. 11) ships near newplanets blink in and out of galactic +12) problem with message windows, text getting garbled near top, goes away with +flushing with scroll button. Doesn't show up initially, but do something like use +scroll button, alt-enter, change to review all..and it shows up. +13) review all scrolling messes up text, if bottom of window is below the visible +bottom border of netrek window. Actually will happen to whatever window is mapped +down there at bottom of screen +14) check why planet bitmaps (angle = 0) don't draw right on win98 Stas's list: - color coded playerlist. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 Binary files /tmp/cvswJWx2Q and /tmp/cvsEUw5Dn differ From modemhero at users.sourceforge.net Tue Jun 6 03:23:07 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 06 Jun 2006 08:23:07 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.28,1.29 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30011/include Modified Files: data.h Log Message: Changed newQuit from default on to off Fixed a few bugs in scaled bitmap writing function, has the added bonus of making the new planet bitmaps work in Win95/98/ME Fixed typo in metaserver2 name Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- data.h 2 Jun 2006 21:06:54 -0000 1.28 +++ data.h 6 Jun 2006 08:23:05 -0000 1.29 @@ -669,7 +669,7 @@ extern WNDPROC lpfnDefRichEditWndProc; /* default window procedure for our richedit controls */ extern int richText; /* temporary variable to enable/disable rich text windows */ -extern int newQuit; +extern int newQuit; /* new quit clock */ extern int newSound; /* Use new SDL sound interface */ extern int newSoundAngles; /* Use SDL with angular 3D sound */ #endif /* _h_data */ From modemhero at users.sourceforge.net Tue Jun 6 03:23:08 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 06 Jun 2006 08:23:08 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.13, 1.14 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30011/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Changed newQuit from default on to off Fixed a few bugs in scaled bitmap writing function, has the added bonus of making the new planet bitmaps work in Win95/98/ME Fixed typo in metaserver2 name Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- generalconfig.html 2 Jun 2006 21:06:54 -0000 1.13 +++ generalconfig.html 6 Jun 2006 08:23:06 -0000 1.14 @@ -556,8 +556,8 @@ Use new quit window
    -
  • on(default)
    • -
  • off
    • +
  • on
    • +
  • off(default)
From modemhero at users.sourceforge.net Tue Jun 6 03:23:08 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 06 Jun 2006 08:23:08 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs README for Win95, Win98, and WinME.TXT, 1.3, 1.4 changes.txt, 1.65, 1.66 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30011/resources/docs Modified Files: README for Win95, Win98, and WinME.TXT changes.txt Log Message: Changed newQuit from default on to off Fixed a few bugs in scaled bitmap writing function, has the added bonus of making the new planet bitmaps work in Win95/98/ME Fixed typo in metaserver2 name Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- changes.txt 6 Jun 2006 05:14:13 -0000 1.65 +++ changes.txt 6 Jun 2006 08:23:05 -0000 1.66 @@ -1,4 +1,7 @@ Version 1.1: +- changed newQuit from default on to off +- fixed a few bugs in scaled bitmap writing function, has the added bonus of making + the new planet bitmaps work in Win95/98/ME - fixed typo in metaserver2 name - changed the key to pick ATT from X to *, to be consistent with the key for refitting - fixed bug with lock icon and orbiting Index: README for Win95, Win98, and WinME.TXT =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/README for Win95, Win98, and WinME.TXT,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- README for Win95, Win98, and WinME.TXT 6 Jun 2006 05:14:13 -0000 1.3 +++ README for Win95, Win98, and WinME.TXT 6 Jun 2006 08:23:05 -0000 1.4 @@ -4,18 +4,11 @@ I acknowledge this is not the best solution, I will try to have it fixed in a future version. -The following options will NOT work with Windows 95/98/ME. In fact, they are very -likely to crash the client, so do not use them. +The following options will NOT work with Windows 95/98/ME, due to the use of a native +Windows transform function that was not added until Windows 2000: newClock: on colorClient: 4 -planetBitmap: 3 -planetBitmapGalaxy: 3 - -If you use your old netrekrc, please add newClock: off, as the default for the new -clock is "on". So in conclusion, don't have any of those above options in your netrekrc, and the client -should work fine! Also, I would recommend not switching between ship or planet bitmaps -in game via options menu, as it may also break your client. Just choose a bitmap set -you like and stick with it. +should work fine! \ No newline at end of file From modemhero at users.sourceforge.net Tue Jun 6 03:23:08 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 06 Jun 2006 08:23:08 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.32, 1.33 mswindow.c, 1.31, 1.32 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv30011/src Modified Files: data.c mswindow.c Log Message: Changed newQuit from default on to off Fixed a few bugs in scaled bitmap writing function, has the added bonus of making the new planet bitmaps work in Win95/98/ME Fixed typo in metaserver2 name Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- mswindow.c 3 Jun 2006 07:03:42 -0000 1.31 +++ mswindow.c 6 Jun 2006 08:23:06 -0000 1.32 @@ -4000,7 +4000,7 @@ // Copy selected section of main bitmap into newbmp before rotation SetStretchBltMode(GlobalMemDC2, COLORONCOLOR); StretchBlt(GlobalMemDC2, 0, 0, destwidth, destheight, GlobalMemDC, - srcx, srcy, srcwidth, srcheight, SRCPAINT); + srcx, srcy, srcwidth, srcheight, SRCCOPY); //Fast (I hope) rectangle intersection, don't overwrite our borders if (usebitmaphwnd) @@ -4126,7 +4126,7 @@ BitBlt(hdc, x, y, newwidth, newheight, GlobalMemDC2, srcx, srcy, SRCPAINT); } - + SelectObject (GlobalMemDC2, GlobalOldMemDC2Bitmap); //So we don't crunch on the next line... DeleteObject (newbmp); if (!sdb || !doubleBuffering || !ingame) @@ -5178,7 +5178,7 @@ // Copy selected section of main bitmap into newbmp before rotation SetStretchBltMode(GlobalMemDC2, COLORONCOLOR); StretchBlt(GlobalMemDC2, 0, 0, destwidth, destheight, GlobalMemDC, - srcx, srcy, srcwidth, srcheight, SRCPAINT); + srcx, srcy, srcwidth, srcheight, SRCCOPY); //Fast (I hope) rectangle intersection, don't overwrite our borders if (usebitmaphwnd) @@ -5266,6 +5266,7 @@ BitBlt(hdc, x, y, newwidth, newheight, GlobalMemDC2, srcx, srcy, SRCAND); } + SelectObject (GlobalMemDC2, GlobalOldMemDC2Bitmap); //So we don't crunch on the next line... DeleteObject (newbmp); if (!sdb || !doubleBuffering || !ingame) Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- data.c 6 Jun 2006 05:14:14 -0000 1.32 +++ data.c 6 Jun 2006 08:23:06 -0000 1.33 @@ -771,6 +771,6 @@ WNDPROC lpfnDefRichEditWndProc; /* default window proc */ int richText = 0; /* temporary variable to select rich text message windows */ -int newQuit = 1; +int newQuit = 0; /* new quit clock */ int newSound = 1; /* use new SDL sound */ int newSoundAngles = 1; /* use new SDL sound with angular 3d component */ \ No newline at end of file From modemhero at users.sourceforge.net Tue Jun 6 14:50:41 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 06 Jun 2006 19:50:41 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h, 1.29, 1.30 proto.h, 1.24, 1.25 wlib.h, 1.8, 1.9 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23390/include Modified Files: data.h proto.h wlib.h Log Message: Added "planetHighlighting: on/(off)" to draw a circle around the galaxy planet in the color of the team owner, and a 2nd white circle if planet has more than 4 armies. Mostly useful for new planets to easier tell race owner, and army status at a quick glance. Index: wlib.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/wlib.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- wlib.h 22 May 2006 08:27:52 -0000 1.8 +++ wlib.h 6 Jun 2006 19:50:38 -0000 1.9 @@ -196,6 +196,7 @@ int, int, int, + int, W_Color); extern void W_WriteTriangle (W_Window, int, Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- data.h 6 Jun 2006 08:23:05 -0000 1.29 +++ data.h 6 Jun 2006 19:50:38 -0000 1.30 @@ -229,6 +229,7 @@ extern int showLock; extern int planetBitmap; extern int planetBitmapGalaxy; +extern int planetHighlighting; extern int rotatePlanets; extern int logging; extern int continueTractor; Index: proto.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/proto.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- proto.h 3 Jun 2006 07:03:42 -0000 1.24 +++ proto.h 6 Jun 2006 19:50:38 -0000 1.25 @@ -596,6 +596,7 @@ int x, int y, int r, + int highlight, W_Color color); void W_WriteTriangle (W_Window window, int x, From modemhero at users.sourceforge.net Tue Jun 6 14:50:41 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 06 Jun 2006 19:50:41 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.66, 1.67 netrekrc, 1.3, 1.4 netrekrc_options.txt, 1.11, 1.12 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23390/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: Added "planetHighlighting: on/(off)" to draw a circle around the galaxy planet in the color of the team owner, and a 2nd white circle if planet has more than 4 armies. Mostly useful for new planets to easier tell race owner, and army status at a quick glance. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- netrekrc 2 Jun 2006 21:06:54 -0000 1.3 +++ netrekrc 6 Jun 2006 19:50:39 -0000 1.4 @@ -197,6 +197,9 @@ # 3 - New color planetBitmapGalaxy: 3 +# Highlight galactic planets by race and army status +planetHighlighting: on + # Suppose that players with letter greater than 'f' are observers playerListHack: off @@ -885,7 +888,7 @@ # Beeplite macros lite.take: /c/l -lite.base_ogg: /g/m +lite.base_ogg: /g/m/1/|OGG THE BASE!| lite.pickup: /p lite.help: %?%S=SB%{/c%}%?%a>0%{/c%} Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- netrekrc_options.txt 2 Jun 2006 21:06:54 -0000 1.11 +++ netrekrc_options.txt 6 Jun 2006 19:50:39 -0000 1.12 @@ -144,6 +144,7 @@ # 2 - Rabbitear # 3 - New color +planetHighlighting: (on/off) highlight galactic planets by race and army status playerList: (string) custom style of player list # ' ' - White Space # 'b' - Armies Bombed Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- changes.txt 6 Jun 2006 08:23:05 -0000 1.66 +++ changes.txt 6 Jun 2006 19:50:39 -0000 1.67 @@ -1,4 +1,7 @@ Version 1.1: +- added "planetHighlighting: on/(off)" to draw a circle around the galaxy planet in the + color of the team owner, and a 2nd white circle if planet has more than 4 armies. Mostly + useful for new planets to easier tell race owner, and army status at a quick glance. - changed newQuit from default on to off - fixed a few bugs in scaled bitmap writing function, has the added bonus of making the new planet bitmaps work in Win95/98/ME From modemhero at users.sourceforge.net Tue Jun 6 14:50:41 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 06 Jun 2006 19:50:41 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.14, 1.15 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23390/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Added "planetHighlighting: on/(off)" to draw a circle around the galaxy planet in the color of the team owner, and a 2nd white circle if planet has more than 4 armies. Mostly useful for new planets to easier tell race owner, and army status at a quick glance. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- generalconfig.html 6 Jun 2006 08:23:06 -0000 1.14 +++ generalconfig.html 6 Jun 2006 19:50:39 -0000 1.15 @@ -698,6 +698,16 @@ +planetHighlighting +Highlight galactic planets by race and army status + +
    +
  • on
    • +
  • off (default)
    • +
+ + + playerList Player list custom layout string From modemhero at users.sourceforge.net Tue Jun 6 14:50:40 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 06 Jun 2006 19:50:40 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.47,1.48 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23390 Modified Files: NetrekXP to do list.C Log Message: Added "planetHighlighting: on/(off)" to draw a circle around the galaxy planet in the color of the team owner, and a 2nd white circle if planet has more than 4 armies. Mostly useful for new planets to easier tell race owner, and army status at a quick glance. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- NetrekXP to do list.C 6 Jun 2006 05:14:13 -0000 1.47 +++ NetrekXP to do list.C 6 Jun 2006 19:50:38 -0000 1.48 @@ -58,14 +58,14 @@ 9) Use masking for things like player team/letter display on galactic. Ship draw on tactical (have it overwrite the planet/wrench/gas/army for example, not just combine colors). 10) Get square planet bitmaps so I can turn them into mapped rotating globes. -11) ships near newplanets blink in and out of galactic +11) ships at warp 0 near newplanets blink in and out of galactic 12) problem with message windows, text getting garbled near top, goes away with flushing with scroll button. Doesn't show up initially, but do something like use scroll button, alt-enter, change to review all..and it shows up. 13) review all scrolling messes up text, if bottom of window is below the visible bottom border of netrek window. Actually will happen to whatever window is mapped down there at bottom of screen -14) check why planet bitmaps (angle = 0) don't draw right on win98 +14) fix the 2 message sounds that don't convert right to 22 KHz Stas's list: - color coded playerlist. From modemhero at users.sourceforge.net Tue Jun 6 14:50:41 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 06 Jun 2006 19:50:41 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.33, 1.34 defaults.c, 1.23, 1.24 local.c, 1.39, 1.40 map.c, 1.17, 1.18 mswindow.c, 1.32, 1.33 option.c, 1.21, 1.22 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv23390/src Modified Files: data.c defaults.c local.c map.c mswindow.c option.c Log Message: Added "planetHighlighting: on/(off)" to draw a circle around the galaxy planet in the color of the team owner, and a 2nd white circle if planet has more than 4 armies. Mostly useful for new planets to easier tell race owner, and army status at a quick glance. Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- mswindow.c 6 Jun 2006 08:23:06 -0000 1.32 +++ mswindow.c 6 Jun 2006 19:50:39 -0000 1.33 @@ -3309,6 +3309,7 @@ int x, int y, int r, + int highlight, W_Color color) { DBHEADER_VOID; @@ -3321,11 +3322,16 @@ SelectPalette (hdc, NetrekPalette, FALSE); RealizePalette (hdc); } + SelectObject (hdc, colortable[color].pen); SelectObject (hdc, GetStockObject (NULL_BRUSH)); Ellipse (hdc, x - r, y - r, x + r, y + r); - + if (highlight) // Add extra white circle + { + SelectObject (hdc, colortable[W_White].pen); + Ellipse (hdc, x - r - 1, y - r - 1, x + r + 1, y + r + 1); + } if (!sdb || !doubleBuffering || !ingame) ReleaseDC (win->hwnd, hdc); } Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- local.c 3 Jun 2006 21:52:11 -0000 1.39 +++ local.c 6 Jun 2006 19:50:39 -0000 1.40 @@ -364,7 +364,7 @@ else // This should never be called planet_bits = planet_rock1; } - else if (p->pl_flags & PLCORE) // Not functional yet due to server + else if (p->pl_flags & PLCORE) { if (p->pl_flags & PLAGRI) planet_bits = planet_agri1; @@ -1112,7 +1112,7 @@ { if (myPlayer(j) || isObsLockPlayer(j)) { - W_WriteCircle(w, WINSIDE/2, WINSIDE/2, DETDIST/SCALE, W_Red); + W_WriteCircle(w, WINSIDE/2, WINSIDE/2, DETDIST/SCALE, 0, W_Red); clearzone[0][clearcount] = WINSIDE/2 - (DETDIST/SCALE); clearzone[1][clearcount] = WINSIDE/2 - (DETDIST/SCALE); clearzone[2][clearcount] = 2*DETDIST/SCALE; Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- defaults.c 2 Jun 2006 21:06:55 -0000 1.23 +++ defaults.c 6 Jun 2006 19:50:39 -0000 1.24 @@ -380,6 +380,12 @@ NULL } }, + {"planetHighlighting", &planetHighlighting, RC_BOOL, + { + "Highlight galactic planets by race and army status", + NULL + } + }, {"playerListHack", &playerListHack, RC_BOOL, { "Suppose that players with letter greater than \'f\' are observers", Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- data.c 6 Jun 2006 08:23:06 -0000 1.33 +++ data.c 6 Jun 2006 19:50:39 -0000 1.34 @@ -108,6 +108,7 @@ int planetBitmap = 0; int planetBitmapGalaxy = 0; +int planetHighlighting = 0; int rotatePlanets = 1; int logging = 0; Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- option.c 2 Jun 2006 21:06:55 -0000 1.21 +++ option.c 6 Jun 2006 19:50:39 -0000 1.22 @@ -279,6 +279,7 @@ {1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range}, {1, "", &planetBitmap, 0, 0, 0, planetbitmapmess, &planetbitmaprange}, {1, "", &planetBitmapGalaxy, 0, 0, 0, planetbitmapgalaxymess, &planetbitmapgalaxyrange}, + {1, "highlight planets", &planetHighlighting, 0, 0, 0, NULL, NULL}, {1, "rotate planets (new planets only)", &rotatePlanets, 0, 0, 0, NULL, NULL}, {1, "show planet names on local", &showPlanetNames, 0, 0, 0, NULL, NULL}, {1, "show army count on orbit", &showArmy, 0, 0, 0, NULL, NULL}, @@ -875,7 +876,7 @@ /* Actions to be taken when certain options are selected. * (Yes, this is a hack). */ - if (op->op_option == &showPlanetOwner) + if (op->op_option == &showPlanetOwner || op->op_option == &planetHighlighting) redrawall = 1; #ifdef HOCKEY_LINES else if (op->op_option == &showHockeyLinesMap) Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- map.c 2 Jun 2006 21:06:55 -0000 1.17 +++ map.c 6 Jun 2006 19:50:39 -0000 1.18 @@ -310,7 +310,7 @@ else // This should never be called mplanet_bits = mplanet_rock1; } - else if (p->pl_flags & PLCORE) // Not functional yet due to server + else if (p->pl_flags & PLCORE) { if (p->pl_flags & PLAGRI) mplanet_bits = mplanet_agri1; @@ -545,10 +545,14 @@ W_WriteBitmap (dx - (BMP_MPLANET_WIDTH / 2), dy - (BMP_MPLANET_HEIGHT / 2), planetmBitmap (l), planetColor (l), mapw); + } #ifdef BEEPLITE } #endif + if (planetHighlighting) /* Draw halo */ + W_WriteCircle(mapw, dx, dy, BMP_MPLANET_WIDTH / 2, + l->pl_armies > 4 ? 1 : 0, planetColor(l)); if ((l->pl_flags & PLAGRI) && (l->pl_info & me->p_team)) { From modemhero at users.sourceforge.net Thu Jun 8 21:14:11 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 09 Jun 2006 02:14:11 +0000 Subject: [netrek-cvs] client/netrekxp/src defaults.c, 1.24, 1.25 warning.c, 1.8, 1.9 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17383/src Modified Files: defaults.c warning.c Log Message: Read in defaults for the 2 new netrekrc options Fix to phaser message length Index: warning.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/warning.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- warning.c 3 Jun 2006 21:52:11 -0000 1.8 +++ warning.c 9 Jun 2006 02:14:08 -0000 1.9 @@ -101,7 +101,7 @@ sprintf (newtext, "%s [%3d%%] [%2u]", text, phaserStatTry ? (phaserStatHit * 100) / phaserStatTry : 0, phaserStatTry ? phaserStatDamage / phaserStatTry : 0); - warncount += 14; + warncount = strlen (newtext); W_WriteText (warnw, 5, 5, textColor, newtext, warncount, W_RegularFont); } Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- defaults.c 6 Jun 2006 19:50:39 -0000 1.24 +++ defaults.c 9 Jun 2006 02:14:08 -0000 1.25 @@ -1471,6 +1471,8 @@ showArmy = booleanDefault ("showArmy", showArmy); updatesPerSec = intDefault ("updatesPerSec", updatesPerSec); redrawDelay = intDefault ("redrawDelay", redrawDelay); + planetHighlighting = booleanDefault ("planetHighlighting", planetHighlighting); + rotatePlanets = booleanDefault ("rotatePlanets", rotatePlanets); logging = booleanDefault ("logging", logging); phaserShrink = intDefault ("phaserShrink", phaserShrink); From modemhero at users.sourceforge.net Thu Jun 8 21:14:10 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 09 Jun 2006 02:14:10 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.48, 1.49 clientr.suo, 1.23, 1.24 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv17383 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Read in defaults for the 2 new netrekrc options Fix to phaser message length Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- NetrekXP to do list.C 6 Jun 2006 19:50:38 -0000 1.48 +++ NetrekXP to do list.C 9 Jun 2006 02:14:08 -0000 1.49 @@ -66,6 +66,7 @@ bottom border of netrek window. Actually will happen to whatever window is mapped down there at bottom of screen 14) fix the 2 message sounds that don't convert right to 22 KHz +15) sounds for beamup/down and refit Stas's list: - color coded playerlist. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 Binary files /tmp/cvshfypXs and /tmp/cvsvxmRHE differ From modemhero at users.sourceforge.net Fri Jun 9 17:08:43 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 09 Jun 2006 22:08:43 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c, 1.40, 1.41 sound.c, 1.15, 1.16 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22420/src Modified Files: local.c sound.c Log Message: Converted 2 messages sounds and intro sound to higher quality to remove unwanted static. Changed SDL audio playback from 8 to 16bits, improves sound quality in a few cases. Bug fix to planet army count. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- local.c 6 Jun 2006 19:50:39 -0000 1.40 +++ local.c 9 Jun 2006 22:08:40 -0000 1.41 @@ -549,7 +549,7 @@ else { armbuf[0] = (char) (l->pl_armies / 100 + '0'); - armbuf[1] = (char) (l->pl_armies / 10 + '0'); + armbuf[1] = (char) ((l->pl_armies / 10) % 10 + '0'); armbuf[2] = (char) (l->pl_armies % 10 + '0'); armbuf[3] = '\0'; armbuflen = 4; Index: sound.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- sound.c 3 Jun 2006 07:03:42 -0000 1.15 +++ sound.c 9 Jun 2006 22:08:40 -0000 1.16 @@ -176,7 +176,7 @@ atexit(SDL_Quit); /* Open the audio device at 22050 Hz 8 bit Microsoft PCM with stereo */ - if (Mix_OpenAudio(22050, AUDIO_U8, 2, 1024) < 0) + if (Mix_OpenAudio(22050, AUDIO_S16SYS, 2, 1024) < 0) LineToConsole("Mix_OpenAudio: %s\n", Mix_GetError()); /* If we successfully loaded the wav files, so shut-off sound_init and play From modemhero at users.sourceforge.net Fri Jun 9 17:08:42 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 09 Jun 2006 22:08:42 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.67,1.68 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22420/resources/docs Modified Files: changes.txt Log Message: Converted 2 messages sounds and intro sound to higher quality to remove unwanted static. Changed SDL audio playback from 8 to 16bits, improves sound quality in a few cases. Bug fix to planet army count. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- changes.txt 6 Jun 2006 19:50:39 -0000 1.67 +++ changes.txt 9 Jun 2006 22:08:40 -0000 1.68 @@ -1,4 +1,7 @@ Version 1.1: +- converted 2 messages sounds and intro sound to higher quality to remove unwanted + static +- changed SDL audio playback from 8 to 16bits, improves sound quality in a few cases. - added "planetHighlighting: on/(off)" to draw a circle around the galaxy planet in the color of the team owner, and a 2nd white circle if planet has more than 4 armies. Mostly useful for new planets to easier tell race owner, and army status at a quick glance. From modemhero at users.sourceforge.net Fri Jun 9 17:08:42 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 09 Jun 2006 22:08:42 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.24,1.25 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22420 Modified Files: clientr.suo Log Message: Converted 2 messages sounds and intro sound to higher quality to remove unwanted static. Changed SDL audio playback from 8 to 16bits, improves sound quality in a few cases. Bug fix to planet army count. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 Binary files /tmp/cvsVFEtPK and /tmp/cvsSRawQF differ From modemhero at users.sourceforge.net Fri Jun 9 17:08:42 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 09 Jun 2006 22:08:42 +0000 Subject: [netrek-cvs] client/netrekxp/resources/sounds nt_intro.wav, 1.2, 1.3 nt_message1.wav, 1.1, 1.2 nt_message2.wav, 1.1, 1.2 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/sounds In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22420/resources/sounds Modified Files: nt_intro.wav nt_message1.wav nt_message2.wav Log Message: Converted 2 messages sounds and intro sound to higher quality to remove unwanted static. Changed SDL audio playback from 8 to 16bits, improves sound quality in a few cases. Bug fix to planet army count. Index: nt_message1.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_message1.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvs6iNvxd and /tmp/cvs2aoUj9 differ Index: nt_intro.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_intro.wav,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsuzSkeg and /tmp/cvs1Rp0hc differ Index: nt_message2.wav =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/sounds/nt_message2.wav,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsWJWz8q and /tmp/cvsxGkwxn differ From modemhero at users.sourceforge.net Sun Jun 11 04:36:27 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 11 Jun 2006 09:36:27 +0000 Subject: [netrek-cvs] client/netrekxp/src beeplite.c, 1.10, 1.11 sound.c, 1.16, 1.17 warning.c, 1.9, 1.10 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv11581/src Modified Files: beeplite.c sound.c warning.c Log Message: Added 5 new message sounds (can be used with beeplite, or you can just choose your favorite and save it over your default message sound file, which is nt_message.wav) Added enter ship sound to when you refit Index: beeplite.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/beeplite.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- beeplite.c 3 Jun 2006 07:03:42 -0000 1.10 +++ beeplite.c 11 Jun 2006 09:36:25 -0000 1.11 @@ -228,7 +228,7 @@ if (F_beeplite_flags & LITE_SOUNDS) { if (newSound) - Play_Sound(MESSAGE_WAV); + Play_Sound(MESSAGE3_WAV); else Play_Sound(MESSAGE3_SOUND); } @@ -237,7 +237,7 @@ if (F_beeplite_flags & LITE_SOUNDS) { if (newSound) - Play_Sound(MESSAGE_WAV); + Play_Sound(MESSAGE4_WAV); else Play_Sound(MESSAGE4_SOUND); } @@ -246,7 +246,7 @@ if (F_beeplite_flags & LITE_SOUNDS) { if (newSound) - Play_Sound(MESSAGE_WAV); + Play_Sound(MESSAGE5_WAV); else Play_Sound(MESSAGE5_SOUND); } @@ -255,7 +255,7 @@ if (F_beeplite_flags & LITE_SOUNDS) { if (newSound) - Play_Sound(MESSAGE_WAV); + Play_Sound(MESSAGE6_WAV); else Play_Sound(MESSAGE6_SOUND); } @@ -264,7 +264,7 @@ if (F_beeplite_flags & LITE_SOUNDS) { if (newSound) - Play_Sound(MESSAGE_WAV); + Play_Sound(MESSAGE7_WAV); else Play_Sound(MESSAGE7_SOUND); } Index: warning.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/warning.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- warning.c 9 Jun 2006 02:14:08 -0000 1.9 +++ warning.c 11 Jun 2006 09:36:25 -0000 1.10 @@ -45,7 +45,15 @@ warncount = strlen (text); if (doRefit) + { +#ifdef SOUND + if (newSound) + Play_Sound(ENTER_SHIP_WAV); + else + Play_Sound(ENTER_SHIP_SOUND); +#endif rdelay = time (0) + REFITTIME; + } if (doDeclare) delay = time (0) + DECLARETIME; Index: sound.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/sound.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- sound.c 9 Jun 2006 22:08:40 -0000 1.16 +++ sound.c 11 Jun 2006 09:36:25 -0000 1.17 @@ -113,6 +113,11 @@ newsounds[MESSAGE_WAV] = Mix_LoadWAV(DATAFILE("nt_message.wav")); newsounds[MESSAGE1_WAV] = Mix_LoadWAV(DATAFILE("nt_message1.wav")); newsounds[MESSAGE2_WAV] = Mix_LoadWAV(DATAFILE("nt_message2.wav")); + newsounds[MESSAGE3_WAV] = Mix_LoadWAV(DATAFILE("nt_message3.wav")); + newsounds[MESSAGE4_WAV] = Mix_LoadWAV(DATAFILE("nt_message4.wav")); + newsounds[MESSAGE5_WAV] = Mix_LoadWAV(DATAFILE("nt_message5.wav")); + newsounds[MESSAGE6_WAV] = Mix_LoadWAV(DATAFILE("nt_message6.wav")); + newsounds[MESSAGE7_WAV] = Mix_LoadWAV(DATAFILE("nt_message7.wav")); newsounds[PHASER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser.wav")); newsounds[PHASER_OTHER_WAV] = Mix_LoadWAV(DATAFILE("nt_phaser_other.wav")); newsounds[PLASMA_HIT_WAV] = Mix_LoadWAV(DATAFILE("nt_plasma_hit.wav")); From modemhero at users.sourceforge.net Sun Jun 11 04:36:27 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 11 Jun 2006 09:36:27 +0000 Subject: [netrek-cvs] client/netrekxp/include sound.h,1.8,1.9 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv11581/include Modified Files: sound.h Log Message: Added 5 new message sounds (can be used with beeplite, or you can just choose your favorite and save it over your default message sound file, which is nt_message.wav) Added enter ship sound to when you refit Index: sound.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/sound.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- sound.h 3 Jun 2006 07:03:42 -0000 1.8 +++ sound.h 11 Jun 2006 09:36:25 -0000 1.9 @@ -79,6 +79,11 @@ MESSAGE_WAV, MESSAGE1_WAV, MESSAGE2_WAV, + MESSAGE3_WAV, + MESSAGE4_WAV, + MESSAGE5_WAV, + MESSAGE6_WAV, + MESSAGE7_WAV, PHASER_WAV, PHASER_OTHER_WAV, PLASMA_HIT_WAV, From modemhero at users.sourceforge.net Sun Jun 11 04:36:27 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 11 Jun 2006 09:36:27 +0000 Subject: [netrek-cvs] client/netrekxp/resources/sounds nt_message3.wav, 1.2, 1.3 nt_message4.wav, NONE, 1.1 nt_message5.wav, NONE, 1.1 nt_message6.wav, NONE, 1.1 nt_message7.wav, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/sounds In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv11581/resources/sounds Added Files: nt_message3.wav nt_message4.wav nt_message5.wav nt_message6.wav nt_message7.wav Log Message: Added 5 new message sounds (can be used with beeplite, or you can just choose your favorite and save it over your default message sound file, which is nt_message.wav) Added enter ship sound to when you refit --- NEW FILE: nt_message7.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_message6.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_message5.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_message4.wav --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nt_message3.wav --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Sun Jun 11 04:36:27 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 11 Jun 2006 09:36:27 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.68,1.69 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv11581/resources/docs Modified Files: changes.txt Log Message: Added 5 new message sounds (can be used with beeplite, or you can just choose your favorite and save it over your default message sound file, which is nt_message.wav) Added enter ship sound to when you refit Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- changes.txt 9 Jun 2006 22:08:40 -0000 1.68 +++ changes.txt 11 Jun 2006 09:36:25 -0000 1.69 @@ -1,4 +1,7 @@ Version 1.1: +- added 5 new message sounds (can be used with beeplite, or you can just choose your favorite + and save it over your default message sound file, which is nt_message.wav) +- added enter ship sound to when you refit - converted 2 messages sounds and intro sound to higher quality to remove unwanted static - changed SDL audio playback from 8 to 16bits, improves sound quality in a few cases. From modemhero at users.sourceforge.net Sun Jun 11 04:36:27 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 11 Jun 2006 09:36:27 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.49, 1.50 clientr.suo, 1.25, 1.26 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv11581 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Added 5 new message sounds (can be used with beeplite, or you can just choose your favorite and save it over your default message sound file, which is nt_message.wav) Added enter ship sound to when you refit Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- NetrekXP to do list.C 9 Jun 2006 02:14:08 -0000 1.49 +++ NetrekXP to do list.C 11 Jun 2006 09:36:25 -0000 1.50 @@ -65,8 +65,6 @@ 13) review all scrolling messes up text, if bottom of window is below the visible bottom border of netrek window. Actually will happen to whatever window is mapped down there at bottom of screen -14) fix the 2 message sounds that don't convert right to 22 KHz -15) sounds for beamup/down and refit Stas's list: - color coded playerlist. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 Binary files /tmp/cvserUoUx and /tmp/cvsjhKYdU differ From modemhero at users.sourceforge.net Sun Jun 11 15:53:54 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 11 Jun 2006 20:53:54 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.34, 1.35 death.c, 1.10, 1.11 map.c, 1.18, 1.19 mswindow.c, 1.33, 1.34 newwin.c, 1.36, 1.37 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3675/src Modified Files: data.c death.c map.c mswindow.c newwin.c Log Message: Added a 2nd geno pic, randomly chooses which one to show on a geno. Also added the geno pics for the rarer true genocide case (most of the time game ends by conquer not genocide) Attempt to fix problem with ships at warp 0 being overdrawn by planet redraws. Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- mswindow.c 6 Jun 2006 19:50:39 -0000 1.33 +++ mswindow.c 11 Jun 2006 20:53:52 -0000 1.34 @@ -608,6 +608,7 @@ free (cloakicon); free (stipple); free (genopic); + free (genopic2); //Remove default objects while (defaults) Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- newwin.c 6 Jun 2006 05:14:14 -0000 1.36 +++ newwin.c 11 Jun 2006 20:53:52 -0000 1.37 @@ -1327,7 +1327,10 @@ genopic = W_StoreBitmap3 ("bitmaps/misclib/color/genocide.bmp", WINSIDE, WINSIDE, BMP_GENO, w, LR_DEFAULTCOLOR); - + + genopic2 = + W_StoreBitmap3 ("bitmaps/misclib/color/genocide2.bmp", WINSIDE, + WINSIDE, BMP_GENO2, w, LR_DEFAULTCOLOR); } Index: death.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/death.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- death.c 2 Jun 2006 21:06:55 -0000 1.10 +++ death.c 11 Jun 2006 20:53:52 -0000 1.11 @@ -38,7 +38,7 @@ death (void) { W_Event event; - + int i; ingame = 0; #ifdef AUTOKEY if (autoKey) @@ -140,7 +140,18 @@ shipnos[players[me->p_whodead].p_no], teamstring[players[me->p_whodead].p_team]); deathFont = W_BoldFont; - W_TileWindow (mapw, genopic); + srand ((unsigned) time (NULL)); + i = RANDOM() % 2; + switch (i) + { + case 0: + W_TileWindow (mapw, genopic); + break; + case 1: + default: + W_TileWindow (mapw, genopic2); + break; + } break; case KGHOST: strcpy (deathmessage, "You were killed by a confused daemon."); @@ -153,6 +164,18 @@ shipnos[me->p_whodead], teamstring[players[me->p_whodead].p_team]); deathFont = W_BoldFont; + srand ((unsigned) time (NULL)); + i = RANDOM() % 2; + switch (i) + { + case 0: + W_TileWindow (mapw, genopic); + break; + case 1: + default: + W_TileWindow (mapw, genopic2); + break; + } break; case KPROVIDENCE: strcpy (deathmessage, "You were nuked by GOD."); Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- data.c 6 Jun 2006 19:50:39 -0000 1.34 +++ data.c 11 Jun 2006 20:53:52 -0000 1.35 @@ -246,7 +246,7 @@ extern double Sin[], Cos[]; -W_Icon stipple, clockpic, clockhandpic, clockhandmask, genopic, icon; +W_Icon stipple, clockpic, clockhandpic, clockhandmask, genopic, genopic2, icon; W_Color borderColor, backColor, textColor, myColor, warningColor, shipCol[5], rColor, yColor, gColor, unColor, foreColor; Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- map.c 6 Jun 2006 19:50:39 -0000 1.18 +++ map.c 11 Jun 2006 20:53:52 -0000 1.19 @@ -809,7 +809,7 @@ *update = 0; } - else if (*update == 10) + else if (*update == 1) { /* * Redraw stationary ships every update so that these From modemhero at users.sourceforge.net Sun Jun 11 15:53:54 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 11 Jun 2006 20:53:54 +0000 Subject: [netrek-cvs] client/netrekxp/include bitmaps.h, 1.11, 1.12 data.h, 1.30, 1.31 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3675/include Modified Files: bitmaps.h data.h Log Message: Added a 2nd geno pic, randomly chooses which one to show on a geno. Also added the geno pics for the rarer true genocide case (most of the time game ends by conquer not genocide) Attempt to fix problem with ships at warp 0 being overdrawn by planet redraws. Index: bitmaps.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- bitmaps.h 2 Jun 2006 21:06:54 -0000 1.11 +++ bitmaps.h 11 Jun 2006 20:53:52 -0000 1.12 @@ -83,6 +83,7 @@ #define BMP_VSHIELD 17 #define BMP_STIPPLE 22 #define BMP_GENO 23 +#define BMP_GENO2 24 #define BMP_SHIPEXPL_FRAMES 5 #define BMP_SBEXPL_FRAMES 7 Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- data.h 6 Jun 2006 19:50:38 -0000 1.30 +++ data.h 11 Jun 2006 20:53:52 -0000 1.31 @@ -244,7 +244,7 @@ extern double Sin[], Cos[]; -extern W_Icon stipple, clockpic, clockhandpic, clockhandmask, genopic; +extern W_Icon stipple, clockpic, clockhandpic, clockhandmask, genopic, genopic2; extern W_Icon base_expview; extern W_Icon expview[BMP_SHIPEXPL_FRAMES]; From modemhero at users.sourceforge.net Sun Jun 11 15:53:54 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 11 Jun 2006 20:53:54 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.50, 1.51 clientr.suo, 1.26, 1.27 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3675 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Added a 2nd geno pic, randomly chooses which one to show on a geno. Also added the geno pics for the rarer true genocide case (most of the time game ends by conquer not genocide) Attempt to fix problem with ships at warp 0 being overdrawn by planet redraws. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- NetrekXP to do list.C 11 Jun 2006 09:36:25 -0000 1.50 +++ NetrekXP to do list.C 11 Jun 2006 20:53:52 -0000 1.51 @@ -53,12 +53,11 @@ 5) A lot of annoying pop up windows (like macro window, default controls) should be closeable by shift right click. 6) Workable windows installer would be nice -7) Use nebula pic 8) Is there a cpu leak with double buffering? 9) Use masking for things like player team/letter display on galactic. Ship draw on tactical (have it overwrite the planet/wrench/gas/army for example, not just combine colors). 10) Get square planet bitmaps so I can turn them into mapped rotating globes. -11) ships at warp 0 near newplanets blink in and out of galactic +11) ships at warp 0 near newplanets blink in and out of galactic - may be fixed 12) problem with message windows, text getting garbled near top, goes away with flushing with scroll button. Doesn't show up initially, but do something like use scroll button, alt-enter, change to review all..and it shows up. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 Binary files /tmp/cvs2Etyb8 and /tmp/cvsZJqFDF differ From modemhero at users.sourceforge.net Sun Jun 11 15:53:54 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 11 Jun 2006 20:53:54 +0000 Subject: [netrek-cvs] client/netrekxp/resources/misclib/color genocide2.bmp, NONE, 1.1 nebula.jpg, 1.1, NONE Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/misclib/color In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3675/resources/misclib/color Added Files: genocide2.bmp Removed Files: nebula.jpg Log Message: Added a 2nd geno pic, randomly chooses which one to show on a geno. Also added the geno pics for the rarer true genocide case (most of the time game ends by conquer not genocide) Attempt to fix problem with ships at warp 0 being overdrawn by planet redraws. --- NEW FILE: genocide2.bmp --- (This appears to be a binary file; contents omitted.) --- nebula.jpg DELETED --- From modemhero at users.sourceforge.net Sun Jun 11 15:53:54 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 11 Jun 2006 20:53:54 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.69,1.70 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3675/resources/docs Modified Files: changes.txt Log Message: Added a 2nd geno pic, randomly chooses which one to show on a geno. Also added the geno pics for the rarer true genocide case (most of the time game ends by conquer not genocide) Attempt to fix problem with ships at warp 0 being overdrawn by planet redraws. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- changes.txt 11 Jun 2006 09:36:25 -0000 1.69 +++ changes.txt 11 Jun 2006 20:53:52 -0000 1.70 @@ -1,4 +1,6 @@ Version 1.1: +- added a 2nd geno pic, randomly chooses which one to show on a geno. Also added the geno + pics for the rarer true genocide case (most of the time game ends by conquer not genocide). - added 5 new message sounds (can be used with beeplite, or you can just choose your favorite and save it over your default message sound file, which is nt_message.wav) - added enter ship sound to when you refit From modemhero at users.sourceforge.net Mon Jun 12 04:12:21 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 09:12:21 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/obj/Debug - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/obj/Debug In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13223/Debug Log Message: Directory /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/obj/Debug added to the repository From modemhero at users.sourceforge.net Mon Jun 12 04:11:54 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 09:11:54 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/configs - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/configs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12787/configs Log Message: Directory /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/configs added to the repository From modemhero at users.sourceforge.net Mon Jun 12 04:11:55 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 09:11:55 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12787/Netrek_Configurator.NET Log Message: Directory /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET added to the repository From modemhero at users.sourceforge.net Mon Jun 12 04:12:07 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 09:12:07 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/_UpgradeReport_Files - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/_UpgradeReport_Files In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13046/_UpgradeReport_Files Log Message: Directory /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/_UpgradeReport_Files added to the repository From modemhero at users.sourceforge.net Mon Jun 12 04:12:07 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 09:12:07 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/obj - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/obj In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13046/obj Log Message: Directory /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/obj added to the repository From modemhero at users.sourceforge.net Mon Jun 12 04:12:07 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 09:12:07 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/My Project - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/My Project In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13046/My Project Log Message: Directory /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/My Project added to the repository From modemhero at users.sourceforge.net Mon Jun 12 04:11:48 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 09:11:48 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv12764/VBasic config utility Log Message: Directory /cvsroot/netrek/client/netrekxp/tools/VBasic config utility added to the repository From modemhero at users.sourceforge.net Mon Jun 12 04:12:07 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 09:12:07 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/bin - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/bin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13046/bin Log Message: Directory /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/bin added to the repository From modemhero at users.sourceforge.net Mon Jun 12 04:12:26 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 09:12:26 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/obj/Debug/TempPE - New directory Message-ID: Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/obj/Debug/TempPE In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13240/TempPE Log Message: Directory /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/obj/Debug/TempPE added to the repository From modemhero at users.sourceforge.net Mon Jun 12 04:14:12 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 09:14:12 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/_UpgradeReport_Files UpgradeReport.css, NONE, 1.1 UpgradeReport_Minus.gif, NONE, 1.1 UpgradeReport_Plus.gif, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/_UpgradeReport_Files In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13747/tools/VBasic config utility/Netrek_Configurator.NET/_UpgradeReport_Files Added Files: UpgradeReport.css UpgradeReport_Minus.gif UpgradeReport_Plus.gif Log Message: Adding Joe Evango's Visual Basic configuration utiity to client source code. Not used in Netrek XP 2006, but left here in case anyone wants to use it or improve on it. --- NEW FILE: UpgradeReport.css --- (This appears to be a binary file; contents omitted.) --- NEW FILE: UpgradeReport_Minus.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: UpgradeReport_Plus.gif --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Mon Jun 12 04:14:11 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 09:14:11 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility Form1.frm, NONE, 1.1 Form1.frx, NONE, 1.1 Form2.frm, NONE, 1.1 Form2.frx, NONE, 1.1 Form3.frm, NONE, 1.1 Form3.frx, NONE, 1.1 MSSCCPRJ.SCC, NONE, 1.1 README.txt, NONE, 1.1 controls.txt, NONE, 1.1 netrekconfig.VBP, NONE, 1.1 netrekconfig.vbw, NONE, 1.1 netrekrc, NONE, 1.1 netrekrc.sav, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13747/tools/VBasic config utility Added Files: Form1.frm Form1.frx Form2.frm Form2.frx Form3.frm Form3.frx MSSCCPRJ.SCC README.txt controls.txt netrekconfig.VBP netrekconfig.vbw netrekrc netrekrc.sav Log Message: Adding Joe Evango's Visual Basic configuration utiity to client source code. Not used in Netrek XP 2006, but left here in case anyone wants to use it or improve on it. --- NEW FILE: Form2.frm --- VERSION 5.00 Begin VB.Form Form2 BackColor = &H80000008& Caption = "Netrek Configuration Utility (Page 2 of 3)" ClientHeight = 9855 ClientLeft = 2355 ClientTop = 480 ClientWidth = 10905 Icon = "Form2.frx":0000 LinkTopic = "Form2" ScaleHeight = 9855 ScaleWidth = 10905 Begin VB.CheckBox Check4 BackColor = &H80000007& Caption = "Show Warpstreaks" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 375 Left = 3600 TabIndex = 14 Top = 8400 Value = 1 'Checked Width = 2175 End Begin VB.CheckBox Check3 BackColor = &H80000007& Caption = "Show Stars" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 375 Left = 720 TabIndex = 13 Top = 7800 Value = 1 'Checked Width = 1695 End Begin VB.CommandButton Command2 Caption = "Cancel" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty Height = 375 Left = 5280 TabIndex = 12 Top = 9240 Width = 1095 End Begin VB.CheckBox Check2 BackColor = &H80000012& Caption = "Enable Tip Window" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 255 Left = 3600 TabIndex = 10 Top = 7920 Value = 1 'Checked Width = 2175 End Begin VB.CheckBox Check1 BackColor = &H80000007& Caption = "Enable Sound" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 375 Left = 720 TabIndex = 9 Top = 8400 Value = 1 'Checked Width = 1695 End Begin VB.CommandButton Command1 Caption = "Next" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty Height = 375 Left = 3960 TabIndex = 8 Top = 9240 Width = 1095 End Begin VB.OptionButton Option4 BackColor = &H80000012& Caption = "BRMH Style" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 375 Left = 360 TabIndex = 6 Top = 5160 Width = 2175 End Begin VB.OptionButton Option3 BackColor = &H80000012& Caption = "Kill Watch Style (Default)" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 375 Left = 360 TabIndex = 5 Top = 4800 Value = -1 'True Width = 2535 End Begin VB.OptionButton Option2 BackColor = &H80000012& Caption = "COW Style" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 375 Left = 360 TabIndex = 4 Top = 4440 Width = 2295 End Begin VB.OptionButton Option1 BackColor = &H80000012& Caption = "Old Style" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 375 Left = 360 TabIndex = 3 Top = 4080 Width = 2295 End Begin VB.Label Label5 BackColor = &H80000008& Caption = "Misc. Options" BeginProperty Font Name = "MS Sans Serif" Size = 12 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H00FF0000& Height = 375 Left = 360 TabIndex = 11 Top = 7200 Width = 1935 End Begin VB.Label Label3 BackColor = &H80000012& Caption = $"Form2.frx":08CA BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 615 Left = 240 TabIndex = 7 Top = 3360 Width = 7095 End Begin VB.Label Label4 Alignment = 2 'Center BackColor = &H80000012& Caption = $"Form2.frx":09C7 BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H008080FF& Height = 615 Left = 0 TabIndex = 2 Top = 2160 Width = 10935 End Begin VB.Label Label2 Alignment = 2 'Center BackColor = &H00000000& Caption = $"Form2.frx":0B16 BeginProperty Font Name = "MS Sans Serif" Size = 9.75 Charset = 0 Weight = 400 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H00FFFFFF& Height = 1095 Left = 120 TabIndex = 1 Top = 1320 Width = 10695 End Begin VB.Image Image1 Height = 1050 Left = 4200 Picture = "Form2.frx":0C7A Top = 240 Width = 1980 End Begin VB.Image pl4 Height = 3375 Left = 3120 Picture = "Form2.frx":7904 Top = 4080 Visible = 0 'False Width = 7605 End Begin VB.Image pl3 Height = 3345 Left = 3120 Picture = "Form2.frx":5B4BA Top = 4080 Width = 7620 End Begin VB.Image pl2 Height = 3360 Left = 3120 Picture = "Form2.frx":AE488 Top = 4080 Visible = 0 'False Width = 7605 End Begin VB.Image pl1 Height = 3390 Left = 3120 Picture = "Form2.frx":101A4A Top = 4080 Visible = 0 'False Width = 7590 End Begin VB.Label Label1 BackColor = &H80000008& Caption = "PlayerList:" BeginProperty Font Name = "MS Sans Serif" Size = 12 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H00FF0000& Height = 375 Left = 240 TabIndex = 0 Top = 3000 Width = 1455 End End Attribute VB_Name = "Form2" Attribute VB_GlobalNameSpace = False Attribute VB_Creatable = False Attribute VB_PredeclaredId = True Attribute VB_Exposed = False ' Netrek Configurator v1.0 - written by Joe Evango ' ' Program notes from Joe 4/30/06- ' Code contains some comments, pretty easy to follow the logic. ' I am currently using a config directory that contains two netrekrc files, netrek.one and netrek.sep. ' This is done for the two messaging window configs. This should be easy enough to implement into the code ' in order to eliminate the extra sub directory and files if someone has time. ' ' This utility writes to the netrekrc file and assumes it is in located the same folder as the utility so if the ' netrekrc file does not exist the utility will not run properly and error out. When it is run it will also save ' your old netrekrc file as netrek.sav. ' ' Since Netrek code has always been freely shared in the community I will do the same with this config utility. ' Please feel free to help improve the utility and/or include the utility as an add-on if you are working on ' a Windows client. Also feel free to use the logic in this code to create a config utility for another OS. It ' took a while to put the keymap portion of this together but it works well. I only ask that if any modifications ' are made you also make your code changes available to the community. It would also be nice if I was mentioned as ' a contributor in your code comments. ' Variables below for game options are self explanitory Option Explicit Dim playlist As Integer Dim sound As Integer Dim tips As Integer Dim stars As Integer Dim warp As Integer Private Sub Command1_Click() Dim fnum2 As Integer Dim pltxt As String Dim tiptxt As String Dim soundtxt As String Dim startxt As String Dim warptxt As String Dim metatxt As String fnum2 = FreeFile ' Open the file for append. Open ".\netrekrc" For Append As fnum2 ' Add the command. If (Check1.Value = vbChecked) Then sound = 1 End If If (Check1.Value = vbUnchecked) Then sound = 0 End If If (Check2.Value = vbChecked) Then tips = 1 End If If (Check2.Value = vbUnchecked) Then tips = 0 End If If (Check3.Value = vbChecked) Then stars = 1 End If If (Check3.Value = vbUnchecked) Then stars = 0 End If If (Check4.Value = vbChecked) Then warp = 1 End If If (Check4.Value = vbUnchecked) Then warp = 0 End If If playlist = 1 Then pltxt = "playerListStyle: 1" End If If playlist = 2 Then pltxt = "playerListStyle: 2" End If If playlist = 3 Then pltxt = "playerListStyle: 3" End If If playlist = 4 Then pltxt = "playerListStyle: 4" End If If tips = 1 Then tiptxt = "showHints: on" End If If tips = 0 Then tiptxt = "showHints: off" End If If sound = 1 Then soundtxt = "sound: on" End If If sound = 0 Then soundtxt = "sound: off" End If If stars = 0 Then startxt = "showStars: off" End If If stars = 1 Then startxt = "showStars: on" End If If warp = 1 Then warptxt = "warpStreaks: on" End If If warp = 0 Then warptxt = "warpStreaks: off" End If Print #fnum2, pltxt Print #fnum2, Chr(13) Print #fnum2, tiptxt Print #fnum2, Chr(13) Print #fnum2, soundtxt Print #fnum2, Chr(13) Print #fnum2, startxt Print #fnum2, Chr(13) Print #fnum2, warptxt ' Close the file. Close fnum2 'MsgBox "Your configuration has been saved. Your old configuration file has been saved as netrekrc.sav in your Netrek install directory" Form3.Show Unload Form2 End Sub Private Sub Command2_Click() Unload Form2 End Sub Private Sub Form_Load() playlist = 3 End Sub Private Sub Option1_Click() playlist = 1 pl1.Visible = True pl2.Visible = False pl3.Visible = False pl4.Visible = False End Sub Private Sub Option2_Click() playlist = 2 pl1.Visible = False pl2.Visible = True pl3.Visible = False pl4.Visible = False End Sub Private Sub Option3_Click() playlist = 3 pl1.Visible = False pl2.Visible = False pl3.Visible = True pl4.Visible = False End Sub Private Sub Option4_Click() playlist = 4 pl1.Visible = False pl2.Visible = False pl3.Visible = False pl4.Visible = True End Sub Private Sub Text1_Change(Index As Integer) End Sub --- NEW FILE: Form3.frm --- VERSION 5.00 Begin VB.Form Form3 BackColor = &H80000007& Caption = "Netrek Configuration Utility (Page 3 of 3)" ClientHeight = 9900 ClientLeft = 2475 ClientTop = 465 ClientWidth = 10875 Icon = "Form3.frx":0000 LinkTopic = "Form3" ScaleHeight = 9900 ScaleWidth = 10875 Begin VB.TextBox Text1 Height = 285 Index = 22 Left = 6360 MaxLength = 1 TabIndex = 55 Text = "4" [...1253 lines suppressed...] Print #fnum3, "Max Warp - " + Text1(9) Print #fnum3, "Half Speed - " + Text1(10) Print #fnum3, "Quit - " + Text1(15) Print #fnum3, "Plasma - " + Text1(18) Print #fnum3, Chr(13) Print #fnum3, "Warp 0 - " + Text1(19) Print #fnum3, "Warp 2 - " + Text1(20) Print #fnum3, "Warp 3 - " + Text1(21) Print #fnum3, "Warp 4 - " + Text1(22) Close #fnum3 Unload Form3 MsgBox "YOUR CONFIGURATION HAS BEEN CREATED! After you click on OK a document with the controls you have chosen will open. A shortcut to this document has been created in your Netrek Config Utility program group. If you need additional assistance please visit www.netrek.org." Shell Application & " " & FileName, vbNormalFocus Else End If End Sub --- NEW FILE: Form1.frx --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MSSCCPRJ.SCC --- [SCC] SCC=This is a source code control file [netrekconfig.VBP] SCC_Project_Name=this project is not under source code control SCC_Aux_Path= --- NEW FILE: controls.txt --- These are the controls you have chosen: Mouse Controls: Left Button - Torpedoes Middle Button - Unmap Special Windows (i.e. Close tip window) Right Button - Steer Keyboard Controls: Messaging - m (Be sure to hold your mouse cursor over the Galaxy or Tactical maps when you press 'm'. After pressing 'm' type 'A' to send messages to the All Window, type 'T' to send messages to the Team Window, or type the letter/number of the player you would like to send a message to. After you type A, T, or the player letter/number, type your message and press enter.) Help - h Torpedoes - t Phasers - f Shield - s Bomb - b Cloak - c Drop Armies - x Pickup Armies - z Detonate Own Torps - D Detonate Enemy Torps - d Tractor - T Pressor - y Repair - R Refit Ship Type - r Lock on Target - l Target Info - i Max Warp - @ Half Speed - # Quit - \ Plasma - g Warp 0 - 0 Warp 2 - 2 Warp 3 - 3 Warp 4 - 4 --- NEW FILE: Form1.frm --- VERSION 5.00 Begin VB.Form Form1 BackColor = &H00000000& Caption = "Netrek Configuration Utility (Page 1 of 3)" ClientHeight = 10080 ClientLeft = 2355 ClientTop = 480 ClientWidth = 10830 Icon = "Form1.frx":0000 LinkTopic = "Form1" PaletteMode = 1 'UseZOrder ScaleHeight = 10080 ScaleWidth = 10830 Begin VB.CommandButton Command1 Caption = "Cancel" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty Height = 375 Left = 5280 TabIndex = 13 Top = 9480 Width = 1095 End Begin VB.CommandButton cmdAdd Caption = "Next" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty Height = 375 Left = 3960 TabIndex = 12 Top = 9480 Width = 1095 End Begin VB.Frame Frame1 BackColor = &H80000012& BorderStyle = 0 'None Caption = "Frame1" Height = 2415 Left = 120 TabIndex = 4 Top = 6960 Width = 10815 Begin VB.OptionButton dash0 BackColor = &H80000012& Caption = "Text Dashboard" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 255 Left = 120 TabIndex = 8 Top = 1440 Width = 1815 End Begin VB.OptionButton dash2 BackColor = &H80000012& Caption = "KRP Dashboard" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 255 Left = 120 TabIndex = 7 Top = 2160 Width = 1815 End Begin VB.OptionButton dash1 BackColor = &H80000012& Caption = "COW Dashboard" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 255 Left = 120 TabIndex = 6 Top = 1800 Width = 1935 End Begin VB.OptionButton dash3 BackColor = &H80000012& Caption = "Labs Dashboard (Default)" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 255 Left = 120 TabIndex = 5 Top = 1080 Value = -1 'True Width = 2535 End Begin VB.Image pic3 Height = 735 Left = 2760 Picture = "Form1.frx":08CA Top = 1560 Width = 7710 End Begin VB.Image pic2 Height = 690 Left = 2760 Picture = "Form1.frx":13094 Top = 1560 Visible = 0 'False Width = 7665 End Begin VB.Image pic1 Height = 675 Left = 2760 Picture = "Form1.frx":244D6 Top = 1560 Visible = 0 'False Width = 7650 End Begin VB.Image pic0 Height = 720 Left = 2760 Picture = "Form1.frx":35264 Top = 1560 Visible = 0 'False Width = 7650 End Begin VB.Label Label3 BackColor = &H80000012& Caption = $"Form1.frx":471E6 BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 495 Index = 1 Left = 120 TabIndex = 10 Top = 480 Width = 6615 End Begin VB.Label Label1 BackColor = &H00000000& Caption = "Dashboard:" BeginProperty Font Name = "MS Sans Serif" Size = 12 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H00FF0000& Height = 375 Index = 1 Left = 240 TabIndex = 9 Top = 120 Width = 1455 End End Begin VB.OptionButton Option1 BackColor = &H00000000& Caption = "Separate Message Windows (Default)" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 375 Left = 240 TabIndex = 1 Top = 4320 Value = -1 'True Width = 3615 End Begin VB.OptionButton Option2 BackColor = &H00000000& Caption = "One Message Window" BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 255 Left = 240 TabIndex = 0 Top = 4680 Width = 2655 End Begin VB.Label Label5 Alignment = 2 'Center BackColor = &H00000000& Caption = $"Form1.frx":47278 BeginProperty Font Name = "MS Sans Serif" Size = 9.75 Charset = 0 Weight = 400 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H00FFFFFF& Height = 855 Left = 0 TabIndex = 14 Top = 1320 Width = 10695 End Begin VB.Label Label4 Alignment = 2 'Center BackColor = &H80000012& Caption = $"Form1.frx":473DC BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H008080FF& Height = 615 Left = 0 TabIndex = 11 Top = 2280 Width = 10695 End Begin VB.Label Label3 BackColor = &H00000000& Caption = $"Form1.frx":4752C BeginProperty Font Name = "MS Sans Serif" Size = 8.25 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H8000000E& Height = 735 Index = 0 Left = 120 TabIndex = 3 Top = 3600 Width = 6135 End Begin VB.Label Label1 BackColor = &H00000000& Caption = "Message Windows:" BeginProperty Font Name = "MS Sans Serif" Size = 12 Charset = 0 Weight = 700 Underline = 0 'False Italic = 0 'False Strikethrough = 0 'False EndProperty ForeColor = &H00FF0000& Height = 375 Index = 0 Left = 240 TabIndex = 2 Top = 3240 Width = 2415 End Begin VB.Image separate Height = 2355 Left = 4440 Picture = "Form1.frx":475F8 Top = 4320 Width = 5415 End Begin VB.Image one Height = 2325 Left = 4440 Picture = "Form1.frx":70F06 Top = 4320 Visible = 0 'False Width = 5355 End Begin VB.Image Image1 Height = 1050 Left = 4200 Picture = "Form1.frx":99858 Top = 240 Width = 1980 End End Attribute VB_Name = "Form1" Attribute VB_GlobalNameSpace = False Attribute VB_Creatable = False Attribute VB_PredeclaredId = True Attribute VB_Exposed = False ' Netrek Configurator v1.0 - written by Joe Evango ' ' Program notes from Joe 4/30/06- ' Code contains some comments, pretty easy to follow the logic. ' I am currently using a config directory that contains two netrekrc files, netrek.one and netrek.sep. ' This is done for the two messaging window configs. This should be easy enough to implement into the code ' in order to eliminate the extra sub directory and files if someone has time. ' ' This utility writes to the netrekrc file and assumes it is in located the same folder as the utility so if the ' netrekrc file does not exist the utility will not run properly and error out. When it is run it will also save ' your old netrekrc file as netrek.sav. ' ' Since Netrek code has always been freely shared in the community I will do the same with this config utility. ' Please feel free to help improve the utility and/or include the utility as an add-on if you are working on ' a Windows client. Also feel free to use the logic in this code to create a config utility for another OS. It ' took a while to put the keymap portion of this together but it works well. I only ask that if any modifications ' are made you also make your code changes available to the community. It would also be nice if I was mentioned as ' a contributor in your code comments. Option Explicit Dim screen As Integer Dim dash As Integer Private Sub cmdAdd_Click() Dim fnum As Integer Dim txt As String Dim configtag As String Dim currentdate As String currentdate = Date fnum = FreeFile ' Three section message window, saves your old netrekrc If screen = 0 Then FileCopy ".\netrekrc", ".\netrekrc.sav" FileCopy ".\configs\netrekrc.sep", ".\netrekrc" Else ' One section message window, saves your old netrekrc FileCopy ".\netrekrc", ".\netrekrc.sav" FileCopy ".\configs\netrekrc.one", ".\netrekrc" End If ' Open the file for append. Open ".\netrekrc" For Append As fnum ' Add the command. If dash = 0 Then txt = "newdashboard: 0" End If If dash = 1 Then txt = "newdashboard: 1" End If If dash = 2 Then txt = "newdashboard: 2" End If If dash = 3 Then txt = "newdashboard: 3" End If configtag = "###Configuration changes added by the Netrek Configurator on " + currentdate Print #fnum, Chr(13) Print #fnum, configtag Print #fnum, Chr(13) Print #fnum, txt ' Close the file. Close fnum ' MsgBox "Your configuration has been saved" Form2.Show Unload Form1 End Sub Private Sub Command1_Click() Unload Form1 End Sub ' Pick a dashboard Private Sub dash0_Click() dash = 0 pic0.Visible = True pic1.Visible = False pic2.Visible = False pic3.Visible = False End Sub Private Sub dash1_Click() dash = 1 pic0.Visible = False pic1.Visible = True pic2.Visible = False pic3.Visible = False End Sub Private Sub dash2_Click() dash = 2 pic0.Visible = False pic1.Visible = False pic2.Visible = True pic3.Visible = False End Sub Private Sub dash3_Click() dash = 3 pic0.Visible = False pic1.Visible = False pic2.Visible = False pic3.Visible = True End Sub Private Sub Form_Load() dash = 3 End Sub Private Sub Option1_Click() screen = 0 one.Visible = False separate.Visible = True End Sub Private Sub Option2_Click() screen = 1 separate.Visible = False one.Visible = True End Sub --- NEW FILE: netrekrc.sav --- ########################## Login Options ################################### name:guest login:new-be-nice ########################### Network Options ################################## dontPing: on useRSA: on askForUpdate: on tryUDP: on tryShort: on updatesPerSec: 10 udpClientReceive: 1 udpClientSend: 1 udpDebug: 0 udpSequenceChk: off netStatFreq: 3 netstats: off newMesgFlags: on agriCAPS: on ############################## Key Maps ###################################### buttonmap: keymap:\Qa at q0Q0gffp ########################### Sound stuff ###################################### sound: on sounddir: .\Sounds ############################ Mouse Options ################################### continuousMouse: on motionThresh: 0 tpdotdist: 10 shiftedMouse: off ########################### Options ########################################## forceDisplay: 0 forceMono: 0 cloakChars: ?? clock: 1 colorfulPhasers: on continueTractor: on defaultShip: CA dashboard: on enemyPhasers: 1 phasorShrink: 16 theirPhasorShrink: 16 shrinkPhasorOnMiss: on extraAlertBorder: on galacticFrequent: on keepInfo: 15 keepPeace: on logMessage: off macroKey: TAB messageHUD: 2 metaStatusLevel: 4 PhaserMsg: 5 phaserMsgI: on phaserShrink: 6 phaserStats: on phaserWindow: on reportKills: on shortKillMesg: on showFuelOnLocal: off showGalactic: 1 showLocal: 1 showLock: 3 showMapPlanetNames: on showMySpeed: off showPlanetNames: on showPlayerStatus: on showShields: on showStats: off showTractorPressor: on sortPlayers: on ########################### WINDOW PLACEMENT ################################## ############################################################################### # Fonts # #Valid values are 8,9,10, and 13 fontsize: 10 ############################################################################### # Window placement # # Since changing fonts causes changes to the window sizes # this section has gone through many revisions as well # # The next iteration of all this using the new dashboard.... # I don't usually want to see the MOTD until I'm in # To encourage motd reading I'll activate this - jn WaitMotd.mapped: on ## The main window -- only map it when there's no wait queue netrek.geometry: 1150x875+0 # the maximal window for my sparc 2 #This is a Win32-only option. Hitting ALT-ENTER during #the game will toggle the caption bar also. netrek.w32caption: on war.geometry: +700 help.parent: netrek help.geometry: 500x25+0+525 planet.parent: netrek planet.geometry: +20 ## Ok, on the left side we have a column of six windows; message, ## warning, new dash (ie tstats), my messages, team messages, all ## messages. I have the total messages maped to cover this whole area ## so by using ? you can toggle between seeing the broken up messages ## or the total window. The stats window has been removed in favor of ## the new dashboard. message.parent: netrek message.geometry: 502x19+508+504 message.mapped: on warn.parent: netrek warn.geometry: 502x18+508+523 warn.mapped: on tstat.parent: netrek tstat.geometry: 510x45+0+504 tstat.mapped: on review_your.parent: netrek review_your.geometry: 82x4+0+547 review_your.mapped: on review_team.parent: netrek review_team.geometry: 82x7+0+595 review_team.mapped: on review_all.parent: netrek review_all.geometry: 82x3+0+673 review_all.mapped: on ## With this setup, you can use "?" to cycle between the big review window, the ## four small message windows, and no windows at all. # review.parent: netrek review.geometry: 82x20+0+547 review.mapped: off ## phaser window ## dunno if the following line is really needed or not.... phaserWindow: on ## 0 = don't show 1 = all 2 = team 3 = indiv ## 4 = kill 5 = total PhaserMsg: 1 #(show hit percentage on phaser messages) PhaserStats: on player.parent: netrek player.geometry: +508+542 player.mapped: on reportkills: on review_kill.parent: netrek review.geometry: 80x40+510+170 review_kill.geometry: 82x4+0+712 review_kill.mapped: on ## a couple of other window mappings # # Some UDP stuff udp.geometry: +0+0 udp.mapped: off # I'm planning on using the new dash instead showstats: off stats.parent: netrek stats.geommac.s.%i:%y loss, %v ping, %V stddev stats geometry: 160x108+332+550 # puts the stats window further down stats.geometry: 160x94+842+500 #MACROS dist.taking: (%c) %i Carrying %a to %l @ %n with %f fuel, %d damage dist.help: (%c) %i NEEDS HELP NOW! I have %a armies, %d damage, %s shields! dist.space_control: HELP CONTROL AT %l! GET THERE NOW! lite.taking: /c/l /0 /| %c carrying to %l | lite.space_control: /l /| %l in danger | lite.pickup: /h /| %p++ @ %l | lite.help: %?%S=SB%{/c%}%?%a>0%{/c%} /| %c needs help | /0 lite.crippled:/h | %h is cripple | mac.H.A:% /~\ |_| ~|~ |_| (~ |_| | | |\/| /~\ |\| | ~|~ \./ | mac.H.A:% \_/ | | , | | | (_ | | |_| | | |~| | | | | | . mac.O.T:% /`\ /~_ /~_ ~|~ |_| <~ |~> .^. <~ <~ | mac.O.T:% \./ \_/ \_/ | | | <_ |_> |~| _> <_ . mac.D.T:% | | <~ | |~) \./ /~\ | | |~) |~> /\ (~ <~ \~/ \~/ mac.D.T:% |~| <_ |_ |~ | \_/ |_| |~\ |_> /~~\ _) <_ o o mac.g.A:% ---- __| __| \ | _ \ __|_ _| _ \ __| mac.g.A:% ---- (_ | _| . | ( | ( | | | _| mac.g.A:% ----\___|___|_|\_|\___/ \___|___|___/ ___| mac.m.A:% ,__, Moo! mac.m.A:% (..)/___ mac.m.A:% (__) )\ mac.m.A:% ||--|| * mac.L.A:_____\\ ~ ~ //__"What just happened?"_ mac.L.A:_____(/ @ @ /)________________________ mac.L.A:___oOOo-(_)-oOOo <-(%p)%U ###Configuration changes added by the Netrek Configurator on 5/28/2006 newdashboard: 2 playerListStyle: 1 showHints: on sound: on showStars: on warpStreaks: on --- NEW FILE: netrekconfig.vbw --- Form1 = 140, 63, 667, 527, , 36, 38, 565, 502, C Form2 = 86, 199, 719, 1111, C, 34, 25, 561, 481, C Form3 = 341, 75, 948, 962, C, -18, -8, 695, 495, C --- NEW FILE: Form3.frx --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Form2.frx --- (This appears to be a binary file; contents omitted.) --- NEW FILE: netrekrc --- ########################## Login Options ################################### name:guest login:new-be-nice ########################### Network Options ################################## dontPing: on useRSA: on askForUpdate: on tryUDP: on tryShort: on updatesPerSec: 10 udpClientReceive: 1 udpClientSend: 1 udpDebug: 0 udpSequenceChk: off netStatFreq: 3 netstats: off newMesgFlags: on agriCAPS: on ############################## Key Maps ###################################### buttonmap: keymap:\Qa at q0Q0gffp ########################### Sound stuff ###################################### sound: on sounddir: .\Sounds ############################ Mouse Options ################################### continuousMouse: on motionThresh: 0 tpdotdist: 10 shiftedMouse: off ########################### Options ########################################## forceDisplay: 0 forceMono: 0 cloakChars: ?? clock: 1 colorfulPhasers: on continueTractor: on defaultShip: CA dashboard: on enemyPhasers: 1 phasorShrink: 16 theirPhasorShrink: 16 shrinkPhasorOnMiss: on extraAlertBorder: on galacticFrequent: on keepInfo: 15 keepPeace: on logMessage: off macroKey: TAB messageHUD: 2 metaStatusLevel: 4 PhaserMsg: 5 phaserMsgI: on phaserShrink: 6 phaserStats: on phaserWindow: on reportKills: on shortKillMesg: on showFuelOnLocal: off showGalactic: 1 showLocal: 1 showLock: 3 showMapPlanetNames: on showMySpeed: off showPlanetNames: on showPlayerStatus: on showShields: on showStats: off showTractorPressor: on sortPlayers: on ########################### WINDOW PLACEMENT ################################## ############################################################################### # Fonts # #Valid values are 8,9,10, and 13 fontsize: 10 ############################################################################### # Window placement # # Since changing fonts causes changes to the window sizes # this section has gone through many revisions as well # # The next iteration of all this using the new dashboard.... # I don't usually want to see the MOTD until I'm in # To encourage motd reading I'll activate this - jn WaitMotd.mapped: on ## The main window -- only map it when there's no wait queue netrek.geometry: 1150x875+0 # the maximal window for my sparc 2 #This is a Win32-only option. Hitting ALT-ENTER during #the game will toggle the caption bar also. netrek.w32caption: on war.geometry: +700 help.parent: netrek help.geometry: 500x25+0+525 planet.parent: netrek planet.geometry: +20 ## Ok, on the left side we have a column of six windows; message, ## warning, new dash (ie tstats), my messages, team messages, all ## messages. I have the total messages maped to cover this whole area ## so by using ? you can toggle between seeing the broken up messages ## or the total window. The stats window has been removed in favor of ## the new dashboard. message.parent: netrek message.geometry: 502x19+508+504 message.mapped: on warn.parent: netrek warn.geometry: 502x18+508+523 warn.mapped: on tstat.parent: netrek tstat.geometry: 510x45+0+504 tstat.mapped: on review_your.parent: netrek review_your.geometry: 82x4+0+547 review_your.mapped: on review_team.parent: netrek review_team.geometry: 82x7+0+595 review_team.mapped: on review_all.parent: netrek review_all.geometry: 82x3+0+673 review_all.mapped: on ## With this setup, you can use "?" to cycle between the big review window, the ## four small message windows, and no windows at all. # review.parent: netrek review.geometry: 82x20+0+547 review.mapped: off ## phaser window ## dunno if the following line is really needed or not.... phaserWindow: on ## 0 = don't show 1 = all 2 = team 3 = indiv ## 4 = kill 5 = total PhaserMsg: 1 #(show hit percentage on phaser messages) PhaserStats: on player.parent: netrek player.geometry: +508+542 player.mapped: on reportkills: on review_kill.parent: netrek review.geometry: 80x40+510+170 review_kill.geometry: 82x4+0+712 review_kill.mapped: on ## a couple of other window mappings # # Some UDP stuff udp.geometry: +0+0 udp.mapped: off # I'm planning on using the new dash instead showstats: off stats.parent: netrek stats.geommac.s.%i:%y loss, %v ping, %V stddev stats geometry: 160x108+332+550 # puts the stats window further down stats.geometry: 160x94+842+500 #MACROS dist.taking: (%c) %i Carrying %a to %l @ %n with %f fuel, %d damage dist.help: (%c) %i NEEDS HELP NOW! I have %a armies, %d damage, %s shields! dist.space_control: HELP CONTROL AT %l! GET THERE NOW! lite.taking: /c/l /0 /| %c carrying to %l | lite.space_control: /l /| %l in danger | lite.pickup: /h /| %p++ @ %l | lite.help: %?%S=SB%{/c%}%?%a>0%{/c%} /| %c needs help | /0 lite.crippled:/h | %h is cripple | mac.H.A:% /~\ |_| ~|~ |_| (~ |_| | | |\/| /~\ |\| | ~|~ \./ | mac.H.A:% \_/ | | , | | | (_ | | |_| | | |~| | | | | | . mac.O.T:% /`\ /~_ /~_ ~|~ |_| <~ |~> .^. <~ <~ | mac.O.T:% \./ \_/ \_/ | | | <_ |_> |~| _> <_ . mac.D.T:% | | <~ | |~) \./ /~\ | | |~) |~> /\ (~ <~ \~/ \~/ mac.D.T:% |~| <_ |_ |~ | \_/ |_| |~\ |_> /~~\ _) <_ o o mac.g.A:% ---- __| __| \ | _ \ __|_ _| _ \ __| mac.g.A:% ---- (_ | _| . | ( | ( | | | _| mac.g.A:% ----\___|___|_|\_|\___/ \___|___|___/ ___| mac.m.A:% ,__, Moo! mac.m.A:% (..)/___ mac.m.A:% (__) )\ mac.m.A:% ||--|| * mac.L.A:_____\\ ~ ~ //__"What just happened?"_ mac.L.A:_____(/ @ @ /)________________________ mac.L.A:___oOOo-(_)-oOOo <-(%p)%U ###Configuration changes added by the Netrek Configurator on 6/11/2006 newdashboard: 2 playerListStyle: 3 showHints: on sound: on showStars: on warpStreaks: on ###Keymap added by the Netrek Configurator on 6/11/2006 keymap:\Qq0Q0gffp ###Buttonmap added by the Netrek Configurator on 6/11/2006 buttonmap:1t --- NEW FILE: netrekconfig.VBP --- Type=Exe Form=Form1.frm Form=Form2.frm Form=Form3.frm IconForm="Form1" Startup="Form1" HelpFile="" Title="netrekconfig" ExeName32="netrekconfig.exe" Command32="" Name="Netrek_Configurator" HelpContextID="0" CompatibleMode="0" MajorVer=1 MinorVer=0 RevisionVer=0 AutoIncrementVer=0 ServerSupportFiles=0 VersionCompanyName="PlayNetrek.org" CompilationType=0 OptimizationType=0 FavorPentiumPro(tm)=0 CodeViewDebugInfo=0 NoAliasing=0 BoundsCheck=0 OverflowCheck=0 FlPointCheck=0 FDIVCheck=0 UnroundedFP=0 StartMode=0 Unattended=0 Retained=0 ThreadPerObject=0 MaxNumberOfThreads=1 DebugStartupOption=0 [MS Transaction Server] AutoRefresh=1 --- NEW FILE: README.txt --- Netrek Configurator v1.0 - written by Joe Evango Program notes from Joe 4/30/06- Code contains some comments, pretty easy to follow the logic. I am currently using a config directory that contains two netrekrc files, netrek.one and netrek.sep. This is done for the two messaging window configs. This should be easy enough to implement into the code in order to eliminate the extra sub directory and files if someone has time. This utility writes to the netrekrc file and assumes it is in located the same folder as the utility so if the netrekrc file does not exist the utility will not run properly and error out. When it is run it will also save your old netrekrc file as netrek.sav. Since Netrek code has always been freely shared in the community I will do the same with this config utility. Please feel free to help improve the utility and/or include the utility as an add-on if you are working on a Windows client. Also feel free to use the logic in this code to create a config utility for another OS. It took a while to put the keymap portion of this together but it works well. I only ask that if any modifications are made you also make your code changes available to the community. It would also be nice if I was mentioned as a contributor in your code comments. From modemhero at users.sourceforge.net Mon Jun 12 04:14:11 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 09:14:11 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET AssemblyInfo.vb, NONE, 1.1 Form1.Designer.vb, NONE, 1.1 Form1.resX, NONE, 1.1 Form1.vb, NONE, 1.1 Form2.Designer.vb, NONE, 1.1 Form2.resX, NONE, 1.1 Form2.vb, NONE, 1.1 Form3.Designer.vb, NONE, 1.1 Form3.resX, NONE, 1.1 Form3.vb, NONE, 1.1 _UpgradeReport.htm, NONE, 1.1 netrekconfig.ico, NONE, 1.1 netrekconfig.log, NONE, 1.1 netrekconfig.sln, NONE, 1.1 netrekconfig.suo, NONE, 1.1 netrekconfig.vbproj, NONE, 1.1 netrekconfig.vbproj.user, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13747/tools/VBasic config utility/Netrek_Configurator.NET Added Files: AssemblyInfo.vb Form1.Designer.vb Form1.resX Form1.vb Form2.Designer.vb Form2.resX Form2.vb Form3.Designer.vb Form3.resX Form3.vb _UpgradeReport.htm netrekconfig.ico netrekconfig.log netrekconfig.sln netrekconfig.suo netrekconfig.vbproj netrekconfig.vbproj.user Log Message: Adding Joe Evango's Visual Basic configuration utiity to client source code. Not used in Netrek XP 2006, but left here in case anyone wants to use it or improve on it. --- NEW FILE: AssemblyInfo.vb --- Imports System.Reflection Imports System.Runtime.CompilerServices Imports System.Runtime.InteropServices ' General Information about an assembly is controlled through the following ' set of attributes. Change these attribute values to modify the information ' associated with an assembly. ' TODO: Review the values of the assembly attributes ' Version information for an assembly consists of the following four values: ' Major version ' Minor Version ' Build Number ' Revision ' You can specify all the values or you can default the Build and Revision Numbers ' by using the '*' as shown below: --- NEW FILE: netrekconfig.vbproj.user --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Form1.resX --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Form2.vb --- Option Strict Off Option Explicit On Friend Class Form2 Inherits System.Windows.Forms.Form ' Netrek Configurator v1.0 - written by Joe Evango ' ' Program notes from Joe 4/30/06- ' Code contains some comments, pretty easy to follow the logic. ' I am currently using a config directory that contains two netrekrc files, netrek.one and netrek.sep. ' This is done for the two messaging window configs. This should be easy enough to implement into the code ' in order to eliminate the extra sub directory and files if someone has time. ' ' This utility writes to the netrekrc file and assumes it is in located the same folder as the utility so if the ' netrekrc file does not exist the utility will not run properly and error out. When it is run it will also save ' your old netrekrc file as netrek.sav. ' ' Since Netrek code has always been freely shared in the community I will do the same with this config utility. ' Please feel free to help improve the utility and/or include the utility as an add-on if you are working on ' a Windows client. Also feel free to use the logic in this code to create a config utility for another OS. It ' took a while to put the keymap portion of this together but it works well. I only ask that if any modifications ' are made you also make your code changes available to the community. It would also be nice if I was mentioned as ' a contributor in your code comments. ' Variables below for game options are self explanitory Dim playlist As Short Dim sound As Short Dim tips As Short Dim stars As Short Dim warp As Short Private Sub Command1_Click(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles Command1.Click Dim fnum2 As Short Dim pltxt As String Dim tiptxt As String Dim soundtxt As String Dim startxt As String Dim warptxt As String Dim metatxt As String fnum2 = FreeFile ' Open the file for append. FileOpen(fnum2, ".\netrekrc", OpenMode.Append) ' Add the command. If (Check1.CheckState = System.Windows.Forms.CheckState.Checked) Then sound = 1 End If If (Check1.CheckState = System.Windows.Forms.CheckState.Unchecked) Then sound = 0 End If If (Check2.CheckState = System.Windows.Forms.CheckState.Checked) Then tips = 1 End If If (Check2.CheckState = System.Windows.Forms.CheckState.Unchecked) Then tips = 0 End If If (Check3.CheckState = System.Windows.Forms.CheckState.Checked) Then stars = 1 End If If (Check3.CheckState = System.Windows.Forms.CheckState.Unchecked) Then stars = 0 End If If (Check4.CheckState = System.Windows.Forms.CheckState.Checked) Then warp = 1 End If If (Check4.CheckState = System.Windows.Forms.CheckState.Unchecked) Then warp = 0 End If If playlist = 1 Then pltxt = "playerListStyle: 1" End If If playlist = 2 Then pltxt = "playerListStyle: 2" End If If playlist = 3 Then pltxt = "playerListStyle: 3" End If If playlist = 4 Then pltxt = "playerListStyle: 4" End If If tips = 1 Then tiptxt = "showHints: on" End If If tips = 0 Then tiptxt = "showHints: off" End If If sound = 1 Then soundtxt = "sound: on" End If If sound = 0 Then soundtxt = "sound: off" End If If stars = 0 Then startxt = "showStars: off" End If If stars = 1 Then startxt = "showStars: on" End If If warp = 1 Then warptxt = "warpStreaks: on" End If If warp = 0 Then warptxt = "warpStreaks: off" End If PrintLine(fnum2, pltxt) PrintLine(fnum2, Chr(13)) PrintLine(fnum2, tiptxt) PrintLine(fnum2, Chr(13)) PrintLine(fnum2, soundtxt) PrintLine(fnum2, Chr(13)) PrintLine(fnum2, startxt) PrintLine(fnum2, Chr(13)) PrintLine(fnum2, warptxt) ' Close the file. FileClose(fnum2) 'MsgBox "Your configuration has been saved. Your old configuration file has been saved as netrekrc.sav in your Netrek install directory" Form3.Show() Me.Close() End Sub Private Sub Command2_Click(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles Command2.Click Me.Close() End Sub Private Sub Form2_Load(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles MyBase.Load playlist = 3 End Sub 'UPGRADE_WARNING: Event Option1.CheckedChanged may fire when form is initialized. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="88B12AE1-6DE0-48A0-86F1-60C0686C026A"' Private Sub Option1_CheckedChanged(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles Option1.CheckedChanged If eventSender.Checked Then playlist = 1 pl1.Visible = True pl2.Visible = False pl3.Visible = False pl4.Visible = False End If End Sub 'UPGRADE_WARNING: Event Option2.CheckedChanged may fire when form is initialized. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="88B12AE1-6DE0-48A0-86F1-60C0686C026A"' Private Sub Option2_CheckedChanged(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles Option2.CheckedChanged If eventSender.Checked Then playlist = 2 pl1.Visible = False pl2.Visible = True pl3.Visible = False pl4.Visible = False End If End Sub 'UPGRADE_WARNING: Event Option3.CheckedChanged may fire when form is initialized. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="88B12AE1-6DE0-48A0-86F1-60C0686C026A"' Private Sub Option3_CheckedChanged(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles Option3.CheckedChanged If eventSender.Checked Then playlist = 3 pl1.Visible = False pl2.Visible = False pl3.Visible = True pl4.Visible = False End If End Sub 'UPGRADE_WARNING: Event Option4.CheckedChanged may fire when form is initialized. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="88B12AE1-6DE0-48A0-86F1-60C0686C026A"' Private Sub Option4_CheckedChanged(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles Option4.CheckedChanged If eventSender.Checked Then playlist = 4 pl1.Visible = False pl2.Visible = False pl3.Visible = False pl4.Visible = True End If End Sub Private Sub Text1_Change(ByRef Index As Short) End Sub End Class --- NEW FILE: Form2.Designer.vb --- Partial Class Form2 #Region "Windows Form Designer generated code " Public Sub New() MyBase.New() 'This call is required by the Windows Form Designer. InitializeComponent() End Sub 'Form overrides dispose to clean up the component list. Protected Overloads Overrides Sub Dispose(ByVal Disposing As Boolean) If Disposing Then If Not components Is Nothing Then components.Dispose() End If End If MyBase.Dispose(Disposing) End Sub 'Required by the Windows Form Designer Private components As System.ComponentModel.IContainer Public ToolTip1 As System.Windows.Forms.ToolTip Public WithEvents Check4 As System.Windows.Forms.CheckBox Public WithEvents Check3 As System.Windows.Forms.CheckBox Public WithEvents Command2 As System.Windows.Forms.Button Public WithEvents Check2 As System.Windows.Forms.CheckBox Public WithEvents Check1 As System.Windows.Forms.CheckBox Public WithEvents Command1 As System.Windows.Forms.Button Public WithEvents Option4 As System.Windows.Forms.RadioButton Public WithEvents Option3 As System.Windows.Forms.RadioButton Public WithEvents Option2 As System.Windows.Forms.RadioButton Public WithEvents Option1 As System.Windows.Forms.RadioButton Public WithEvents Label5 As System.Windows.Forms.Label Public WithEvents Label3 As System.Windows.Forms.Label Public WithEvents Label4 As System.Windows.Forms.Label Public WithEvents Label2 As System.Windows.Forms.Label Public WithEvents Image1 As System.Windows.Forms.PictureBox Public WithEvents pl4 As System.Windows.Forms.PictureBox Public WithEvents pl3 As System.Windows.Forms.PictureBox Public WithEvents pl2 As System.Windows.Forms.PictureBox Public WithEvents pl1 As System.Windows.Forms.PictureBox Public WithEvents Label1 As System.Windows.Forms.Label 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. Private Sub InitializeComponent() Dim resources As System.Resources.ResourceManager = New System.Resources.ResourceManager(GetType(Form2)) Me.components = New System.ComponentModel.Container() Me.ToolTip1 = New System.Windows.Forms.ToolTip(components) Me.Check4 = New System.Windows.Forms.CheckBox Me.Check3 = New System.Windows.Forms.CheckBox Me.Command2 = New System.Windows.Forms.Button Me.Check2 = New System.Windows.Forms.CheckBox Me.Check1 = New System.Windows.Forms.CheckBox Me.Command1 = New System.Windows.Forms.Button Me.Option4 = New System.Windows.Forms.RadioButton Me.Option3 = New System.Windows.Forms.RadioButton Me.Option2 = New System.Windows.Forms.RadioButton Me.Option1 = New System.Windows.Forms.RadioButton Me.Label5 = New System.Windows.Forms.Label Me.Label3 = New System.Windows.Forms.Label Me.Label4 = New System.Windows.Forms.Label Me.Label2 = New System.Windows.Forms.Label Me.Image1 = New System.Windows.Forms.PictureBox Me.pl4 = New System.Windows.Forms.PictureBox Me.pl3 = New System.Windows.Forms.PictureBox Me.pl2 = New System.Windows.Forms.PictureBox Me.pl1 = New System.Windows.Forms.PictureBox Me.Label1 = New System.Windows.Forms.Label Me.SuspendLayout() Me.ToolTip1.Active = True Me.StartPosition = System.Windows.Forms.FormStartPosition.Manual Me.BackColor = System.Drawing.SystemColors.WindowText Me.Text = "Netrek Configuration Utility (Page 2 of 3)" Me.ClientSize = New System.Drawing.Size(727, 657) Me.Location = New System.Drawing.Point(157, 32) Me.Icon = CType(resources.GetObject("Form2.Icon"), System.Drawing.Icon) Me.Font = New System.Drawing.Font("Arial", 8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Sizable Me.ControlBox = True Me.Enabled = True Me.KeyPreview = False Me.MaximizeBox = True Me.MinimizeBox = True Me.Cursor = System.Windows.Forms.Cursors.Default Me.RightToLeft = System.Windows.Forms.RightToLeft.No Me.ShowInTaskbar = True Me.HelpButton = False Me.WindowState = System.Windows.Forms.FormWindowState.Normal Me.Name = "Form2" Me.Check4.BackColor = System.Drawing.SystemColors.MenuText Me.Check4.Text = "Show Warpstreaks" Me.Check4.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Check4.ForeColor = System.Drawing.SystemColors.highlightText Me.Check4.Size = New System.Drawing.Size(145, 25) Me.Check4.Location = New System.Drawing.Point(240, 560) Me.Check4.TabIndex = 14 Me.Check4.CheckState = System.Windows.Forms.CheckState.Checked Me.Check4.CheckAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Check4.FlatStyle = System.Windows.Forms.FlatStyle.Standard Me.Check4.CausesValidation = True Me.Check4.Enabled = True Me.Check4.Cursor = System.Windows.Forms.Cursors.Default Me.Check4.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Check4.Appearance = System.Windows.Forms.Appearance.Normal Me.Check4.TabStop = True Me.Check4.Visible = True Me.Check4.Name = "Check4" Me.Check3.BackColor = System.Drawing.SystemColors.MenuText Me.Check3.Text = "Show Stars" Me.Check3.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Check3.ForeColor = System.Drawing.SystemColors.highlightText Me.Check3.Size = New System.Drawing.Size(113, 25) Me.Check3.Location = New System.Drawing.Point(48, 520) Me.Check3.TabIndex = 13 Me.Check3.CheckState = System.Windows.Forms.CheckState.Checked Me.Check3.CheckAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Check3.FlatStyle = System.Windows.Forms.FlatStyle.Standard Me.Check3.CausesValidation = True Me.Check3.Enabled = True Me.Check3.Cursor = System.Windows.Forms.Cursors.Default Me.Check3.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Check3.Appearance = System.Windows.Forms.Appearance.Normal Me.Check3.TabStop = True Me.Check3.Visible = True Me.Check3.Name = "Check3" Me.Command2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.Command2.Text = "Cancel" Me.Command2.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Command2.Size = New System.Drawing.Size(73, 25) Me.Command2.Location = New System.Drawing.Point(352, 616) Me.Command2.TabIndex = 12 Me.Command2.BackColor = System.Drawing.SystemColors.Control Me.Command2.CausesValidation = True Me.Command2.Enabled = True Me.Command2.ForeColor = System.Drawing.SystemColors.ControlText Me.Command2.Cursor = System.Windows.Forms.Cursors.Default Me.Command2.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Command2.TabStop = True Me.Command2.Name = "Command2" Me.Check2.BackColor = System.Drawing.SystemColors.ControlText Me.Check2.Text = "Enable Tip Window" Me.Check2.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Check2.ForeColor = System.Drawing.SystemColors.highlightText Me.Check2.Size = New System.Drawing.Size(145, 17) Me.Check2.Location = New System.Drawing.Point(240, 528) Me.Check2.TabIndex = 10 Me.Check2.CheckState = System.Windows.Forms.CheckState.Checked Me.Check2.CheckAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Check2.FlatStyle = System.Windows.Forms.FlatStyle.Standard Me.Check2.CausesValidation = True Me.Check2.Enabled = True Me.Check2.Cursor = System.Windows.Forms.Cursors.Default Me.Check2.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Check2.Appearance = System.Windows.Forms.Appearance.Normal Me.Check2.TabStop = True Me.Check2.Visible = True Me.Check2.Name = "Check2" Me.Check1.BackColor = System.Drawing.SystemColors.MenuText Me.Check1.Text = "Enable Sound" Me.Check1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Check1.ForeColor = System.Drawing.SystemColors.highlightText Me.Check1.Size = New System.Drawing.Size(113, 25) Me.Check1.Location = New System.Drawing.Point(48, 560) Me.Check1.TabIndex = 9 Me.Check1.CheckState = System.Windows.Forms.CheckState.Checked Me.Check1.CheckAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Check1.FlatStyle = System.Windows.Forms.FlatStyle.Standard Me.Check1.CausesValidation = True Me.Check1.Enabled = True Me.Check1.Cursor = System.Windows.Forms.Cursors.Default Me.Check1.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Check1.Appearance = System.Windows.Forms.Appearance.Normal Me.Check1.TabStop = True Me.Check1.Visible = True Me.Check1.Name = "Check1" Me.Command1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.Command1.Text = "Next" Me.Command1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Command1.Size = New System.Drawing.Size(73, 25) Me.Command1.Location = New System.Drawing.Point(264, 616) Me.Command1.TabIndex = 8 Me.Command1.BackColor = System.Drawing.SystemColors.Control Me.Command1.CausesValidation = True Me.Command1.Enabled = True Me.Command1.ForeColor = System.Drawing.SystemColors.ControlText Me.Command1.Cursor = System.Windows.Forms.Cursors.Default Me.Command1.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Command1.TabStop = True Me.Command1.Name = "Command1" Me.Option4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Option4.BackColor = System.Drawing.SystemColors.ControlText Me.Option4.Text = "BRMH Style" Me.Option4.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Option4.ForeColor = System.Drawing.SystemColors.highlightText Me.Option4.Size = New System.Drawing.Size(145, 25) Me.Option4.Location = New System.Drawing.Point(24, 344) Me.Option4.TabIndex = 6 Me.Option4.CheckAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Option4.CausesValidation = True Me.Option4.Enabled = True Me.Option4.Cursor = System.Windows.Forms.Cursors.Default Me.Option4.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Option4.Appearance = System.Windows.Forms.Appearance.Normal Me.Option4.TabStop = True Me.Option4.Checked = False Me.Option4.Visible = True Me.Option4.Name = "Option4" Me.Option3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Option3.BackColor = System.Drawing.SystemColors.ControlText Me.Option3.Text = "Kill Watch Style (Default)" Me.Option3.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Option3.ForeColor = System.Drawing.SystemColors.highlightText Me.Option3.Size = New System.Drawing.Size(169, 25) Me.Option3.Location = New System.Drawing.Point(24, 320) Me.Option3.TabIndex = 5 Me.Option3.Checked = True Me.Option3.CheckAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Option3.CausesValidation = True Me.Option3.Enabled = True Me.Option3.Cursor = System.Windows.Forms.Cursors.Default Me.Option3.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Option3.Appearance = System.Windows.Forms.Appearance.Normal Me.Option3.TabStop = True Me.Option3.Visible = True Me.Option3.Name = "Option3" Me.Option2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Option2.BackColor = System.Drawing.SystemColors.ControlText Me.Option2.Text = "COW Style" Me.Option2.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Option2.ForeColor = System.Drawing.SystemColors.highlightText Me.Option2.Size = New System.Drawing.Size(153, 25) Me.Option2.Location = New System.Drawing.Point(24, 296) Me.Option2.TabIndex = 4 Me.Option2.CheckAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Option2.CausesValidation = True Me.Option2.Enabled = True Me.Option2.Cursor = System.Windows.Forms.Cursors.Default Me.Option2.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Option2.Appearance = System.Windows.Forms.Appearance.Normal Me.Option2.TabStop = True Me.Option2.Checked = False Me.Option2.Visible = True Me.Option2.Name = "Option2" Me.Option1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Option1.BackColor = System.Drawing.SystemColors.ControlText Me.Option1.Text = "Old Style" Me.Option1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Option1.ForeColor = System.Drawing.SystemColors.highlightText Me.Option1.Size = New System.Drawing.Size(153, 25) Me.Option1.Location = New System.Drawing.Point(24, 272) Me.Option1.TabIndex = 3 Me.Option1.CheckAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Option1.CausesValidation = True Me.Option1.Enabled = True Me.Option1.Cursor = System.Windows.Forms.Cursors.Default Me.Option1.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Option1.Appearance = System.Windows.Forms.Appearance.Normal Me.Option1.TabStop = True Me.Option1.Checked = False Me.Option1.Visible = True Me.Option1.Name = "Option1" Me.Label5.BackColor = System.Drawing.SystemColors.WindowText Me.Label5.Text = "Misc. Options" Me.Label5.Font = New System.Drawing.Font("Arial", 12!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label5.ForeColor = System.Drawing.Color.Blue Me.Label5.Size = New System.Drawing.Size(129, 25) Me.Label5.Location = New System.Drawing.Point(24, 480) Me.Label5.TabIndex = 11 Me.Label5.TextAlign = System.Drawing.ContentAlignment.TopLeft Me.Label5.Enabled = True Me.Label5.Cursor = System.Windows.Forms.Cursors.Default Me.Label5.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Label5.UseMnemonic = True Me.Label5.Visible = True Me.Label5.AutoSize = False Me.Label5.BorderStyle = System.Windows.Forms.BorderStyle.None Me.Label5.Name = "Label5" Me.Label3.BackColor = System.Drawing.SystemColors.ControlText Me.Label3.Text = "There are four playerlists available with this utility. Selecting the radio buttons below will show you a screen shot of each option. It is highly recommended that you stick with the default playerlist until you become more familiar with the game." Me.Label3.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label3.ForeColor = System.Drawing.SystemColors.highlightText Me.Label3.Size = New System.Drawing.Size(473, 41) Me.Label3.Location = New System.Drawing.Point(16, 224) Me.Label3.TabIndex = 7 Me.Label3.TextAlign = System.Drawing.ContentAlignment.TopLeft Me.Label3.Enabled = True Me.Label3.Cursor = System.Windows.Forms.Cursors.Default Me.Label3.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Label3.UseMnemonic = True Me.Label3.Visible = True Me.Label3.AutoSize = False Me.Label3.BorderStyle = System.Windows.Forms.BorderStyle.None Me.Label3.Name = "Label3" Me.Label4.TextAlign = System.Drawing.ContentAlignment.TopCenter Me.Label4.BackColor = System.Drawing.SystemColors.ControlText Me.Label4.Text = "NOTE: This will place a fresh copy of the netrekrc file in your Netrek install directory. If you have made any changes to this file they will be overwritten. A copy of your old netrekrc file will be saved as netrekrc.sav. If this is your first time installing please choose your configuration below and click on the Next button" Me.Label4.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label4.ForeColor = System.Drawing.Color.FromARGB(255, 128, 128) Me.Label4.Size = New System.Drawing.Size(729, 41) Me.Label4.Location = New System.Drawing.Point(0, 144) Me.Label4.TabIndex = 2 Me.Label4.Enabled = True Me.Label4.Cursor = System.Windows.Forms.Cursors.Default Me.Label4.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Label4.UseMnemonic = True Me.Label4.Visible = True Me.Label4.AutoSize = False Me.Label4.BorderStyle = System.Windows.Forms.BorderStyle.None Me.Label4.Name = "Label4" Me.Label2.TextAlign = System.Drawing.ContentAlignment.TopCenter Me.Label2.BackColor = System.Drawing.Color.Black Me.Label2.Text = "There are several configuration options that you can set with this utility. These options include your messaging window(s), dashboard, player list, sound, hint window, and keyboard and mouse controls. A shortcut for this utility has been placed in your NetrekXP Mod program group so if you would like to change these options just re-run this utility." Me.Label2.Font = New System.Drawing.Font("Arial", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label2.ForeColor = System.Drawing.Color.White Me.Label2.Size = New System.Drawing.Size(713, 73) Me.Label2.Location = New System.Drawing.Point(8, 88) Me.Label2.TabIndex = 1 Me.Label2.Enabled = True Me.Label2.Cursor = System.Windows.Forms.Cursors.Default Me.Label2.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Label2.UseMnemonic = True Me.Label2.Visible = True Me.Label2.AutoSize = False Me.Label2.BorderStyle = System.Windows.Forms.BorderStyle.None Me.Label2.Name = "Label2" Me.Image1.Size = New System.Drawing.Size(132, 70) Me.Image1.Location = New System.Drawing.Point(280, 16) Me.Image1.Image = CType(resources.GetObject("Image1.Image"), System.Drawing.Image) Me.Image1.Enabled = True Me.Image1.Cursor = System.Windows.Forms.Cursors.Default Me.Image1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Normal Me.Image1.Visible = True Me.Image1.BorderStyle = System.Windows.Forms.BorderStyle.None Me.Image1.Name = "Image1" Me.pl4.Size = New System.Drawing.Size(507, 225) Me.pl4.Location = New System.Drawing.Point(208, 272) Me.pl4.Image = CType(resources.GetObject("pl4.Image"), System.Drawing.Image) Me.pl4.Visible = False Me.pl4.Enabled = True Me.pl4.Cursor = System.Windows.Forms.Cursors.Default Me.pl4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Normal Me.pl4.BorderStyle = System.Windows.Forms.BorderStyle.None Me.pl4.Name = "pl4" Me.pl3.Size = New System.Drawing.Size(508, 223) Me.pl3.Location = New System.Drawing.Point(208, 272) Me.pl3.Image = CType(resources.GetObject("pl3.Image"), System.Drawing.Image) Me.pl3.Enabled = True Me.pl3.Cursor = System.Windows.Forms.Cursors.Default Me.pl3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Normal Me.pl3.Visible = True Me.pl3.BorderStyle = System.Windows.Forms.BorderStyle.None Me.pl3.Name = "pl3" Me.pl2.Size = New System.Drawing.Size(507, 224) Me.pl2.Location = New System.Drawing.Point(208, 272) Me.pl2.Image = CType(resources.GetObject("pl2.Image"), System.Drawing.Image) Me.pl2.Visible = False Me.pl2.Enabled = True Me.pl2.Cursor = System.Windows.Forms.Cursors.Default Me.pl2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Normal Me.pl2.BorderStyle = System.Windows.Forms.BorderStyle.None Me.pl2.Name = "pl2" Me.pl1.Size = New System.Drawing.Size(506, 226) Me.pl1.Location = New System.Drawing.Point(208, 272) Me.pl1.Image = CType(resources.GetObject("pl1.Image"), System.Drawing.Image) Me.pl1.Visible = False Me.pl1.Enabled = True Me.pl1.Cursor = System.Windows.Forms.Cursors.Default Me.pl1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Normal Me.pl1.BorderStyle = System.Windows.Forms.BorderStyle.None Me.pl1.Name = "pl1" Me.Label1.BackColor = System.Drawing.SystemColors.WindowText Me.Label1.Text = "PlayerList:" Me.Label1.Font = New System.Drawing.Font("Arial", 12!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label1.ForeColor = System.Drawing.Color.Blue Me.Label1.Size = New System.Drawing.Size(97, 25) Me.Label1.Location = New System.Drawing.Point(16, 200) Me.Label1.TabIndex = 0 Me.Label1.TextAlign = System.Drawing.ContentAlignment.TopLeft Me.Label1.Enabled = True Me.Label1.Cursor = System.Windows.Forms.Cursors.Default Me.Label1.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Label1.UseMnemonic = True Me.Label1.Visible = True Me.Label1.AutoSize = False Me.Label1.BorderStyle = System.Windows.Forms.BorderStyle.None Me.Label1.Name = "Label1" Me.Controls.Add(Check4) Me.Controls.Add(Check3) Me.Controls.Add(Command2) Me.Controls.Add(Check2) Me.Controls.Add(Check1) Me.Controls.Add(Command1) Me.Controls.Add(Option4) Me.Controls.Add(Option3) Me.Controls.Add(Option2) Me.Controls.Add(Option1) Me.Controls.Add(Label5) Me.Controls.Add(Label3) Me.Controls.Add(Label4) Me.Controls.Add(Label2) Me.Controls.Add(Image1) Me.Controls.Add(pl4) Me.Controls.Add(pl3) Me.Controls.Add(pl2) Me.Controls.Add(pl1) Me.Controls.Add(Label1) Me.ResumeLayout(False) Me.PerformLayout() End Sub #End Region End Class --- NEW FILE: netrekconfig.suo --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Form3.Designer.vb --- Partial Class Form3 #Region "Windows Form Designer generated code " Public Sub New() MyBase.New() 'This call is required by the Windows Form Designer. InitializeComponent() End Sub 'Form overrides dispose to clean up the component list. Protected Overloads Overrides Sub Dispose(ByVal Disposing As Boolean) If Disposing Then If Not components Is Nothing Then components.Dispose() End If End If MyBase.Dispose(Disposing) End Sub 'Required by the Windows Form Designer Private components As System.ComponentModel.IContainer Public ToolTip1 As System.Windows.Forms.ToolTip [...1310 lines suppressed...] Me.Text1.SetIndex(_Text1_13, CType(13, Short)) Me.Text1.SetIndex(_Text1_12, CType(12, Short)) Me.Text1.SetIndex(_Text1_11, CType(11, Short)) Me.Text1.SetIndex(_Text1_10, CType(10, Short)) Me.Text1.SetIndex(_Text1_9, CType(9, Short)) Me.Text1.SetIndex(_Text1_8, CType(8, Short)) Me.Text1.SetIndex(_Text1_7, CType(7, Short)) Me.Text1.SetIndex(_Text1_6, CType(6, Short)) Me.Text1.SetIndex(_Text1_5, CType(5, Short)) Me.Text1.SetIndex(_Text1_4, CType(4, Short)) Me.Text1.SetIndex(_Text1_3, CType(3, Short)) Me.Text1.SetIndex(_Text1_2, CType(2, Short)) Me.Text1.SetIndex(_Text1_1, CType(1, Short)) Me.Text1.SetIndex(_Text1_0, CType(0, Short)) CType(Me.Text1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub #End Region End Class --- NEW FILE: Form3.resX --- (This appears to be a binary file; contents omitted.) --- NEW FILE: netrekconfig.ico --- (This appears to be a binary file; contents omitted.) --- NEW FILE: netrekconfig.log --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Form1.Designer.vb --- Partial Class Form1 #Region "Windows Form Designer generated code " Public Sub New() MyBase.New() 'This call is required by the Windows Form Designer. InitializeComponent() End Sub 'Form overrides dispose to clean up the component list. Protected Overloads Overrides Sub Dispose(ByVal Disposing As Boolean) If Disposing Then If Not components Is Nothing Then components.Dispose() End If End If MyBase.Dispose(Disposing) End Sub 'Required by the Windows Form Designer Private components As System.ComponentModel.IContainer Public ToolTip1 As System.Windows.Forms.ToolTip Public WithEvents Command1 As System.Windows.Forms.Button Public WithEvents cmdAdd As System.Windows.Forms.Button Public WithEvents dash0 As System.Windows.Forms.RadioButton Public WithEvents dash2 As System.Windows.Forms.RadioButton Public WithEvents dash1 As System.Windows.Forms.RadioButton Public WithEvents dash3 As System.Windows.Forms.RadioButton Public WithEvents pic3 As System.Windows.Forms.PictureBox Public WithEvents pic2 As System.Windows.Forms.PictureBox Public WithEvents pic1 As System.Windows.Forms.PictureBox Public WithEvents pic0 As System.Windows.Forms.PictureBox Public WithEvents _Label3_1 As System.Windows.Forms.Label Public WithEvents _Label1_1 As System.Windows.Forms.Label Public WithEvents Frame1 As System.Windows.Forms.Panel Public WithEvents Option1 As System.Windows.Forms.RadioButton Public WithEvents Option2 As System.Windows.Forms.RadioButton Public WithEvents Label5 As System.Windows.Forms.Label Public WithEvents Label4 As System.Windows.Forms.Label Public WithEvents _Label3_0 As System.Windows.Forms.Label Public WithEvents _Label1_0 As System.Windows.Forms.Label Public WithEvents separate As System.Windows.Forms.PictureBox Public WithEvents one As System.Windows.Forms.PictureBox Public WithEvents Image1 As System.Windows.Forms.PictureBox Public WithEvents Label1 As Microsoft.VisualBasic.Compatibility.VB6.LabelArray Public WithEvents Label3 As Microsoft.VisualBasic.Compatibility.VB6.LabelArray 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. Private Sub InitializeComponent() Dim resources As System.Resources.ResourceManager = New System.Resources.ResourceManager(GetType(Form1)) Me.components = New System.ComponentModel.Container() Me.ToolTip1 = New System.Windows.Forms.ToolTip(components) Me.Command1 = New System.Windows.Forms.Button Me.cmdAdd = New System.Windows.Forms.Button Me.Frame1 = New System.Windows.Forms.Panel Me.dash0 = New System.Windows.Forms.RadioButton Me.dash2 = New System.Windows.Forms.RadioButton Me.dash1 = New System.Windows.Forms.RadioButton Me.dash3 = New System.Windows.Forms.RadioButton Me.pic3 = New System.Windows.Forms.PictureBox Me.pic2 = New System.Windows.Forms.PictureBox Me.pic1 = New System.Windows.Forms.PictureBox Me.pic0 = New System.Windows.Forms.PictureBox Me._Label3_1 = New System.Windows.Forms.Label Me._Label1_1 = New System.Windows.Forms.Label Me.Option1 = New System.Windows.Forms.RadioButton Me.Option2 = New System.Windows.Forms.RadioButton Me.Label5 = New System.Windows.Forms.Label Me.Label4 = New System.Windows.Forms.Label Me._Label3_0 = New System.Windows.Forms.Label Me._Label1_0 = New System.Windows.Forms.Label Me.separate = New System.Windows.Forms.PictureBox Me.one = New System.Windows.Forms.PictureBox Me.Image1 = New System.Windows.Forms.PictureBox Me.Label1 = New Microsoft.VisualBasic.Compatibility.VB6.LabelArray(components) Me.Label3 = New Microsoft.VisualBasic.Compatibility.VB6.LabelArray(components) Me.Frame1.SuspendLayout() Me.SuspendLayout() Me.ToolTip1.Active = True CType(Me.Label1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Label3, System.ComponentModel.ISupportInitialize).BeginInit() Me.StartPosition = System.Windows.Forms.FormStartPosition.Manual Me.BackColor = System.Drawing.Color.Black Me.Text = "Netrek Configuration Utility (Page 1 of 3)" Me.ClientSize = New System.Drawing.Size(722, 672) Me.Location = New System.Drawing.Point(157, 32) Me.Icon = CType(resources.GetObject("Form1.Icon"), System.Drawing.Icon) Me.Font = New System.Drawing.Font("Arial", 8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Sizable Me.ControlBox = True Me.Enabled = True Me.KeyPreview = False Me.MaximizeBox = True Me.MinimizeBox = True Me.Cursor = System.Windows.Forms.Cursors.Default Me.RightToLeft = System.Windows.Forms.RightToLeft.No Me.ShowInTaskbar = True Me.HelpButton = False Me.WindowState = System.Windows.Forms.FormWindowState.Normal Me.Name = "Form1" Me.Command1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.Command1.Text = "Cancel" Me.Command1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Command1.Size = New System.Drawing.Size(73, 25) Me.Command1.Location = New System.Drawing.Point(352, 632) Me.Command1.TabIndex = 13 Me.Command1.BackColor = System.Drawing.SystemColors.Control Me.Command1.CausesValidation = True Me.Command1.Enabled = True Me.Command1.ForeColor = System.Drawing.SystemColors.ControlText Me.Command1.Cursor = System.Windows.Forms.Cursors.Default Me.Command1.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Command1.TabStop = True Me.Command1.Name = "Command1" Me.cmdAdd.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.cmdAdd.Text = "Next" Me.cmdAdd.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cmdAdd.Size = New System.Drawing.Size(73, 25) Me.cmdAdd.Location = New System.Drawing.Point(264, 632) Me.cmdAdd.TabIndex = 12 Me.cmdAdd.BackColor = System.Drawing.SystemColors.Control Me.cmdAdd.CausesValidation = True Me.cmdAdd.Enabled = True Me.cmdAdd.ForeColor = System.Drawing.SystemColors.ControlText Me.cmdAdd.Cursor = System.Windows.Forms.Cursors.Default Me.cmdAdd.RightToLeft = System.Windows.Forms.RightToLeft.No Me.cmdAdd.TabStop = True Me.cmdAdd.Name = "cmdAdd" Me.Frame1.BackColor = System.Drawing.SystemColors.ControlText Me.Frame1.BorderStyle = System.Windows.Forms.BorderStyle.None Me.Frame1.Text = "Frame1" Me.Frame1.Size = New System.Drawing.Size(721, 161) Me.Frame1.Location = New System.Drawing.Point(8, 464) Me.Frame1.TabIndex = 4 Me.Frame1.Font = New System.Drawing.Font("Arial", 8!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Frame1.Enabled = True Me.Frame1.ForeColor = System.Drawing.SystemColors.ControlText Me.Frame1.Cursor = System.Windows.Forms.Cursors.Default Me.Frame1.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Frame1.Visible = True Me.Frame1.Name = "Frame1" Me.dash0.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.dash0.BackColor = System.Drawing.SystemColors.ControlText Me.dash0.Text = "Text Dashboard" Me.dash0.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dash0.ForeColor = System.Drawing.SystemColors.highlightText Me.dash0.Size = New System.Drawing.Size(121, 17) Me.dash0.Location = New System.Drawing.Point(8, 96) Me.dash0.TabIndex = 8 Me.dash0.CheckAlign = System.Drawing.ContentAlignment.MiddleLeft Me.dash0.CausesValidation = True Me.dash0.Enabled = True Me.dash0.Cursor = System.Windows.Forms.Cursors.Default Me.dash0.RightToLeft = System.Windows.Forms.RightToLeft.No Me.dash0.Appearance = System.Windows.Forms.Appearance.Normal Me.dash0.TabStop = True Me.dash0.Checked = False Me.dash0.Visible = True Me.dash0.Name = "dash0" Me.dash2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.dash2.BackColor = System.Drawing.SystemColors.ControlText Me.dash2.Text = "KRP Dashboard" Me.dash2.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dash2.ForeColor = System.Drawing.SystemColors.highlightText Me.dash2.Size = New System.Drawing.Size(121, 17) Me.dash2.Location = New System.Drawing.Point(8, 144) Me.dash2.TabIndex = 7 Me.dash2.CheckAlign = System.Drawing.ContentAlignment.MiddleLeft Me.dash2.CausesValidation = True Me.dash2.Enabled = True Me.dash2.Cursor = System.Windows.Forms.Cursors.Default Me.dash2.RightToLeft = System.Windows.Forms.RightToLeft.No Me.dash2.Appearance = System.Windows.Forms.Appearance.Normal Me.dash2.TabStop = True Me.dash2.Checked = False Me.dash2.Visible = True Me.dash2.Name = "dash2" Me.dash1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.dash1.BackColor = System.Drawing.SystemColors.ControlText Me.dash1.Text = "COW Dashboard" Me.dash1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dash1.ForeColor = System.Drawing.SystemColors.highlightText Me.dash1.Size = New System.Drawing.Size(129, 17) Me.dash1.Location = New System.Drawing.Point(8, 120) Me.dash1.TabIndex = 6 Me.dash1.CheckAlign = System.Drawing.ContentAlignment.MiddleLeft Me.dash1.CausesValidation = True Me.dash1.Enabled = True Me.dash1.Cursor = System.Windows.Forms.Cursors.Default Me.dash1.RightToLeft = System.Windows.Forms.RightToLeft.No Me.dash1.Appearance = System.Windows.Forms.Appearance.Normal Me.dash1.TabStop = True Me.dash1.Checked = False Me.dash1.Visible = True Me.dash1.Name = "dash1" Me.dash3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.dash3.BackColor = System.Drawing.SystemColors.ControlText Me.dash3.Text = "Labs Dashboard (Default)" Me.dash3.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.dash3.ForeColor = System.Drawing.SystemColors.highlightText Me.dash3.Size = New System.Drawing.Size(169, 17) Me.dash3.Location = New System.Drawing.Point(8, 72) Me.dash3.TabIndex = 5 Me.dash3.Checked = True Me.dash3.CheckAlign = System.Drawing.ContentAlignment.MiddleLeft Me.dash3.CausesValidation = True Me.dash3.Enabled = True Me.dash3.Cursor = System.Windows.Forms.Cursors.Default Me.dash3.RightToLeft = System.Windows.Forms.RightToLeft.No Me.dash3.Appearance = System.Windows.Forms.Appearance.Normal Me.dash3.TabStop = True Me.dash3.Visible = True Me.dash3.Name = "dash3" Me.pic3.Size = New System.Drawing.Size(514, 49) Me.pic3.Location = New System.Drawing.Point(184, 104) Me.pic3.Image = CType(resources.GetObject("pic3.Image"), System.Drawing.Image) Me.pic3.Enabled = True Me.pic3.Cursor = System.Windows.Forms.Cursors.Default Me.pic3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Normal Me.pic3.Visible = True Me.pic3.BorderStyle = System.Windows.Forms.BorderStyle.None Me.pic3.Name = "pic3" Me.pic2.Size = New System.Drawing.Size(511, 46) Me.pic2.Location = New System.Drawing.Point(184, 104) Me.pic2.Image = CType(resources.GetObject("pic2.Image"), System.Drawing.Image) Me.pic2.Visible = False Me.pic2.Enabled = True Me.pic2.Cursor = System.Windows.Forms.Cursors.Default Me.pic2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Normal Me.pic2.BorderStyle = System.Windows.Forms.BorderStyle.None Me.pic2.Name = "pic2" Me.pic1.Size = New System.Drawing.Size(510, 45) Me.pic1.Location = New System.Drawing.Point(184, 104) Me.pic1.Image = CType(resources.GetObject("pic1.Image"), System.Drawing.Image) Me.pic1.Visible = False Me.pic1.Enabled = True Me.pic1.Cursor = System.Windows.Forms.Cursors.Default Me.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Normal Me.pic1.BorderStyle = System.Windows.Forms.BorderStyle.None Me.pic1.Name = "pic1" Me.pic0.Size = New System.Drawing.Size(510, 48) Me.pic0.Location = New System.Drawing.Point(184, 104) Me.pic0.Image = CType(resources.GetObject("pic0.Image"), System.Drawing.Image) Me.pic0.Visible = False Me.pic0.Enabled = True Me.pic0.Cursor = System.Windows.Forms.Cursors.Default Me.pic0.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Normal Me.pic0.BorderStyle = System.Windows.Forms.BorderStyle.None Me.pic0.Name = "pic0" Me._Label3_1.BackColor = System.Drawing.SystemColors.ControlText Me._Label3_1.Text = "There are four different dashboards available with this utility. Please select the radio buttons below to view screenshots of each dashboard." Me._Label3_1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me._Label3_1.ForeColor = System.Drawing.SystemColors.highlightText Me._Label3_1.Size = New System.Drawing.Size(441, 33) Me._Label3_1.Location = New System.Drawing.Point(8, 32) Me._Label3_1.TabIndex = 10 Me._Label3_1.TextAlign = System.Drawing.ContentAlignment.TopLeft Me._Label3_1.Enabled = True Me._Label3_1.Cursor = System.Windows.Forms.Cursors.Default Me._Label3_1.RightToLeft = System.Windows.Forms.RightToLeft.No Me._Label3_1.UseMnemonic = True Me._Label3_1.Visible = True Me._Label3_1.AutoSize = False Me._Label3_1.BorderStyle = System.Windows.Forms.BorderStyle.None Me._Label3_1.Name = "_Label3_1" Me._Label1_1.BackColor = System.Drawing.Color.Black Me._Label1_1.Text = "Dashboard:" Me._Label1_1.Font = New System.Drawing.Font("Arial", 12!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me._Label1_1.ForeColor = System.Drawing.Color.Blue Me._Label1_1.Size = New System.Drawing.Size(97, 25) Me._Label1_1.Location = New System.Drawing.Point(16, 8) Me._Label1_1.TabIndex = 9 Me._Label1_1.TextAlign = System.Drawing.ContentAlignment.TopLeft Me._Label1_1.Enabled = True Me._Label1_1.Cursor = System.Windows.Forms.Cursors.Default Me._Label1_1.RightToLeft = System.Windows.Forms.RightToLeft.No Me._Label1_1.UseMnemonic = True Me._Label1_1.Visible = True Me._Label1_1.AutoSize = False Me._Label1_1.BorderStyle = System.Windows.Forms.BorderStyle.None Me._Label1_1.Name = "_Label1_1" Me.Option1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Option1.BackColor = System.Drawing.Color.Black Me.Option1.Text = "Separate Message Windows (Default)" Me.Option1.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Option1.ForeColor = System.Drawing.SystemColors.highlightText Me.Option1.Size = New System.Drawing.Size(241, 25) Me.Option1.Location = New System.Drawing.Point(16, 288) Me.Option1.TabIndex = 1 Me.Option1.Checked = True Me.Option1.CheckAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Option1.CausesValidation = True Me.Option1.Enabled = True Me.Option1.Cursor = System.Windows.Forms.Cursors.Default Me.Option1.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Option1.Appearance = System.Windows.Forms.Appearance.Normal Me.Option1.TabStop = True Me.Option1.Visible = True Me.Option1.Name = "Option1" Me.Option2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Option2.BackColor = System.Drawing.Color.Black Me.Option2.Text = "One Message Window" Me.Option2.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Option2.ForeColor = System.Drawing.SystemColors.highlightText Me.Option2.Size = New System.Drawing.Size(177, 17) Me.Option2.Location = New System.Drawing.Point(16, 312) Me.Option2.TabIndex = 0 Me.Option2.CheckAlign = System.Drawing.ContentAlignment.MiddleLeft Me.Option2.CausesValidation = True Me.Option2.Enabled = True Me.Option2.Cursor = System.Windows.Forms.Cursors.Default Me.Option2.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Option2.Appearance = System.Windows.Forms.Appearance.Normal Me.Option2.TabStop = True Me.Option2.Checked = False Me.Option2.Visible = True Me.Option2.Name = "Option2" Me.Label5.TextAlign = System.Drawing.ContentAlignment.TopCenter Me.Label5.BackColor = System.Drawing.Color.Black Me.Label5.Text = "There are several configuration options that you can set with this utility. These options include your messaging window(s), dashboard, player list, sound, hint window, and keyboard and mouse controls. A shortcut for this utility has been placed in your NetrekXP Mod program group so if you would like to change these options just re-run this utility." Me.Label5.Font = New System.Drawing.Font("Arial", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label5.ForeColor = System.Drawing.Color.White Me.Label5.Size = New System.Drawing.Size(713, 57) Me.Label5.Location = New System.Drawing.Point(0, 88) Me.Label5.TabIndex = 14 Me.Label5.Enabled = True Me.Label5.Cursor = System.Windows.Forms.Cursors.Default Me.Label5.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Label5.UseMnemonic = True Me.Label5.Visible = True Me.Label5.AutoSize = False Me.Label5.BorderStyle = System.Windows.Forms.BorderStyle.None Me.Label5.Name = "Label5" Me.Label4.TextAlign = System.Drawing.ContentAlignment.TopCenter Me.Label4.BackColor = System.Drawing.SystemColors.ControlText Me.Label4.Text = "NOTE: This will place a fresh copy of the netrekrc file in your Netrek install directory. If you have made any changes to this file they will be overwritten. A copy of your old netrekrc file will be saved as netrekrc.sav. If this is your first time installing please choose your configuration below and click on the Next button." Me.Label4.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label4.ForeColor = System.Drawing.Color.FromARGB(255, 128, 128) Me.Label4.Size = New System.Drawing.Size(713, 41) Me.Label4.Location = New System.Drawing.Point(0, 152) Me.Label4.TabIndex = 11 Me.Label4.Enabled = True Me.Label4.Cursor = System.Windows.Forms.Cursors.Default Me.Label4.RightToLeft = System.Windows.Forms.RightToLeft.No Me.Label4.UseMnemonic = True Me.Label4.Visible = True Me.Label4.AutoSize = False Me.Label4.BorderStyle = System.Windows.Forms.BorderStyle.None Me.Label4.Name = "Label4" Me._Label3_0.BackColor = System.Drawing.Color.Black Me._Label3_0.Text = "There are two message window options with this configuration utility, separated message windows and one message window. Selecting the radio buttons below will show you a screen shot of each option. " Me._Label3_0.Font = New System.Drawing.Font("Arial", 8.25!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me._Label3_0.ForeColor = System.Drawing.SystemColors.highlightText Me._Label3_0.Size = New System.Drawing.Size(409, 49) Me._Label3_0.Location = New System.Drawing.Point(8, 240) Me._Label3_0.TabIndex = 3 Me._Label3_0.TextAlign = System.Drawing.ContentAlignment.TopLeft Me._Label3_0.Enabled = True Me._Label3_0.Cursor = System.Windows.Forms.Cursors.Default Me._Label3_0.RightToLeft = System.Windows.Forms.RightToLeft.No Me._Label3_0.UseMnemonic = True Me._Label3_0.Visible = True Me._Label3_0.AutoSize = False Me._Label3_0.BorderStyle = System.Windows.Forms.BorderStyle.None Me._Label3_0.Name = "_Label3_0" Me._Label1_0.BackColor = System.Drawing.Color.Black Me._Label1_0.Text = "Message Windows:" Me._Label1_0.Font = New System.Drawing.Font("Arial", 12!, System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me._Label1_0.ForeColor = System.Drawing.Color.Blue Me._Label1_0.Size = New System.Drawing.Size(161, 25) Me._Label1_0.Location = New System.Drawing.Point(16, 216) Me._Label1_0.TabIndex = 2 Me._Label1_0.TextAlign = System.Drawing.ContentAlignment.TopLeft Me._Label1_0.Enabled = True Me._Label1_0.Cursor = System.Windows.Forms.Cursors.Default Me._Label1_0.RightToLeft = System.Windows.Forms.RightToLeft.No Me._Label1_0.UseMnemonic = True Me._Label1_0.Visible = True Me._Label1_0.AutoSize = False Me._Label1_0.BorderStyle = System.Windows.Forms.BorderStyle.None Me._Label1_0.Name = "_Label1_0" Me.separate.Size = New System.Drawing.Size(361, 157) Me.separate.Location = New System.Drawing.Point(296, 288) Me.separate.Image = CType(resources.GetObject("separate.Image"), System.Drawing.Image) Me.separate.Enabled = True Me.separate.Cursor = System.Windows.Forms.Cursors.Default Me.separate.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Normal Me.separate.Visible = True Me.separate.BorderStyle = System.Windows.Forms.BorderStyle.None Me.separate.Name = "separate" Me.one.Size = New System.Drawing.Size(357, 155) Me.one.Location = New System.Drawing.Point(296, 288) Me.one.Image = CType(resources.GetObject("one.Image"), System.Drawing.Image) Me.one.Visible = False Me.one.Enabled = True Me.one.Cursor = System.Windows.Forms.Cursors.Default Me.one.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Normal Me.one.BorderStyle = System.Windows.Forms.BorderStyle.None Me.one.Name = "one" Me.Image1.Size = New System.Drawing.Size(132, 70) Me.Image1.Location = New System.Drawing.Point(280, 16) Me.Image1.Image = CType(resources.GetObject("Image1.Image"), System.Drawing.Image) Me.Image1.Enabled = True Me.Image1.Cursor = System.Windows.Forms.Cursors.Default Me.Image1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Normal Me.Image1.Visible = True Me.Image1.BorderStyle = System.Windows.Forms.BorderStyle.None Me.Image1.Name = "Image1" Me.Controls.Add(Command1) Me.Controls.Add(cmdAdd) Me.Controls.Add(Frame1) Me.Controls.Add(Option1) Me.Controls.Add(Option2) Me.Controls.Add(Label5) Me.Controls.Add(Label4) Me.Controls.Add(_Label3_0) Me.Controls.Add(_Label1_0) Me.Controls.Add(separate) Me.Controls.Add(one) Me.Controls.Add(Image1) Me.Frame1.Controls.Add(dash0) Me.Frame1.Controls.Add(dash2) Me.Frame1.Controls.Add(dash1) Me.Frame1.Controls.Add(dash3) Me.Frame1.Controls.Add(pic3) Me.Frame1.Controls.Add(pic2) Me.Frame1.Controls.Add(pic1) Me.Frame1.Controls.Add(pic0) Me.Frame1.Controls.Add(_Label3_1) Me.Frame1.Controls.Add(_Label1_1) Me.Label1.SetIndex(_Label1_1, CType(1, Short)) Me.Label1.SetIndex(_Label1_0, CType(0, Short)) Me.Label3.SetIndex(_Label3_1, CType(1, Short)) Me.Label3.SetIndex(_Label3_0, CType(0, Short)) CType(Me.Label3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Label1, System.ComponentModel.ISupportInitialize).EndInit() Me.Frame1.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() End Sub #End Region End Class --- NEW FILE: Form3.vb --- Option Strict Off Option Explicit On Friend Class Form3 Inherits System.Windows.Forms.Form ' Netrek Configurator v1.0 - written by Joe Evango ' ' Program notes from Joe 4/30/06- ' Code contains some comments, pretty easy to follow the logic. ' I am currently using a config directory that contains two netrekrc files, netrek.one and netrek.sep. ' This is done for the two messaging window configs. This should be easy enough to implement into the code ' in order to eliminate the extra sub directory and files if someone has time. ' ' This utility writes to the netrekrc file and assumes it is in located the same folder as the utility so if the ' netrekrc file does not exist the utility will not run properly and error out. When it is run it will also save ' your old netrekrc file as netrek.sav. ' ' Since Netrek code has always been freely shared in the community I will do the same with this config utility. ' Please feel free to help improve the utility and/or include the utility as an add-on if you are working on ' a Windows client. Also feel free to use the logic in this code to create a config utility for another OS. It ' took a while to put the keymap portion of this together but it works well. I only ask that if any modifications ' are made you also make your code changes available to the community. It would also be nice if I was mentioned as ' a contributor in your code comments. 'Keymap configuration Private Sub Command1_Click(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles Command1.Click Dim fnum2 As Object Dim fnum3 As Object Dim FileName As String Dim Application As String Dim keymap As String Dim buttonmap As String Dim torpedo As String Dim phaser As String Dim shield As String Dim bomb As String Dim cloak As String Dim drop As String Dim pickup As String Dim tractor As String Dim pressor As String Dim maxwarp As String Dim halfspeed As String Dim repair As String Dim refit As String Dim tlock As String Dim info As String Dim quit As String Dim detown As String Dim detenemy As String Dim plasma As String Dim warp0 As String Dim warp2 As String Dim warp3 As String Dim warp4 As String Dim print1 As String Dim print2 As String Dim keymap1 As String Dim keymap2 As String Dim keymap3 As String Dim keymap4 As String Dim keymap5 As String Dim keymap6 As String Dim keymap7 As String Dim keymap8 As String Dim keymap9 As String Dim keymap10 As String Dim keymap11 As String Dim keymap12 As String Dim keymap13 As String Dim keymap14 As String Dim keymap15 As String Dim keymap16 As String Dim keymap17 As String Dim keymap18 As String Dim keymap19 As String Dim keymap20 As String Dim keymap21 As String Dim keymap22 As String Dim keymap23 As String Dim mousetag As String Dim keytag As String Dim configtag As String Dim a As Short Dim b As Short Dim c As Short Dim m As String Dim h As String Dim duplicate As Short Dim speckey As Short Dim currentdate As String currentdate = CStr(Today) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' fnum3 = FreeFile 'UPGRADE_WARNING: Couldn't resolve default property of object fnum2. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' fnum2 = FreeFile m = "m" h = "h" torpedo = "t" phaser = "f" shield = "s" bomb = "b" cloak = "c" drop = "x" pickup = "z" tractor = "T" pressor = "y" maxwarp = "@" halfspeed = "#" repair = "R" refit = "r" tlock = "l" info = "i" quit = "\" detown = "D" detenemy = "d" plasma = "g" warp0 = "0" warp2 = "2" warp3 = "3" warp4 = "4" FileName = ".\controls.txt" Application = "Notepad.exe" If torpedo = Text1(0).Text Then keymap1 = "" Else keymap1 = Text1(0).Text & torpedo End If If phaser = Text1(1).Text Then keymap2 = "" Else keymap2 = Text1(1).Text & phaser End If If shield = Text1(2).Text Then keymap3 = "" Else keymap3 = Text1(2).Text & shield End If If bomb = Text1(3).Text Then keymap4 = "" Else keymap4 = Text1(3).Text & bomb End If If cloak = Text1(4).Text Then keymap5 = "" Else keymap5 = Text1(4).Text & cloak End If If drop = Text1(5).Text Then keymap6 = "" Else keymap6 = Text1(5).Text & drop End If If pickup = Text1(6).Text Then keymap7 = "" Else keymap7 = Text1(6).Text & pickup End If If pressor = Text1(7).Text Then keymap8 = "" Else keymap8 = Text1(7).Text & pressor End If If tractor = Text1(8).Text Then keymap9 = "" Else keymap9 = Text1(8).Text & tractor End If If maxwarp = Text1(9).Text Then keymap10 = "" Else keymap10 = Text1(9).Text & maxwarp End If If halfspeed = Text1(10).Text Then keymap11 = "" Else keymap11 = Text1(10).Text & halfspeed End If If repair = Text1(11).Text Then keymap12 = "" Else keymap12 = Text1(11).Text & repair End If If refit = Text1(12).Text Then keymap13 = "" Else keymap13 = Text1(12).Text & refit End If If tlock = Text1(13).Text Then keymap14 = "" Else keymap14 = Text1(14).Text & tlock End If If info = Text1(14).Text Then keymap15 = "" Else keymap15 = Text1(14).Text & info End If If quit = Text1(15).Text Then keymap16 = "" Else keymap16 = Text1(15).Text & quit End If If detown = Text1(16).Text Then keymap17 = "" Else keymap17 = Text1(16).Text & detown End If If detenemy = Text1(17).Text Then keymap18 = "" Else keymap18 = Text1(17).Text & detenemy End If If plasma = Text1(18).Text Then keymap19 = "" Else keymap19 = Text1(18).Text & plasma End If If warp0 = Text1(19).Text Then keymap20 = "" Else keymap20 = Text1(19).Text & warp0 End If If warp2 = Text1(20).Text Then keymap21 = "" Else keymap21 = Text1(20).Text & warp2 End If If warp3 = Text1(21).Text Then keymap22 = "" Else keymap22 = Text1(21).Text & warp3 End If If warp4 = Text1(22).Text Then keymap23 = "" Else keymap23 = Text1(22).Text & warp4 End If speckey = 0 duplicate = 0 For a = 0 To 22 For b = 0 To 22 If a <> b And Text1(a).Text = Text1(b).Text Then duplicate = 1 Exit For End If Next b If duplicate = 1 Then MsgBox("The key '" & Text1(a).Text & "' 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 For c = 0 To 22 If Text1(c).Text = "m" Then speckey = 1 End If If Text1(c).Text = "h" Then speckey = 1 End If If Text1(c).Text = "w" Then speckey = 1 End If If speckey = 1 Then MsgBox("You cannot use the 'm', 'h', or 'w' keys. These are used for messaging, help, and war declarations. Please assign different keys to these controls.") Exit For End If Next c If duplicate = 0 And speckey = 0 Then ' Open the file for append. 'UPGRADE_WARNING: Couldn't resolve default property of object fnum2. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' FileOpen(fnum2, ".\netrekrc", OpenMode.Append) ' Add the command. If Combo1.Text = "Torpedoes" Then buttonmap = "buttonmap:" & "1" & Text1(0).Text End If If Combo1.Text = "Phasers" Then buttonmap = "buttonmap:" & "1" & Text1(1).Text End If keymap = "keymap:" & "\Qq0Q0gffp" & keymap1 & keymap2 & keymap3 & keymap4 & keymap5 & keymap6 & keymap7 & keymap8 & keymap9 & keymap10 & keymap11 & keymap12 & keymap13 & keymap14 & keymap15 & keymap16 & keymap17 & keymap18 & keymap19 & keymap20 & keymap21 & keymap22 & keymap23 keytag = "###Keymap added by the Netrek Configurator on " & currentdate mousetag = "###Buttonmap added by the Netrek Configurator on " & currentdate 'UPGRADE_WARNING: Couldn't resolve default property of object fnum2. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum2, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum2. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum2, keytag) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum2. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum2, keymap) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum2. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum2, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum2. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum2, mousetag) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum2. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum2, buttonmap) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum2. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' FileClose(fnum2) ' Opens the controls you chose in notepad for reference 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' FileOpen(fnum3, ".\controls.txt", OpenMode.Output) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "These are the controls you have chosen:") 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Mouse Controls:") 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Left Button - " & Combo1.Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Middle Button - " & "Unmap Special Windows (i.e. Close tip window)") 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Right Button - " & "Steer") 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Keyboard Controls:") 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Messaging - " & "m (Be sure to hold your mouse cursor over") 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, " " & "the Galaxy or Tactical maps when you press 'm'.") 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, " " & "After pressing 'm' type 'A' to send messages to") 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, " " & "the All Window, type 'T' to send messages") 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, " " & "to the Team Window, or type the letter/number") 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, " " & "of the player you would like to send a message to.") 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, " " & "After you type A, T, or the player letter/number, ") 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, " " & "type your message and press enter.)") 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Help - " & "h") 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Torpedoes - " & Text1(0).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Phasers - " & Text1(1).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Shield - " & Text1(2).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Bomb - " & Text1(3).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Cloak - " & Text1(4).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Drop Armies - " & Text1(5).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Pickup Armies - " & Text1(6).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Detonate Own Torps - " & Text1(16).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Detonate Enemy Torps - " & Text1(17).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Tractor - " & Text1(8).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Pressor - " & Text1(7).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Repair - " & Text1(11).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Refit Ship Type - " & Text1(12).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Lock on Target - " & Text1(13).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Target Info - " & Text1(14).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Max Warp - " & Text1(9).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Half Speed - " & Text1(10).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Quit - " & Text1(15).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Plasma - " & Text1(18).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, Chr(13)) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Warp 0 - " & Text1(19).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Warp 2 - " & Text1(20).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Warp 3 - " & Text1(21).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' PrintLine(fnum3, "Warp 4 - " & Text1(22).Text) 'UPGRADE_WARNING: Couldn't resolve default property of object fnum3. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="6A50421D-15FE-4896-8A1B-2EC21E9037B2"' FileClose(fnum3) Me.Close() MsgBox("YOUR CONFIGURATION HAS BEEN CREATED! After you click on OK a document with the controls you have chosen will open. A shortcut to this document has been created in your Netrek Config Utility program group. If you need additional assistance please visit www.netrek.org.") Shell(Application & " " & FileName, AppWinStyle.NormalFocus) Else End If End Sub End Class --- NEW FILE: Form1.vb --- Option Strict Off Option Explicit On Friend Class Form1 Inherits System.Windows.Forms.Form ' Netrek Configurator v1.0 - written by Joe Evango ' ' Program notes from Joe 4/30/06- ' Code contains some comments, pretty easy to follow the logic. ' I am currently using a config directory that contains two netrekrc files, netrek.one and netrek.sep. ' This is done for the two messaging window configs. This should be easy enough to implement into the code ' in order to eliminate the extra sub directory and files if someone has time. ' ' This utility writes to the netrekrc file and assumes it is in located the same folder as the utility so if the ' netrekrc file does not exist the utility will not run properly and error out. When it is run it will also save ' your old netrekrc file as netrek.sav. ' ' Since Netrek code has always been freely shared in the community I will do the same with this config utility. ' Please feel free to help improve the utility and/or include the utility as an add-on if you are working on ' a Windows client. Also feel free to use the logic in this code to create a config utility for another OS. It ' took a while to put the keymap portion of this together but it works well. I only ask that if any modifications ' are made you also make your code changes available to the community. It would also be nice if I was mentioned as ' a contributor in your code comments. Dim screen As Short Dim dash As Short Private Sub cmdAdd_Click(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles cmdAdd.Click Dim fnum As Short Dim txt As String Dim configtag As String Dim currentdate As String currentdate = CStr(Today) fnum = FreeFile ' Three section message window, saves your old netrekrc If screen = 0 Then FileCopy(".\netrekrc", ".\netrekrc.sav") FileCopy(".\configs\netrekrc.sep", ".\netrekrc") Else ' One section message window, saves your old netrekrc FileCopy(".\netrekrc", ".\netrekrc.sav") FileCopy(".\configs\netrekrc.one", ".\netrekrc") End If ' Open the file for append. FileOpen(fnum, ".\netrekrc", OpenMode.Append) ' Add the command. If dash = 0 Then txt = "newdashboard: 0" End If If dash = 1 Then txt = "newdashboard: 1" End If If dash = 2 Then txt = "newdashboard: 2" End If If dash = 3 Then txt = "newdashboard: 3" End If configtag = "###Configuration changes added by the Netrek Configurator on " & currentdate PrintLine(fnum, Chr(13)) PrintLine(fnum, configtag) PrintLine(fnum, Chr(13)) PrintLine(fnum, txt) ' Close the file. FileClose(fnum) ' MsgBox "Your configuration has been saved" Form2.Show() Me.Close() End Sub Private Sub Command1_Click(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles Command1.Click Me.Close() End Sub ' Pick a dashboard 'UPGRADE_WARNING: Event dash0.CheckedChanged may fire when form is initialized. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="88B12AE1-6DE0-48A0-86F1-60C0686C026A"' Private Sub dash0_CheckedChanged(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles dash0.CheckedChanged If eventSender.Checked Then dash = 0 pic0.Visible = True pic1.Visible = False pic2.Visible = False pic3.Visible = False End If End Sub 'UPGRADE_WARNING: Event dash1.CheckedChanged may fire when form is initialized. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="88B12AE1-6DE0-48A0-86F1-60C0686C026A"' Private Sub dash1_CheckedChanged(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles dash1.CheckedChanged If eventSender.Checked Then dash = 1 pic0.Visible = False pic1.Visible = True pic2.Visible = False pic3.Visible = False End If End Sub 'UPGRADE_WARNING: Event dash2.CheckedChanged may fire when form is initialized. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="88B12AE1-6DE0-48A0-86F1-60C0686C026A"' Private Sub dash2_CheckedChanged(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles dash2.CheckedChanged If eventSender.Checked Then dash = 2 pic0.Visible = False pic1.Visible = False pic2.Visible = True pic3.Visible = False End If End Sub 'UPGRADE_WARNING: Event dash3.CheckedChanged may fire when form is initialized. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="88B12AE1-6DE0-48A0-86F1-60C0686C026A"' Private Sub dash3_CheckedChanged(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles dash3.CheckedChanged If eventSender.Checked Then dash = 3 pic0.Visible = False pic1.Visible = False pic2.Visible = False pic3.Visible = True End If End Sub Private Sub Form1_Load(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles MyBase.Load dash = 3 End Sub 'UPGRADE_WARNING: Event Option1.CheckedChanged may fire when form is initialized. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="88B12AE1-6DE0-48A0-86F1-60C0686C026A"' Private Sub Option1_CheckedChanged(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles Option1.CheckedChanged If eventSender.Checked Then screen = 0 one.Visible = False separate.Visible = True End If End Sub 'UPGRADE_WARNING: Event Option2.CheckedChanged may fire when form is initialized. Click for more: 'ms-help://MS.VSExpressCC.v80/dv_commoner/local/redirect.htm?keyword="88B12AE1-6DE0-48A0-86F1-60C0686C026A"' Private Sub Option2_CheckedChanged(ByVal eventSender As System.Object, ByVal eventArgs As System.EventArgs) Handles Option2.CheckedChanged If eventSender.Checked Then screen = 1 separate.Visible = False one.Visible = True End If End Sub End Class --- NEW FILE: netrekconfig.sln --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Form2.resX --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _UpgradeReport.htm --- (This appears to be a binary file; contents omitted.) --- NEW FILE: netrekconfig.vbproj --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Mon Jun 12 04:14:12 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 09:14:12 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/configs netrekrc.one, NONE, 1.1 netrekrc.sep, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/configs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13747/tools/VBasic config utility/configs Added Files: netrekrc.one netrekrc.sep Log Message: Adding Joe Evango's Visual Basic configuration utiity to client source code. Not used in Netrek XP 2006, but left here in case anyone wants to use it or improve on it. --- NEW FILE: netrekrc.one --- ########################## Login Options ################################### name:guest login:new-be-nice ########################### Network Options ################################## dontPing: on useRSA: on askForUpdate: on tryUDP: on tryShort: on updatesPerSec: 10 udpClientReceive: 1 udpClientSend: 1 udpDebug: 0 udpSequenceChk: off netStatFreq: 3 netstats: off newMesgFlags: on agriCAPS: on ############################## Key Maps ###################################### buttonmap: keymap:\Qa at q0Q0gffp ########################### Sound stuff ###################################### sound: on sounddir: .\Sounds ############################ Mouse Options ################################### continuousMouse: on motionThresh: 0 tpdotdist: 10 shiftedMouse: off ########################### Options ########################################## forceDisplay: 0 forceMono: 0 cloakChars: ?? clock: 1 colorfulPhasers: on continueTractor: on defaultShip: CA dashboard: on enemyPhasers: 1 phasorShrink: 16 theirPhasorShrink: 16 shrinkPhasorOnMiss: on extraAlertBorder: on galacticFrequent: on keepInfo: 15 keepPeace: on logMessage: off macroKey: TAB messageHUD: 2 metaStatusLevel: 4 PhaserMsg: 5 phaserMsgI: on phaserShrink: 6 phaserStats: on phaserWindow: on reportKills: on shortKillMesg: on showFuelOnLocal: off showGalactic: 1 showLocal: 1 showLock: 3 showMapPlanetNames: on showMySpeed: off showPlanetNames: on showPlayerStatus: on showShields: on showStats: off showTractorPressor: on sortPlayers: on ########################### WINDOW PLACEMENT ################################## ############################################################################### # Fonts # #Valid values are 8,9,10, and 13 fontsize: 10 ############################################################################### # Window placement # # Since changing fonts causes changes to the window sizes # this section has gone through many revisions as well # # The next iteration of all this using the new dashboard.... # I don't usually want to see the MOTD until I'm in # To encourage motd reading I'll activate this - jn WaitMotd.mapped: on ## The main window -- only map it when there's no wait queue netrek.geometry: 1150x875+0 # the maximal window for my sparc 2 #This is a Win32-only option. Hitting ALT-ENTER during #the game will toggle the caption bar also. netrek.w32caption: on war.geometry: +700 help.parent: netrek help.geometry: 500x25+0+525 planet.parent: netrek planet.geometry: +20 ## Ok, on the left side we have a column of six windows; message, ## warning, new dash (ie tstats), my messages, team messages, all ## messages. I have the total messages maped to cover this whole area ## so by using ? you can toggle between seeing the broken up messages ## or the total window. The stats window has been removed in favor of ## the new dashboard. # The icon #netrek_icon.geometry: +1031+0 # The main window #netrek.geometry: +0+0 netrek.mapped # The player list #player.geometry: 85x25+0+559 player.geometry: 84x25+504+543 player.mapped: on # Main message window review.geometry: 81x20+1+555 review.scrollbar: on # Kills message window #review_kill.geometry: 80x10+512+600 # This puts the war window to the right of the options window. (Wow! Neat!) war.geometry: +800 tstat.geometry: +1 #warn.geometry: +512 #message.geometry: +512 message.parent: netrek message.geometry: 506x19+504+504 message.mapped: on warn.parent: netrek warn.geometry: 506x18+504+523 warn.mapped: on ## a couple of other window mappings # # Some UDP stuff udp.geometry: +0+0 udp.mapped: off # I'm planning on using the new dash instead showstats: off stats.parent: netrek stats.geommac.s.%i:%y loss, %v ping, %V stddev stats geometry: 160x108+332+550 # puts the stats window further down stats.geometry: 160x94+842+500 #MACROS dist.taking: (%c) %i Carrying %a to %l @ %n with %f fuel, %d damage dist.help: (%c) %i NEEDS HELP NOW! I have %a armies, %d damage, %s shields! dist.space_control: HELP CONTROL AT %l! GET THERE NOW! lite.taking: /c/l /0 /| %c carrying to %l | lite.space_control: /l /| %l in danger | lite.pickup: /h /| %p++ @ %l | lite.help: %?%S=SB%{/c%}%?%a>0%{/c%} /| %c needs help | /0 lite.crippled:/h | %h is cripple | mac.1.A: % _ _ ____ _____ __ __ ____ ____ ____ mac.1.A: | \| || _ | |_ _| ___ | \/ || _ || _ \| ___| mac.1.A: | || |_|| | | |___| | || |_||| |_| | ___| mac.1.A: |_|\_||____| |_| |_|\/|_||____||____/|____| mac.3.A:% /~\ |_| ~|~ |_| (~ |_| | | |\/| /~\ |\| | ~|~ \./ | mac.3.A:% \_/ | | , | | | (_ | | |_| | | |~| | | | | | . mac.4.T:% /`\ /~_ /~_ ~|~ |_| <~ |~> .^. <~ <~ | mac.4.T:% \./ \_/ \_/ | | | <_ |_> |~| _> <_ . mac.6.T:% | | <~ | |~) \./ /~\ | | |~) |~> /\ (~ <~ \~/ \~/ mac.6.T:% |~| <_ |_ |~ | \_/ |_| |~\ |_> /~~\ _) <_ o o mac.g.A:% ---- __| __| \ | _ \ __|_ _| _ \ __| mac.g.A:% ---- (_ | _| . | ( | ( | | | _| mac.g.A:% ----\___|___|_|\_|\___/ \___|___|___/ ___| mac.m.A:% ,__, Moo! mac.m.A:% (..)/___ mac.m.A:% (__) )\ mac.m.A:% ||--|| * mac.L.A:_____\\ ~ ~ //__"What just happened?"_ mac.L.A:_____(/ @ @ /)________________________ mac.L.A:___oOOo-(_)-oOOo <-(%p)%U --- NEW FILE: netrekrc.sep --- ########################## Login Options ################################### name:guest login:new-be-nice ########################### Network Options ################################## dontPing: on useRSA: on askForUpdate: on tryUDP: on tryShort: on updatesPerSec: 10 udpClientReceive: 1 udpClientSend: 1 udpDebug: 0 udpSequenceChk: off netStatFreq: 3 netstats: off newMesgFlags: on agriCAPS: on ############################## Key Maps ###################################### buttonmap: keymap:\Qa at q0Q0gffp ########################### Sound stuff ###################################### sound: on sounddir: .\Sounds ############################ Mouse Options ################################### continuousMouse: on motionThresh: 0 tpdotdist: 10 shiftedMouse: off ########################### Options ########################################## forceDisplay: 0 forceMono: 0 cloakChars: ?? clock: 1 colorfulPhasers: on continueTractor: on defaultShip: CA dashboard: on enemyPhasers: 1 phasorShrink: 16 theirPhasorShrink: 16 shrinkPhasorOnMiss: on extraAlertBorder: on galacticFrequent: on keepInfo: 15 keepPeace: on logMessage: off macroKey: TAB messageHUD: 2 metaStatusLevel: 4 PhaserMsg: 5 phaserMsgI: on phaserShrink: 6 phaserStats: on phaserWindow: on reportKills: on shortKillMesg: on showFuelOnLocal: off showGalactic: 1 showLocal: 1 showLock: 3 showMapPlanetNames: on showMySpeed: off showPlanetNames: on showPlayerStatus: on showShields: on showStats: off showTractorPressor: on sortPlayers: on ########################### WINDOW PLACEMENT ################################## ############################################################################### # Fonts # #Valid values are 8,9,10, and 13 fontsize: 10 ############################################################################### # Window placement # # Since changing fonts causes changes to the window sizes # this section has gone through many revisions as well # # The next iteration of all this using the new dashboard.... # I don't usually want to see the MOTD until I'm in # To encourage motd reading I'll activate this - jn WaitMotd.mapped: on ## The main window -- only map it when there's no wait queue netrek.geometry: 1150x875+0 # the maximal window for my sparc 2 #This is a Win32-only option. Hitting ALT-ENTER during #the game will toggle the caption bar also. netrek.w32caption: on war.geometry: +700 help.parent: netrek help.geometry: 500x25+0+525 planet.parent: netrek planet.geometry: +20 ## Ok, on the left side we have a column of six windows; message, ## warning, new dash (ie tstats), my messages, team messages, all ## messages. I have the total messages maped to cover this whole area ## so by using ? you can toggle between seeing the broken up messages ## or the total window. The stats window has been removed in favor of ## the new dashboard. message.parent: netrek message.geometry: 502x19+508+504 message.mapped: on warn.parent: netrek warn.geometry: 502x18+508+523 warn.mapped: on tstat.parent: netrek tstat.geometry: 510x45+0+504 tstat.mapped: on review_your.parent: netrek review_your.geometry: 82x4+0+547 review_your.mapped: on review_team.parent: netrek review_team.geometry: 82x7+0+595 review_team.mapped: on review_all.parent: netrek review_all.geometry: 82x3+0+673 review_all.mapped: on ## With this setup, you can use "?" to cycle between the big review window, the ## four small message windows, and no windows at all. # review.parent: netrek review.geometry: 82x20+0+547 review.mapped: off ## phaser window ## dunno if the following line is really needed or not.... phaserWindow: on ## 0 = don't show 1 = all 2 = team 3 = indiv ## 4 = kill 5 = total PhaserMsg: 1 #(show hit percentage on phaser messages) PhaserStats: on player.parent: netrek player.geometry: +508+542 player.mapped: on reportkills: on review_kill.parent: netrek review.geometry: 80x40+510+170 review_kill.geometry: 82x4+0+712 review_kill.mapped: on ## a couple of other window mappings # # Some UDP stuff udp.geometry: +0+0 udp.mapped: off # I'm planning on using the new dash instead showstats: off stats.parent: netrek stats.geommac.s.%i:%y loss, %v ping, %V stddev stats geometry: 160x108+332+550 # puts the stats window further down stats.geometry: 160x94+842+500 #MACROS dist.taking: (%c) %i Carrying %a to %l @ %n with %f fuel, %d damage dist.help: (%c) %i NEEDS HELP NOW! I have %a armies, %d damage, %s shields! dist.space_control: HELP CONTROL AT %l! GET THERE NOW! lite.taking: /c/l /0 /| %c carrying to %l | lite.space_control: /l /| %l in danger | lite.pickup: /h /| %p++ @ %l | lite.help: %?%S=SB%{/c%}%?%a>0%{/c%} /| %c needs help | /0 lite.crippled:/h | %h is cripple | mac.H.A:% /~\ |_| ~|~ |_| (~ |_| | | |\/| /~\ |\| | ~|~ \./ | mac.H.A:% \_/ | | , | | | (_ | | |_| | | |~| | | | | | . mac.O.T:% /`\ /~_ /~_ ~|~ |_| <~ |~> .^. <~ <~ | mac.O.T:% \./ \_/ \_/ | | | <_ |_> |~| _> <_ . mac.D.T:% | | <~ | |~) \./ /~\ | | |~) |~> /\ (~ <~ \~/ \~/ mac.D.T:% |~| <_ |_ |~ | \_/ |_| |~\ |_> /~~\ _) <_ o o mac.g.A:% ---- __| __| \ | _ \ __|_ _| _ \ __| mac.g.A:% ---- (_ | _| . | ( | ( | | | _| mac.g.A:% ----\___|___|_|\_|\___/ \___|___|___/ ___| mac.m.A:% ,__, Moo! mac.m.A:% (..)/___ mac.m.A:% (__) )\ mac.m.A:% ||--|| * mac.L.A:_____\\ ~ ~ //__"What just happened?"_ mac.L.A:_____(/ @ @ /)________________________ mac.L.A:___oOOo-(_)-oOOo <-(%p)%U From modemhero at users.sourceforge.net Mon Jun 12 04:14:12 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 09:14:12 +0000 Subject: [netrek-cvs] client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/bin Netrek_Configurator.vshost.exe, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/tools/VBasic config utility/Netrek_Configurator.NET/bin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13747/tools/VBasic config utility/Netrek_Configurator.NET/bin Added Files: Netrek_Configurator.vshost.exe Log Message: Adding Joe Evango's Visual Basic configuration utiity to client source code. Not used in Netrek XP 2006, but left here in case anyone wants to use it or improve on it. --- NEW FILE: Netrek_Configurator.vshost.exe --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Mon Jun 12 09:10:33 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 14:10:33 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.35, 1.36 local.c, 1.41, 1.42 makefile, 1.10, 1.11 map.c, 1.19, 1.20 mswindow.c, 1.34, 1.35 newwin.c, 1.37, 1.38 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13810/src Modified Files: data.c local.c makefile map.c mswindow.c newwin.c Log Message: Fixed case of view box not updating under certain circumstances, like flipping through options menus Changed drawing of the new ship bitmaps to overwrite any other image on the screen, except for where the ship source bitmap is black (black treated as transparent). Logic being that ship draws should take precedence over things like planet and planet resource draws, to make it easier to see the new ships. Removed the clock masking bitmap, instead using true transparent drawing Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- mswindow.c 11 Jun 2006 20:53:52 -0000 1.34 +++ mswindow.c 12 Jun 2006 14:10:31 -0000 1.35 @@ -504,7 +504,6 @@ // Free other bitmaps free (clockpic); free (clockhandpic); - free (clockhandmask); for (j = 0; j < NUM_CTORP_TYPES; j++) { @@ -5151,6 +5150,7 @@ } } +/* Copy over destination imagemap, but make any black in source image transparent */ void W_OverlayScaleBitmap (int x, int y, @@ -5236,8 +5236,7 @@ xForm.eDy = eDy; SetWorldTransform(hdc,&xForm); - - BitBlt(hdc, 0, 0, newwidth, newheight, GlobalMemDC2, srcx, srcy, SRCAND); + TransparentBlt(hdc, 0, 0, newwidth, newheight, GlobalMemDC2, srcx, srcy, newwidth, newheight, colortable[BLACK].rgb); // Reset xForm xForm.eM11 = (FLOAT) 1.0; @@ -5270,7 +5269,7 @@ else if ((newheight = (usebitmaphwnd? bitmap->ClipRectAddr->bottom : win->ClipRect.bottom) - y) > destheight) newheight = destheight; - BitBlt(hdc, x, y, newwidth, newheight, GlobalMemDC2, srcx, srcy, SRCAND); + TransparentBlt(hdc, x, y, newwidth, newheight, GlobalMemDC2, srcx, srcy, newwidth, newheight, colortable[BLACK].rgb); } SelectObject (GlobalMemDC2, GlobalOldMemDC2Bitmap); //So we don't crunch on the next line... Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- newwin.c 11 Jun 2006 20:53:52 -0000 1.37 +++ newwin.c 12 Jun 2006 14:10:31 -0000 1.38 @@ -1313,10 +1313,7 @@ BMP_CCLOCK_HEIGHT, BMP_CLOCK, qwin, LR_DEFAULTCOLOR); clockhandpic = W_StoreBitmap3 ("bitmaps/misclib/color/clockhand.bmp", BMP_CHAND_WIDTH, - BMP_CHAND_HEIGHT, BMP_CLOCKHAND, qwin, LR_DEFAULTCOLOR); - clockhandmask = - W_StoreBitmap3 ("bitmaps/misclib/color/clockhandmask.bmp", BMP_CHAND_WIDTH, - BMP_CHAND_HEIGHT, BMP_CLOCKHAND, qwin, LR_MONOCHROME); + BMP_CHAND_HEIGHT, BMP_CLOCKHAND, qwin, LR_DEFAULTCOLOR); } else { @@ -2100,9 +2097,6 @@ W_WriteBitmap ( CLOCK_BDR, CLOCK_BDR, clockpic, foreColor, qwin); W_OverlayScaleBitmap (CLOCK_BDR, CLOCK_BDR, BMP_CHAND_WIDTH, BMP_CHAND_HEIGHT, BMP_CHAND_WIDTH, BMP_CHAND_HEIGHT, - angle, clockhandmask, foreColor, qwin); - W_WriteScaleBitmap (CLOCK_BDR, CLOCK_BDR, BMP_CHAND_WIDTH, BMP_CHAND_HEIGHT, - BMP_CHAND_WIDTH, BMP_CHAND_HEIGHT, angle, clockhandpic, foreColor, qwin); sprintf (buf, "%d", max - time); tx = cx - W_Textwidth * strlen (buf) / 2; Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- local.c 9 Jun 2006 22:08:40 -0000 1.41 +++ local.c 12 Jun 2006 14:10:30 -0000 1.42 @@ -983,16 +983,16 @@ } else { - W_WriteScaleBitmap (dx - (j->p_ship.s_width / 2), - dy - (j->p_ship.s_height / 2), - j->p_ship.s_width, - j->p_ship.s_height, - BMP_SHIP_WIDTH_HR, - BMP_SHIP_HEIGHT_HR, - (360 * j->p_dir/255), // Converted to angle - ship_bitsHR[j->p_ship.s_type], - playerColor (j), - w); + W_OverlayScaleBitmap (dx - (j->p_ship.s_width / 2), + dy - (j->p_ship.s_height / 2), + j->p_ship.s_width, + j->p_ship.s_height, + BMP_SHIP_WIDTH_HR, + BMP_SHIP_HEIGHT_HR, + (360 * j->p_dir/255), // Converted to angle + ship_bitsHR[j->p_ship.s_type], + playerColor (j), + w); } if (j->p_cloakphase > 0) Index: makefile =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- makefile 12 May 2006 01:58:37 -0000 1.10 +++ makefile 12 Jun 2006 14:10:31 -0000 1.11 @@ -26,7 +26,7 @@ # Libs LIBOPTS = /L..\Win32\lib\BCC /Tpe -LIBS = SDL.LIB SDL_mixer.LIB SDLmain.LIB CW32mt.LIB IMPORT32.LIB user32.lib gdi32.lib wsock32.lib kernel32.lib shell32.lib winmm.lib mpr.lib $(GMPLIB) +LIBS = SDL.LIB SDL_mixer.LIB SDLmain.LIB CW32mt.LIB IMPORT32.LIB user32.lib gdi32.lib wsock32.lib kernel32.lib shell32.lib winmm.lib mpr.lib msimg32.lib $(GMPLIB) INCS = -I..\win32 -I..\win32\h -I..\win32\SDL -I..\win32\h\gmp -I..\include Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- data.c 11 Jun 2006 20:53:52 -0000 1.35 +++ data.c 12 Jun 2006 14:10:29 -0000 1.36 @@ -246,7 +246,7 @@ extern double Sin[], Cos[]; -W_Icon stipple, clockpic, clockhandpic, clockhandmask, genopic, genopic2, icon; +W_Icon stipple, clockpic, clockhandpic, genopic, genopic2, icon; W_Color borderColor, backColor, textColor, myColor, warningColor, shipCol[5], rColor, yColor, gColor, unColor, foreColor; Index: map.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/map.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- map.c 11 Jun 2006 20:53:52 -0000 1.19 +++ map.c 12 Jun 2006 14:10:31 -0000 1.20 @@ -740,7 +740,7 @@ clearlock = 0; clearviewbox = 0; - viewboxcleared = 0; + viewboxcleared = 1; for (i = 0; i < MAXPLAYER; i++) { From modemhero at users.sourceforge.net Mon Jun 12 09:10:31 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 14:10:31 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.31,1.32 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13810/include Modified Files: data.h Log Message: Fixed case of view box not updating under certain circumstances, like flipping through options menus Changed drawing of the new ship bitmaps to overwrite any other image on the screen, except for where the ship source bitmap is black (black treated as transparent). Logic being that ship draws should take precedence over things like planet and planet resource draws, to make it easier to see the new ships. Removed the clock masking bitmap, instead using true transparent drawing Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- data.h 11 Jun 2006 20:53:52 -0000 1.31 +++ data.h 12 Jun 2006 14:10:29 -0000 1.32 @@ -244,7 +244,7 @@ extern double Sin[], Cos[]; -extern W_Icon stipple, clockpic, clockhandpic, clockhandmask, genopic, genopic2; +extern W_Icon stipple, clockpic, clockhandpic, genopic, genopic2; extern W_Icon base_expview; extern W_Icon expview[BMP_SHIPEXPL_FRAMES]; From modemhero at users.sourceforge.net Mon Jun 12 09:10:31 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 14:10:31 +0000 Subject: [netrek-cvs] client/netrekxp/resources/misclib/color clockhand.bmp, 1.2, 1.3 clockhandmask.bmp, 1.1, NONE Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/misclib/color In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13810/resources/misclib/color Modified Files: clockhand.bmp Removed Files: clockhandmask.bmp Log Message: Fixed case of view box not updating under certain circumstances, like flipping through options menus Changed drawing of the new ship bitmaps to overwrite any other image on the screen, except for where the ship source bitmap is black (black treated as transparent). Logic being that ship draws should take precedence over things like planet and planet resource draws, to make it easier to see the new ships. Removed the clock masking bitmap, instead using true transparent drawing Index: clockhand.bmp =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/misclib/color/clockhand.bmp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvsrQoQvE and /tmp/cvsykGogY differ --- clockhandmask.bmp DELETED --- From modemhero at users.sourceforge.net Mon Jun 12 09:10:31 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 14:10:31 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.70,1.71 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13810/resources/docs Modified Files: changes.txt Log Message: Fixed case of view box not updating under certain circumstances, like flipping through options menus Changed drawing of the new ship bitmaps to overwrite any other image on the screen, except for where the ship source bitmap is black (black treated as transparent). Logic being that ship draws should take precedence over things like planet and planet resource draws, to make it easier to see the new ships. Removed the clock masking bitmap, instead using true transparent drawing Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.70 retrieving revision 1.71 diff -u -d -r1.70 -r1.71 --- changes.txt 11 Jun 2006 20:53:52 -0000 1.70 +++ changes.txt 12 Jun 2006 14:10:29 -0000 1.71 @@ -1,4 +1,11 @@ Version 1.1: +- fixed case of view box not updating under certain circumstances, like flipping through + options menus +- changed drawing of the new ship bitmaps to overwrite any other image on the screen, except + for where the ship source bitmap is black (black treated as transparent). Logic being that + ship draws should take precedence over things like planet and planet resource draws, to + make it easier to see the new ships. +- removed the clock masking bitmap, instead using true transparent drawing - added a 2nd geno pic, randomly chooses which one to show on a geno. Also added the geno pics for the rarer true genocide case (most of the time game ends by conquer not genocide). - added 5 new message sounds (can be used with beeplite, or you can just choose your favorite From modemhero at users.sourceforge.net Mon Jun 12 09:10:31 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 12 Jun 2006 14:10:31 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.51, 1.52 clientr.suo, 1.27, 1.28 clientr.vcproj, 1.3, 1.4 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13810 Modified Files: NetrekXP to do list.C clientr.suo clientr.vcproj Log Message: Fixed case of view box not updating under certain circumstances, like flipping through options menus Changed drawing of the new ship bitmaps to overwrite any other image on the screen, except for where the ship source bitmap is black (black treated as transparent). Logic being that ship draws should take precedence over things like planet and planet resource draws, to make it easier to see the new ships. Removed the clock masking bitmap, instead using true transparent drawing Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 Binary files /tmp/cvshvq7Tp and /tmp/cvsstHOgJ differ Index: clientr.vcproj =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- clientr.vcproj 19 May 2006 18:08:07 -0000 1.3 +++ clientr.vcproj 12 Jun 2006 14:10:29 -0000 1.4 @@ -172,7 +172,7 @@ Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27015/src Modified Files: dashboard.c data.c defaults.c local.c mswindow.c newwin.c option.c Log Message: Fixed KRP dashboard hull display upon death Added "warnHull: on/(off)" to visually display hull status as a series of dots around your ship. Modelled after warnHull implementation in COW, except that I use an actual bitmap rather than the hullbitmap header file to define the bitmaps. Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- mswindow.c 12 Jun 2006 14:10:31 -0000 1.35 +++ mswindow.c 13 Jun 2006 11:18:23 -0000 1.36 @@ -604,6 +604,9 @@ free (shield); #endif + for (i = 0; i < BMP_HULL_FRAMES; i++) + free (hull[i]); + free (cloakicon); free (stipple); free (genopic); @@ -4586,7 +4589,7 @@ SetScrollRange (win->hwnd, SB_VERT, 0, y, FALSE); SetScrollPos (win->hwnd, SB_VERT, y, TRUE); - //Scroll up however many lines. Use ScrollDC se we don't invalidate the window + //Scroll up however many lines. Use ScrollDC so we don't invalidate the window y = win->TextHeight - win->AddedStrings; if (y < 0) //Pathalogical case (but it does happen): Index: dashboard.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/dashboard.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- dashboard.c 3 Jun 2006 21:52:11 -0000 1.11 +++ dashboard.c 13 Jun 2006 11:18:23 -0000 1.12 @@ -591,7 +591,7 @@ else color = W_Green; db_bar ("Hu", 90, 31, - (me->p_ship.s_maxdamage - me->p_damage), + max(0,(me->p_ship.s_maxdamage - me->p_damage)), // Can't display negative hull values me->p_ship.s_maxdamage, me->p_ship.s_maxdamage, DB_3DIGITS, color); old_dam = me->p_damage; Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- newwin.c 12 Jun 2006 14:10:31 -0000 1.38 +++ newwin.c 13 Jun 2006 11:18:23 -0000 1.39 @@ -1296,10 +1296,17 @@ LR_MONOCHROME); for (i = 0; i < SHIELD_FRAMES; i++) shield[i] = - W_PointBitmap2 (base_vshield, 0, i, BMP_SHIELD_WIDTH, - BMP_SHIELD_HEIGHT); + W_PointBitmap2 (base_vshield, 0, i, BMP_SHIELD_WIDTH, BMP_SHIELD_HEIGHT); #endif + base_hull = + W_StoreBitmap3 ("bitmaps/misclib/varyhull.bmp", hull_width, + hull_height * BMP_HULL_FRAMES, BMP_HULL, w, + LR_MONOCHROME); + for (i = 0; i < BMP_HULL_FRAMES; i++) + hull[i] = + W_PointBitmap2 (base_hull, 0, i, hull_width, hull_height); + cloakicon = W_StoreBitmap3 ("bitmaps/misclib/cloak.bmp", BMP_CLOAK_WIDTH, BMP_CLOAK_HEIGHT, BMP_CLOAK, w, LR_MONOCHROME); Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- local.c 12 Jun 2006 14:10:30 -0000 1.42 +++ local.c 13 Jun 2006 11:18:23 -0000 1.43 @@ -1107,6 +1107,65 @@ dy - (shield_height / 2), shield, color, w); #endif } + /* Warning hull */ + if (vary_hull) + { + if (myPlayer(j) || isObsLockPlayer(j)) + { + int hull_left = (100 * (me->p_ship.s_maxdamage - + me->p_damage)) / me->p_ship.s_maxdamage; + int hull_num = 7; + int hull_color; + + if (hull_left <= 16) + { + hull_num = 0; + hull_color = W_Red; + } + else if (hull_left <= 28) + { + hull_num = 1; + hull_color = W_Red; + } + else if (hull_left <= 40) + { + hull_num = 2; + hull_color = W_Red; + } + else if (hull_left <= 52) + { + hull_num = 3; + hull_color = W_Yellow; + } + else if (hull_left <= 64) + { + hull_num = 4; + hull_color = W_Yellow; + } + else if (hull_left <= 76) + { + hull_num = 5; + hull_color = W_Yellow; + } + else if (hull_left <= 88) + { + hull_num = 6; + hull_color = W_Yellow; + } + else + hull_color = playerColor(j); + + W_WriteBitmap(dx - (shield_width / 2 + 1), + dy - (shield_height / 2 + 1), + hull[hull_num], hull_color, w); + + clearzone[0][clearcount] = dx - (shield_width / 2 + 1); + clearzone[1][clearcount] = dy - (shield_height / 2 + 1); + clearzone[2][clearcount] = shield_width + 2; + clearzone[3][clearcount] = shield_height + 2; + clearcount++; + } + } /* Det circle */ if (detCircle) { Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- defaults.c 9 Jun 2006 02:14:08 -0000 1.25 +++ defaults.c 13 Jun 2006 11:18:23 -0000 1.26 @@ -750,6 +750,12 @@ NULL } }, + {"warnHull", &vary_hull, RC_BOOL, + { + "Warn hull state based on damage", + NULL + } + }, {"warnShields", &warnShields, RC_BOOL, { "Change shields color on enemy approach", @@ -1495,6 +1501,7 @@ #endif warnShields = booleanDefault ("warnShields", warnShields); + vary_hull = booleanDefault("warnHull", vary_hull); #ifdef RSA if (useRsa >= 0) Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- data.c 12 Jun 2006 14:10:29 -0000 1.36 +++ data.c 13 Jun 2006 11:18:23 -0000 1.37 @@ -284,6 +284,10 @@ #endif +W_Icon base_hull; +W_Icon hull[BMP_HULL_FRAMES]; +int vary_hull = 0; + // Ships W_Icon ship_bitmaps[5]; W_Icon fed_bitmaps[NUM_TYPES][SHIP_VIEWS], kli_bitmaps[NUM_TYPES][SHIP_VIEWS], Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- option.c 6 Jun 2006 19:50:39 -0000 1.22 +++ option.c 13 Jun 2006 11:18:23 -0000 1.23 @@ -255,6 +255,7 @@ {1, "vary shields bitmap", &varyShields, 0, 0, 0, NULL, NULL}, #endif {1, "use warning shields", &warnShields, 0, 0, 0, NULL, NULL}, + {1, "use warning hull", &vary_hull, 0, 0, 0, NULL, NULL}, {1, "show speed on tactical", &showMySpeed, 0, 0, 0, NULL, NULL}, #ifdef JUBILEE_PHASERS {1, "use colorful phasers", &colorfulPhasers, 0, 0, 0, NULL, NULL}, From modemhero at users.sourceforge.net Tue Jun 13 06:18:24 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Jun 2006 11:18:24 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.52, 1.53 build.cmd, 1.17, 1.18 clientr.suo, 1.28, 1.29 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27015 Modified Files: NetrekXP to do list.C build.cmd clientr.suo Log Message: Fixed KRP dashboard hull display upon death Added "warnHull: on/(off)" to visually display hull status as a series of dots around your ship. Modelled after warnHull implementation in COW, except that I use an actual bitmap rather than the hullbitmap header file to define the bitmaps. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- NetrekXP to do list.C 12 Jun 2006 14:10:29 -0000 1.52 +++ NetrekXP to do list.C 13 Jun 2006 11:18:22 -0000 1.53 @@ -43,21 +43,22 @@ local is scaled Things to do: -1) Add warning hull. -2) resizeable message windows. Perhaps memory of window positions if you choose +1) resizeable message windows. Perhaps memory of window positions if you choose to save settings. Text in windows should adjust to new window size. -3) Save options for observer/servernick/servertype need to be saved -4) A lot of annoying pop up windows (like macro window, default controls) should be +2) Save options for observer/servernick/servertype need to be saved +3) A lot of annoying pop up windows (like macro window, default controls) should be closeable by shift right click. -5) Workable windows installer would be nice -6) Get square planet bitmaps so I can turn them into mapped rotating globes. -7) ships at warp 0 near newplanets blink in and out of galactic - may be fixed -8) problem with message windows, text getting garbled near top, goes away with +4) Workable windows installer would be nice +5) Get square planet bitmaps so I can turn them into mapped rotating globes. +6) ships at warp 0 near newplanets blink in and out of galactic - may be fixed +7) problem with message windows, text getting garbled near top, goes away with flushing with scroll button. Doesn't show up initially, but do something like use scroll button, alt-enter, change to review all..and it shows up. -9) review all scrolling messes up text, if bottom of window is below the visible +7a) review all scrolling messes up text, if bottom of window is below the visible bottom border of netrek window. Actually will happen to whatever window is mapped down there at bottom of screen +8) Change beeplite (and any other bitmaps) that are in header file graphical format, +into actual bitmap files (necessary for eventual tactical and galactic scaling) Stas's list: - color coded playerlist. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 Binary files /tmp/cvs43F2o9 and /tmp/cvsObkgk1 differ Index: build.cmd =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- build.cmd 25 May 2006 08:43:56 -0000 1.17 +++ build.cmd 13 Jun 2006 11:18:22 -0000 1.18 @@ -471,6 +471,7 @@ copy resources\misclib\mono\clock.bmp %InstCWD%\netrek\bitmaps\misclib copy resources\misclib\mono\shield.bmp %InstCWD%\netrek\bitmaps\misclib copy resources\misclib\mono\stipple.bmp %InstCWD%\netrek\bitmaps\misclib +copy resources\misclib\mono\varyhull.bmp %InstCWD%\netrek\bitmaps\misclib copy resources\misclib\mono\vshield.bmp %InstCWD%\netrek\bitmaps\misclib mkdir %InstCWD%\netrek\bitmaps\misclib\color From modemhero at users.sourceforge.net Tue Jun 13 06:18:24 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Jun 2006 11:18:24 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.71, 1.72 netrekrc_options.txt, 1.12, 1.13 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27015/resources/docs Modified Files: changes.txt netrekrc_options.txt Log Message: Fixed KRP dashboard hull display upon death Added "warnHull: on/(off)" to visually display hull status as a series of dots around your ship. Modelled after warnHull implementation in COW, except that I use an actual bitmap rather than the hullbitmap header file to define the bitmaps. Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- netrekrc_options.txt 6 Jun 2006 19:50:39 -0000 1.12 +++ netrekrc_options.txt 13 Jun 2006 11:18:22 -0000 1.13 @@ -271,6 +271,7 @@ useRSA. (on/off) user RSA for varyShields: (on/off) change shields color on shields damage viewBox: (on/off) show tactical window boundaries on map +warnHull: (on/off) warn hull state based on damage warnShields: (on/off) change shields color on enemy approach warpStreaks: (on/off) show streaks while warping to starbase windowMove: (on/off) enable internal windows to be moved with mouse Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.71 retrieving revision 1.72 diff -u -d -r1.71 -r1.72 --- changes.txt 12 Jun 2006 14:10:29 -0000 1.71 +++ changes.txt 13 Jun 2006 11:18:22 -0000 1.72 @@ -1,4 +1,12 @@ Version 1.1: +- fixed KRP dashboard hull display on death (it incorrectly displayed hull value, which + went into the negative if more damage was taken than the ship's hull could take, now it + just shows hull at 0 upon death) +- added "warnHull: on/(off)" to visually display hull status as a series of dots around your + ship (same as in COW), except that the colors of the hull dots more closely resemble the + corresponding colors for the COW dashboard hull states. So the hull dots are white when + ship hull is about 90% or better, then they turn to yellow from about 40-90% hull left, and + finally they turn red from about 0-40% hull left. - fixed case of view box not updating under certain circumstances, like flipping through options menus - changed drawing of the new ship bitmaps to overwrite any other image on the screen, except From modemhero at users.sourceforge.net Tue Jun 13 06:18:24 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Jun 2006 11:18:24 +0000 Subject: [netrek-cvs] client/netrekxp/include bitmaps.h, 1.12, 1.13 data.h, 1.32, 1.33 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27015/include Modified Files: bitmaps.h data.h Log Message: Fixed KRP dashboard hull display upon death Added "warnHull: on/(off)" to visually display hull status as a series of dots around your ship. Modelled after warnHull implementation in COW, except that I use an actual bitmap rather than the hullbitmap header file to define the bitmaps. Index: bitmaps.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- bitmaps.h 11 Jun 2006 20:53:52 -0000 1.12 +++ bitmaps.h 13 Jun 2006 11:18:22 -0000 1.13 @@ -35,6 +35,7 @@ #define BMP_TORPDET_FRAMES 5 #define BMP_TORP_FRAMES 8 +#define BMP_HULL_FRAMES 8 #define BMP_EPLASMA 6 #define BMP_ETORP 7 @@ -81,6 +82,7 @@ #define BMP_CLOAK 15 #define BMP_SHIELD 16 #define BMP_VSHIELD 17 +#define BMP_HULL 18 #define BMP_STIPPLE 22 #define BMP_GENO 23 #define BMP_GENO2 24 Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- data.h 12 Jun 2006 14:10:29 -0000 1.32 +++ data.h 13 Jun 2006 11:18:22 -0000 1.33 @@ -20,6 +20,8 @@ #define shield_height 20 #define cloak_width 20 #define cloak_height 20 +#define hull_width 22 +#define hull_height 22 #define etorp_width 3 #define etorp_height 3 @@ -280,6 +282,10 @@ #endif +extern W_Icon base_hull; +extern W_Icon hull[BMP_HULL_FRAMES]; +extern int vary_hull; + extern W_Icon tractbits, pressbits; //Ships From modemhero at users.sourceforge.net Tue Jun 13 06:18:25 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Jun 2006 11:18:25 +0000 Subject: [netrek-cvs] client/netrekxp/resources/misclib/mono varyhull.bmp, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/misclib/mono In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27015/resources/misclib/mono Added Files: varyhull.bmp Log Message: Fixed KRP dashboard hull display upon death Added "warnHull: on/(off)" to visually display hull status as a series of dots around your ship. Modelled after warnHull implementation in COW, except that I use an actual bitmap rather than the hullbitmap header file to define the bitmaps. --- NEW FILE: varyhull.bmp --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Tue Jun 13 06:18:25 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Jun 2006 11:18:25 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.15, 1.16 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27015/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Fixed KRP dashboard hull display upon death Added "warnHull: on/(off)" to visually display hull status as a series of dots around your ship. Modelled after warnHull implementation in COW, except that I use an actual bitmap rather than the hullbitmap header file to define the bitmaps. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- generalconfig.html 6 Jun 2006 19:50:39 -0000 1.15 +++ generalconfig.html 13 Jun 2006 11:18:22 -0000 1.16 @@ -1263,6 +1263,16 @@ +warnHull +Warn hull state based on damage + +
    +
  • on
    • +
  • off (default)
    • +
+ + + warnShields Use shields as proximity alert From modemhero at users.sourceforge.net Tue Jun 13 06:40:02 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Jun 2006 11:40:02 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.29,1.30 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv4431 Modified Files: clientr.suo Log Message: Change of client version from 1.0 to 1.1. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 Binary files /tmp/cvswi2xbv and /tmp/cvsYHJxNz differ From modemhero at users.sourceforge.net Tue Jun 13 06:40:02 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Jun 2006 11:40:02 +0000 Subject: [netrek-cvs] client/netrekxp/include version.h,1.4,1.5 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv4431/include Modified Files: version.h Log Message: Change of client version from 1.0 to 1.1. Index: version.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/version.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- version.h 12 May 2006 01:54:18 -0000 1.4 +++ version.h 13 Jun 2006 11:40:00 -0000 1.5 @@ -2,5 +2,5 @@ /* store the version info here */ -static char mvers[] = "1.0"; +static char mvers[] = "1.1"; static char version[] = "Netrek XP 2006"; \ No newline at end of file From modemhero at users.sourceforge.net Tue Jun 13 06:40:02 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Jun 2006 11:40:02 +0000 Subject: [netrek-cvs] client/netrekxp/src bccnetrek.rc, 1.5, 1.6 netrek.rc, 1.3, 1.4 vccnetrek.rc, 1.3, 1.4 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv4431/src Modified Files: bccnetrek.rc netrek.rc vccnetrek.rc Log Message: Change of client version from 1.0 to 1.1. Index: vccnetrek.rc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/vccnetrek.rc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- vccnetrek.rc 2 Jun 2006 21:06:55 -0000 1.3 +++ vccnetrek.rc 13 Jun 2006 11:40:00 -0000 1.4 @@ -3,8 +3,8 @@ MAIN ICON DISCARDABLE "main.ico" 1 VERSIONINFO -FILEVERSION 1, 0, 0, 0 -PRODUCTVERSION 1, 0, 0, 0 +FILEVERSION 1, 1, 0, 0 +PRODUCTVERSION 1, 1, 0, 0 { BLOCK "StringFileInfo" { BLOCK "040904E4" { Index: bccnetrek.rc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/bccnetrek.rc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- bccnetrek.rc 12 May 2006 01:58:37 -0000 1.5 +++ bccnetrek.rc 13 Jun 2006 11:40:00 -0000 1.6 @@ -1,8 +1,8 @@ #include "resource.h" 1 VERSIONINFO -FILEVERSION 4, 4, 0, 4 -PRODUCTVERSION 4, 4, 0, 4 +FILEVERSION 1, 1, 0, 0 +PRODUCTVERSION 1, 1, 0, 0 FILEOS VOS_DOS_WINDOWS32 FILETYPE VFT_APP { BLOCK "StringFileInfo" Index: netrek.rc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/netrek.rc,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- netrek.rc 12 May 2006 01:58:38 -0000 1.3 +++ netrek.rc 13 Jun 2006 11:40:00 -0000 1.4 @@ -28,8 +28,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 + FILEVERSION 1,1,0,0 + PRODUCTVERSION 1,1,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x3L @@ -47,7 +47,7 @@ VALUE "Comments", "\0" VALUE "CompanyName", "Netrek\0" VALUE "FileDescription", "Netrek XP 2006 Client\0" - VALUE "FileVersion", "1, 0, 0, 1\0" + VALUE "FileVersion", "1, 1, 0, 0\0" VALUE "InternalName", "Netrek XP 2006\0" VALUE "LegalCopyright", "Copyright ? 1986-2006\0" VALUE "LegalTrademarks", "\0" From modemhero at users.sourceforge.net Tue Jun 13 06:40:02 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Tue, 13 Jun 2006 11:40:02 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs netrekrc,1.4,1.5 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv4431/resources/docs Modified Files: netrekrc Log Message: Change of client version from 1.0 to 1.1. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- netrekrc 6 Jun 2006 19:50:39 -0000 1.4 +++ netrekrc 13 Jun 2006 11:40:00 -0000 1.5 @@ -385,6 +385,9 @@ # Show limits of tactical display on galaxy viewBox: on +# Warn hull state based on damage +warnHull: off + # Change shields color on enemy approach warnShields: off From modemhero at users.sourceforge.net Wed Jun 14 05:38:40 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 14 Jun 2006 10:38:40 +0000 Subject: [netrek-cvs] client/netrekxp/include bitmaps.h, 1.13, 1.14 data.h, 1.33, 1.34 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29999/include Modified Files: bitmaps.h data.h Log Message: Changed beeplite from built-into-the-client bitmaps to actual windows bitmaps Index: bitmaps.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/bitmaps.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- bitmaps.h 13 Jun 2006 11:18:22 -0000 1.13 +++ bitmaps.h 14 Jun 2006 10:38:38 -0000 1.14 @@ -108,6 +108,11 @@ #define BMP_STIPPLE_WIDTH 16 #define BMP_STIPPLE_HEIGHT 16 +#ifdef BEEPLITE +#define BMP_BEEPLITE1 1 +#define BMP_BEEPLITE2 2 +#define BMP_BEEPLITE3 3 +#endif // Planets // ------- Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- data.h 13 Jun 2006 11:18:22 -0000 1.33 +++ data.h 14 Jun 2006 10:38:38 -0000 1.34 @@ -413,6 +413,9 @@ extern int defLite; extern int emph_planet_seq_n[]; extern int emph_player_seq_n[]; +extern W_Icon beeplite1; +extern W_Icon beeplite2; +extern W_Icon beeplite3; extern W_Icon emph_planet_seq[]; extern W_Icon emph_player_seq[]; extern W_Icon emph_player_seql[]; From modemhero at users.sourceforge.net Wed Jun 14 05:38:40 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 14 Jun 2006 10:38:40 +0000 Subject: [netrek-cvs] client/netrekxp/resources/misclib/mono beepliteplanet.bmp, NONE, 1.1 beepliteplayerl.bmp, NONE, 1.1 beepliteplayerm.bmp, NONE, 1.1 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/misclib/mono In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29999/resources/misclib/mono Added Files: beepliteplanet.bmp beepliteplayerl.bmp beepliteplayerm.bmp Log Message: Changed beeplite from built-into-the-client bitmaps to actual windows bitmaps --- NEW FILE: beepliteplayerm.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: beepliteplayerl.bmp --- (This appears to be a binary file; contents omitted.) --- NEW FILE: beepliteplanet.bmp --- (This appears to be a binary file; contents omitted.) From modemhero at users.sourceforge.net Wed Jun 14 05:38:40 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Wed, 14 Jun 2006 10:38:40 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.53, 1.54 build.cmd, 1.18, 1.19 clientr.suo, 1.30, 1.31 clientr.vcproj, 1.4, 1.5 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29999 Modified Files: NetrekXP to do list.C build.cmd clientr.suo clientr.vcproj Log Message: Changed beeplite from built-into-the-client bitmaps to actual windows bitmaps Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 Binary files /tmp/cvsvdsbhq and /tmp/cvsqJsnB8 differ Index: clientr.vcproj =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.vcproj,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- clientr.vcproj 12 Jun 2006 14:10:29 -0000 1.4 +++ clientr.vcproj 14 Jun 2006 10:38:37 -0000 1.5 @@ -1789,10 +1789,6 @@ - - Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29999/src Modified Files: data.c newwin.c Removed Files: litebitmaps.h Log Message: Changed beeplite from built-into-the-client bitmaps to actual windows bitmaps Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- newwin.c 13 Jun 2006 11:18:23 -0000 1.39 +++ newwin.c 14 Jun 2006 10:38:38 -0000 1.40 @@ -25,7 +25,6 @@ #include "data.h" #include "playerlist.h" #include "bitmaps.h" -#include "litebitmaps.h" #include "parsemeta.h" #include "packets.h" #include "spopt.h" @@ -1157,26 +1156,34 @@ } #ifdef BEEPLITE + + beeplite1 = + W_StoreBitmap3 ("bitmaps/misclib/beepliteplayerm.bmp", emph_player_seq_width, + emph_player_seq_height * emph_player_seq_frames, BMP_BEEPLITE1, + mapw, LR_MONOCHROME); + for (i = 0; i < emph_player_seq_frames; i++) - { emph_player_seq[emph_player_seq_frames - (i + 1)] = - W_StoreBitmap(emph_player_seq_width, emph_player_seq_height, - emph_player_seq_bits[i], mapw); - } + W_PointBitmap2 (beeplite1, 0, i, emph_player_seq_width, emph_player_seq_height); + beeplite2 = + W_StoreBitmap3 ("bitmaps/misclib/beepliteplayerl.bmp", emph_player_seql_width, + emph_player_seql_height * emph_player_seql_frames, BMP_BEEPLITE2, + mapw, LR_MONOCHROME); + for (i = 0; i < emph_player_seql_frames; i++) - { emph_player_seql[emph_player_seql_frames - (i + 1)] = - W_StoreBitmap(emph_player_seql_width, emph_player_seql_height, - emph_player_seql_bits[i], w); - } + W_PointBitmap2 (beeplite2, 0, i, emph_player_seql_width, emph_player_seql_height); + + beeplite3 = + W_StoreBitmap3 ("bitmaps/misclib/beepliteplanet.bmp", emph_planet_seq_width, + emph_planet_seq_height * emph_planet_seq_frames, BMP_BEEPLITE3, + mapw, LR_MONOCHROME); for (i = 0; i < emph_planet_seq_frames; i++) - { emph_planet_seq[emph_planet_seq_frames - (i + 1)] = - W_StoreBitmap(emph_planet_seq_width, emph_planet_seq_height, - emph_planet_seq_bits[i], mapw); - } + W_PointBitmap2 (beeplite3, 0, i, emph_planet_seq_width, emph_planet_seq_height); + #endif --- litebitmaps.h DELETED --- Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- data.c 13 Jun 2006 11:18:23 -0000 1.37 +++ data.c 14 Jun 2006 10:38:38 -0000 1.38 @@ -514,6 +514,9 @@ {0,}; int emph_player_seq_n[MAXPLAYER] = {0,}; +W_Icon beeplite1; +W_Icon beeplite2; +W_Icon beeplite3; W_Icon emph_planet_seq[10]; W_Icon emph_player_seq[10]; W_Icon emph_player_seql[10]; From modemhero at users.sourceforge.net Thu Jun 15 00:09:07 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Jun 2006 05:09:07 +0000 Subject: [netrek-cvs] client/netrekxp/src dashboard.c, 1.12, 1.13 getship.c, 1.3, 1.4 redraw.c, 1.8, 1.9 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3690/src Modified Files: dashboard.c getship.c redraw.c Log Message: Changed COW, KRP and text dashboard so they display ATT ship correctly Changed the way dashboard reports negative values for the bars (hull,shield,fuel,etc) - instead of getting a garbled display since most of the dashboards can't handle negative values, the number will display as a positive number, but will be in red font. This effects cases such as the KRP dashboard when your ship dies (hull goes to negative). Fixed ATT maxfuel to match server value Index: redraw.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/redraw.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- redraw.c 3 Jun 2006 07:03:42 -0000 1.8 +++ redraw.c 15 Jun 2006 05:09:04 -0000 1.9 @@ -201,21 +201,43 @@ buf[15] = (char) ('0' + (me->p_speed % 10)); /* speed */ buf[16] = ' '; buf[17] = ' '; - buf[18] = (char) ('0' + (me->p_damage / 100)); - if (buf[18] == '0') - buf[18] = ' '; - buf[19] = (char) ('0' + ((me->p_damage % 100) / 10)); - if ((buf[19] == '0') && (me->p_damage < 100)) - buf[19] = ' '; - buf[20] = (char) ('0' + (me->p_damage % 10)); + if (me->p_ship.s_type != ATT) + { + buf[18] = (char) ('0' + (me->p_damage / 100)); + if (buf[18] == '0') + buf[18] = ' '; + buf[19] = (char) ('0' + ((me->p_damage % 100) / 10)); + if ((buf[19] == '0') && (me->p_damage < 100)) + buf[19] = ' '; + buf[20] = (char) ('0' + (me->p_damage % 10)); + } + else + { + buf[18] = (char) ('0' + (me->p_damage / 10000)); + if (buf[18] == '0') + buf[18] = ' '; + buf[19] = (char) ('0' + ((me->p_damage % 10000) / 1000)); + buf[20] = 'k'; + } buf[21] = ' '; - buf[22] = (char) ('0' + (me->p_shield / 100)); - if (buf[22] == '0') - buf[22] = ' '; - buf[23] = (char) ('0' + ((me->p_shield % 100) / 10)); - if ((buf[23] == '0') && (me->p_shield < 100)) - buf[23] = ' '; - buf[24] = (char) ('0' + (me->p_shield % 10)); + if (me->p_ship.s_type != ATT) + { + buf[22] = (char) ('0' + (me->p_shield / 100)); + if (buf[22] == '0') + buf[22] = ' '; + buf[23] = (char) ('0' + ((me->p_shield % 100) / 10)); + if ((buf[23] == '0') && (me->p_shield < 100)) + buf[23] = ' '; + buf[24] = (char) ('0' + (me->p_shield % 10)); + } + else + { + buf[22] = (char) ('0' + (me->p_shield / 10000)); + if (buf[22] == '0') + buf[22] = ' '; + buf[23] = (char) ('0' + ((me->p_shield % 10000) / 1000)); + buf[24] = 'k'; + } buf[25] = ' '; buf[26] = ' '; buf[27] = (char) ('0' + ((plr->p_ntorp % 100) / 10)); @@ -404,12 +426,20 @@ sprintf (buf, "Flags Warp Dam Shd Torps Kills Armies Fuel Wtemp Etemp Time"); W_WriteText (tstatw, 50, 5, textColor, buf, strlen (buf), W_RegularFont); - sprintf (buf, - "Maximum: %2d/%2d %3d %3d %2d/%2d %6d %3d %3d", - maxspeed, me->p_ship.s_maxspeed, - me->p_ship.s_maxdamage, me->p_ship.s_maxshield, - troop_capacity, me->p_ship.s_maxarmies, - me->p_ship.s_maxfuel, me->p_ship.s_maxwpntemp / 10, - me->p_ship.s_maxegntemp / 10); + if (me->p_ship.s_type != ATT) + sprintf (buf, + "Maximum: %2d/%2d %3d %3d %2d/%2d %6d %3d %3d", + maxspeed, me->p_ship.s_maxspeed, + me->p_ship.s_maxdamage, me->p_ship.s_maxshield, + troop_capacity, me->p_ship.s_maxarmies, + me->p_ship.s_maxfuel, me->p_ship.s_maxwpntemp / 10, + me->p_ship.s_maxegntemp / 10); + else + sprintf (buf, + "Maximum: %2d/%2d 30k 30k %2d/1k %6d %4d %4d", + maxspeed, me->p_ship.s_maxspeed, + troop_capacity, + me->p_ship.s_maxfuel, me->p_ship.s_maxwpntemp / 10, + me->p_ship.s_maxegntemp / 10); W_WriteText (tstatw, 50, 27, textColor, buf, strlen (buf), W_RegularFont); } Index: getship.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/getship.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- getship.c 22 May 2006 08:27:53 -0000 1.3 +++ getship.c 15 Jun 2006 05:09:04 -0000 1.4 @@ -104,7 +104,7 @@ shipvals[ATT].s_phaserdamage = 10000; /* att: */ shipvals[ATT].s_torpspeed = 30; /* att: */ shipvals[ATT].s_maxspeed = 60; /* att: */ - shipvals[ATT].s_maxfuel = 12000; /* att: */ + shipvals[ATT].s_maxfuel = 60000; /* att: */ shipvals[ATT].s_maxarmies = 1000; /* att: */ shipvals[ATT].s_maxshield = 30000; /* att: */ shipvals[ATT].s_maxdamage = 30000; /* att: */ Index: dashboard.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/dashboard.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- dashboard.c 13 Jun 2006 11:18:23 -0000 1.12 +++ dashboard.c 15 Jun 2006 05:09:04 -0000 1.13 @@ -222,7 +222,15 @@ register int wt, wv; register int tc = 11; register int tw = W_Textwidth * tc; + int sign_change = 0; char valstr[32]; + + /* Take care of case where value is negative */ + if (value < 0) + { + value = abs(value); + sign_change = 1; + } switch (digits) { @@ -260,8 +268,8 @@ wv = BAR_LENGTH; W_WriteText (tstatw, x, y, textColor, valstr, 3, W_RegularFont); - W_WriteText (tstatw, x + 3 * W_Textwidth, y, textColor, (&valstr[3]), - tc / 2 + 1, W_BoldFont); + W_WriteText (tstatw, x + 3 * W_Textwidth, y, sign_change ? W_Red : textColor, + (&valstr[3]), tc / 2 + 1, W_BoldFont); W_WriteText (tstatw, x + (tc / 2 + 1) * W_Textwidth, y, textColor, (&valstr[tc / 2 + 1]), tc / 2, W_RegularFont); @@ -573,9 +581,14 @@ color = W_Yellow; else color = W_Green; - db_bar ("Sh", 90, 17, - me->p_shield, me->p_ship.s_maxshield, me->p_ship.s_maxshield, - DB_3DIGITS, color); + if (me->p_ship.s_type == ATT) + db_bar ("Sh", 90, 17, + me->p_shield, me->p_ship.s_maxshield, me->p_ship.s_maxshield, + DB_5DIGITS, color); + else + db_bar ("Sh", 90, 17, + me->p_shield, me->p_ship.s_maxshield, me->p_ship.s_maxshield, + DB_3DIGITS, color); old_shl = me->p_shield; } @@ -590,10 +603,16 @@ color = W_Yellow; else color = W_Green; - db_bar ("Hu", 90, 31, - max(0,(me->p_ship.s_maxdamage - me->p_damage)), // Can't display negative hull values - me->p_ship.s_maxdamage, me->p_ship.s_maxdamage, DB_3DIGITS, - color); + if (me->p_ship.s_type == ATT) + db_bar ("Hu", 90, 31, + (me->p_ship.s_maxdamage - me->p_damage), + me->p_ship.s_maxdamage, me->p_ship.s_maxdamage, DB_5DIGITS, + color); + else + db_bar ("Hu", 90, 31, + (me->p_ship.s_maxdamage - me->p_damage), + me->p_ship.s_maxdamage, me->p_ship.s_maxdamage, DB_3DIGITS, + color); old_dam = me->p_damage; } @@ -632,9 +651,10 @@ color = W_Yellow; else color = W_Red; - db_bar ("Wt", 218, 17, - me->p_wtemp / 10, me->p_ship.s_maxwpntemp / 10, - me->p_ship.s_maxwpntemp / 10, DB_3DIGITS, color); + if (me->p_ship.s_type != ATT) + db_bar ("Wt", 218, 17, + me->p_wtemp / 10, me->p_ship.s_maxwpntemp / 10, + me->p_ship.s_maxwpntemp / 10, DB_3DIGITS, color); old_wpn = me->p_wtemp; } @@ -647,9 +667,10 @@ color = W_Yellow; else color = W_Red; - db_bar ("Et", 218, 31, - me->p_etemp / 10, me->p_ship.s_maxegntemp / 10, - me->p_ship.s_maxegntemp / 10, DB_3DIGITS, color); + if (me->p_ship.s_type != ATT) + db_bar ("Et", 218, 31, + me->p_etemp / 10, me->p_ship.s_maxegntemp / 10, + me->p_ship.s_maxegntemp / 10, DB_3DIGITS, color); old_egn = me->p_etemp; } @@ -732,9 +753,14 @@ color = W_Yellow; else color = W_White; - db_bar ("Sh", 90, 17, - me->p_ship.s_maxshield - me->p_shield, me->p_ship.s_maxshield, - me->p_ship.s_maxshield, DB_3DIGITS, color); + if (me->p_ship.s_type == ATT) + db_bar ("Sh", 90, 17, + me->p_ship.s_maxshield - me->p_shield, me->p_ship.s_maxshield, + me->p_ship.s_maxshield, DB_5DIGITS, color); + else + db_bar ("Sh", 90, 17, + me->p_ship.s_maxshield - me->p_shield, me->p_ship.s_maxshield, + me->p_ship.s_maxshield, DB_3DIGITS, color); old_shl = me->p_shield; } @@ -747,9 +773,14 @@ color = W_Red; else color = W_Yellow; - db_bar ("Da", 90, 31, - me->p_damage, me->p_ship.s_maxdamage, me->p_ship.s_maxdamage, - DB_3DIGITS, color); + if (me->p_ship.s_type == ATT) + db_bar ("Da", 90, 31, + me->p_damage, me->p_ship.s_maxdamage, me->p_ship.s_maxdamage, + DB_5DIGITS, color); + else + db_bar ("Da", 90, 31, + me->p_damage, me->p_ship.s_maxdamage, me->p_ship.s_maxdamage, + DB_3DIGITS, color); old_dam = me->p_damage; } @@ -789,9 +820,10 @@ color = W_White; else color = W_Yellow; - db_bar ("Wt", 218, 17, - me->p_wtemp / 10, me->p_ship.s_maxwpntemp / 10, - me->p_ship.s_maxwpntemp / 10, DB_3DIGITS, color); + if (me->p_ship.s_type != ATT) + db_bar ("Wt", 218, 17, + me->p_wtemp / 10, me->p_ship.s_maxwpntemp / 10, + me->p_ship.s_maxwpntemp / 10, DB_3DIGITS, color); old_wpn = me->p_wtemp; } @@ -805,9 +837,10 @@ color = W_Yellow; else color = W_Red; - db_bar ("Et", 218, 31, - me->p_etemp / 10, me->p_ship.s_maxegntemp / 10, - me->p_ship.s_maxegntemp / 10, DB_3DIGITS, color); + if (me->p_ship.s_type != ATT) + db_bar ("Et", 218, 31, + me->p_etemp / 10, me->p_ship.s_maxegntemp / 10, + me->p_ship.s_maxegntemp / 10, DB_3DIGITS, color); old_egn = me->p_etemp; } From modemhero at users.sourceforge.net Thu Jun 15 00:09:06 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Jun 2006 05:09:06 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.54, 1.55 clientr.suo, 1.31, 1.32 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3690 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Changed COW, KRP and text dashboard so they display ATT ship correctly Changed the way dashboard reports negative values for the bars (hull,shield,fuel,etc) - instead of getting a garbled display since most of the dashboards can't handle negative values, the number will display as a positive number, but will be in red font. This effects cases such as the KRP dashboard when your ship dies (hull goes to negative). Fixed ATT maxfuel to match server value Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- NetrekXP to do list.C 14 Jun 2006 10:38:36 -0000 1.54 +++ NetrekXP to do list.C 15 Jun 2006 05:09:04 -0000 1.55 @@ -1,8 +1,7 @@ List for the netrekrc/installer: -1) Change recommendation on metaserver from off to on! -2) there should be some sort of chance to give default resolution in GUI, +1) there should be some sort of chance to give default resolution in GUI, which then maps windows accordingly. -3) Add chance for player to input their default login name - tired of seeing +2) Add chance for player to input their default login name - tired of seeing new-be-nice!! Things not gonna happen, or server problems: @@ -10,9 +9,8 @@ away, etc). Don't think this is fixable. 2) torp_other and plasma_other not working right due to lack of torp fuse info 3) Can't bomb enemy 3rd space planets in your T-mode opponent's space. -4) ATT not listed as valid ship even if it's in sysdef. -5) in orbit.c, pftranswarp strangeness. -6) look into swar/war in repair time, with obs and plr - doesn't seem to be any way +4) in orbit.c, pftranswarp strangeness. +5) look into swar/war in repair time, with obs and plr - doesn't seem to be any way for an obs to know what the war decs are of the person he is observing. Best solution is to just have server send repair time and planet orbit info. @@ -57,6 +55,7 @@ 7a) review all scrolling messes up text, if bottom of window is below the visible bottom border of netrek window. Actually will happen to whatever window is mapped down there at bottom of screen +9) text break with ATT Stas's list: - color coded playerlist. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 Binary files /tmp/cvs9NsHBi and /tmp/cvsp8TgDt differ From modemhero at users.sourceforge.net Thu Jun 15 00:09:06 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Thu, 15 Jun 2006 05:09:06 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.72,1.73 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3690/resources/docs Modified Files: changes.txt Log Message: Changed COW, KRP and text dashboard so they display ATT ship correctly Changed the way dashboard reports negative values for the bars (hull,shield,fuel,etc) - instead of getting a garbled display since most of the dashboards can't handle negative values, the number will display as a positive number, but will be in red font. This effects cases such as the KRP dashboard when your ship dies (hull goes to negative). Fixed ATT maxfuel to match server value Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- changes.txt 13 Jun 2006 11:18:22 -0000 1.72 +++ changes.txt 15 Jun 2006 05:09:04 -0000 1.73 @@ -1,7 +1,11 @@ Version 1.1: -- fixed KRP dashboard hull display on death (it incorrectly displayed hull value, which - went into the negative if more damage was taken than the ship's hull could take, now it - just shows hull at 0 upon death) +- changed COW, KRP and text dashboard so they display ATT ship correctly +- changed the way dashboard reports negative values for the bars (hull,shield,fuel,etc) - instead + of getting a garbled display since most of the dashboards can't handle negative values, + the number will display as a positive number, but will be in red font. This effects cases + such as the KRP dashboard when your ship dies (hull goes to negative). +- fixed ATT maxfuel to match server value +- changed beeplite from built-into-the-client bitmaps to actual windows bitmaps - added "warnHull: on/(off)" to visually display hull status as a series of dots around your ship (same as in COW), except that the colors of the hull dots more closely resemble the corresponding colors for the COW dashboard hull states. So the hull dots are white when From modemhero at users.sourceforge.net Sun Jun 18 23:46:05 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 19 Jun 2006 04:46:05 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.55, 1.56 clientr.suo, 1.32, 1.33 clientr.vcproj, 1.5, 1.6 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20831 Modified Files: NetrekXP to do list.C clientr.suo clientr.vcproj Log Message: Fix to username/password string length. Added lib file to debug build (only had added it to release build before). Added some new server problems that I discovered. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 Binary files /tmp/cvscvPDj3 and /tmp/cvs3QlCII differ Index: clientr.vcproj =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- clientr.vcproj 14 Jun 2006 10:38:37 -0000 1.5 +++ clientr.vcproj 19 Jun 2006 04:46:02 -0000 1.6 @@ -71,7 +71,7 @@ Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv20831/src Modified Files: main.c Log Message: Fix to username/password string length. Added lib file to debug build (only had added it to release build before). Added some new server problems that I discovered. Index: main.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- main.c 28 May 2006 06:28:14 -0000 1.8 +++ main.c 19 Jun 2006 04:46:03 -0000 1.9 @@ -122,7 +122,7 @@ case 'C': /* character name */ if (i < argc && argv[i + 1]) { - (void) STRNCPY (pseudo, argv[i + 1], sizeof (argv[i + 1])); + (void) STRNCPY (pseudo, argv[i + 1], sizeof pseudo); i++; } else @@ -132,7 +132,7 @@ case 'A': /* authorization password */ if (i < argc && argv[i + 1]) { - (void) STRNCPY (defpasswd, argv[i + 1], sizeof (argv[i + 1])); + (void) STRNCPY (defpasswd, argv[i + 1], sizeof defpasswd); i++; } else From modemhero at users.sourceforge.net Fri Jun 23 03:50:16 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 23 Jun 2006 08:50:16 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h,1.34,1.35 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24034/include Modified Files: data.h Log Message: Added "mainTitleBar: on/(off)" to choose whether to start game with title bar on. As always, title bar can be toggled by alt+enter. Changed default phaser window size. Updated to do list. Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- data.h 14 Jun 2006 10:38:38 -0000 1.34 +++ data.h 23 Jun 2006 08:50:13 -0000 1.35 @@ -634,6 +634,7 @@ extern int windowMove; /* allow moving of internal windows */ extern int mainResizeable; /* allow resize of netrek window */ +extern int mainTitleBar; /* start netrek window with title bar on */ extern int playerListMessaging; /* allow message zoom when clicking on player list */ extern int observerMode; /* set observer mode variable */ extern int observerPorts[]; /* predefined list of observer ports */ From modemhero at users.sourceforge.net Fri Jun 23 03:50:16 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 23 Jun 2006 08:50:16 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.16, 1.17 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24034/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Added "mainTitleBar: on/(off)" to choose whether to start game with title bar on. As always, title bar can be toggled by alt+enter. Changed default phaser window size. Updated to do list. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- generalconfig.html 13 Jun 2006 11:18:22 -0000 1.16 +++ generalconfig.html 23 Jun 2006 08:50:14 -0000 1.17 @@ -436,6 +436,16 @@ +mainTitleBar +Start main window with title bar on (can be toggled by alt+enter) + +
    +
  • on
    • +
  • off (default)
    • +
+ + + messageHoldThresh Threshold value to put message on hold integer
default: 0 From modemhero at users.sourceforge.net Fri Jun 23 03:50:16 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 23 Jun 2006 08:50:16 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.38, 1.39 defaults.c, 1.26, 1.27 mswindow.c, 1.36, 1.37 newwin.c, 1.40, 1.41 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24034/src Modified Files: data.c defaults.c mswindow.c newwin.c Log Message: Added "mainTitleBar: on/(off)" to choose whether to start game with title bar on. As always, title bar can be toggled by alt+enter. Changed default phaser window size. Updated to do list. Index: newwin.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/newwin.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- newwin.c 14 Jun 2006 10:38:38 -0000 1.40 +++ newwin.c 23 Jun 2006 08:50:14 -0000 1.41 @@ -875,9 +875,9 @@ messwk = W_MakeScrollingRichTextWindow ("review_kill", 506, 717, 81, 3, baseWin, BORDER); wam_windows[3] = messwk; - phaserwin = W_MakeScrollingRichTextWindow ("review_phaser", WINSIDE + BORDER + 6, YOFF + + phaserwin = W_MakeScrollingRichTextWindow ("review_phaser", WINSIDE + 6, YOFF + WINSIDE + 3 * BORDER + 2 * MESSAGESIZE + - 15 * W_Textheight + 16, 80, 4, baseWin, BORDER); + 15 * W_Textheight + 16, 81, 4, baseWin, BORDER); wam_windows[4] = phaserwin; reviewWin = W_MakeScrollingRichTextWindow ("review", 506, 540, 81, 22, baseWin, BORDER); Index: mswindow.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/mswindow.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- mswindow.c 13 Jun 2006 11:18:23 -0000 1.36 +++ mswindow.c 23 Jun 2006 08:50:14 -0000 1.37 @@ -1142,19 +1142,14 @@ s = title_buff; sprintf (title_buff, "Netrek @ %s", serverName); } -// SRS /4/4/98 SpecialStyle = WS_OVERLAPPEDWINDOW; //Make main window sizeable - // These options give a window with a title bar, along with ability to minimize -// This fullscreen stuff doesn't work. It's throwing exceptions now. No time to fix. -// SRS 11/29/02 - // if (booleanDefault("fullscreen",0)) // WS_THICKFRAME adds resizing frame to window without adding titlebar mainResizeable = booleanDefault ("mainResizeable", mainResizeable); + mainTitleBar = booleanDefault ("mainTitleBar", mainTitleBar); + SpecialStyle |= WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU; if (mainResizeable) - SpecialStyle |= WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU; - else - SpecialStyle |= WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU; -// else -// SpecialStyle |= WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU; + SpecialStyle |= WS_THICKFRAME; + if (mainTitleBar) + SpecialStyle |= WS_CAPTION; } else if (strcmp (name, "wait") == 0) { Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- defaults.c 13 Jun 2006 11:18:23 -0000 1.26 +++ defaults.c 23 Jun 2006 08:50:14 -0000 1.27 @@ -211,6 +211,12 @@ NULL } }, + {"mainTitleBar", &mainTitleBar, RC_BOOL, + { + "Start main window with title bar on (can be toggled by alt+enter)", + NULL + } + }, {"mainResizeable", &mainResizeable, RC_BOOL, { "Make main window resizeable", Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- data.c 14 Jun 2006 10:38:38 -0000 1.38 +++ data.c 23 Jun 2006 08:50:14 -0000 1.39 @@ -734,6 +734,7 @@ int windowMove = 0; int mainResizeable = 1; +int mainTitleBar = 0; int observerMode = 0; int showHockeyScore = 1; From modemhero at users.sourceforge.net Fri Jun 23 03:50:15 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 23 Jun 2006 08:50:15 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C, 1.56, 1.57 clientr.suo, 1.33, 1.34 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24034 Modified Files: NetrekXP to do list.C clientr.suo Log Message: Added "mainTitleBar: on/(off)" to choose whether to start game with title bar on. As always, title bar can be toggled by alt+enter. Changed default phaser window size. Updated to do list. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- NetrekXP to do list.C 19 Jun 2006 04:46:02 -0000 1.56 +++ NetrekXP to do list.C 23 Jun 2006 08:50:13 -0000 1.57 @@ -20,18 +20,12 @@ Things that go wrong when short packets are on: 1) cloaking/shields at warp 0 doesn't update someone else's tactical on what you did if there is no movement anywhere on map, and observer sound also messes up -2) Observers don't get any geno message at all (head to default which is error message) - -actually, they do get the whydead, but it's somehow after they are sent to quit screen. -When obs quits, their state is K_WINNER ..and they see the new geno bitmap. +2) Observers don't get any geno message at all due to whydead not being sent as +a critical packet 3) The new smooth turning only working on self, not obs or others - short packets only send headings of 16 positions. 4) Others speed only sent to 16..messed up for obs locked onto puck in hockey, or twarpers -5) More detail on problem with whydead not updating with SP on. It's not just an observer thing, -for players too, the first update where pstatus changes, whydead is not sent. Only on 2nd update. -Now for regular players, not a problem, as they get several explosion updates on geno, so on 2nd explosion -frame they get the proper whydead. But observers just go to quit screen. So they don't have updated -whydead until next update. Things that are sorta fixed, but could use improvement: 1) Bug with waraction..was being called even when clicking on border (broke function) @@ -57,7 +51,10 @@ scroll button, alt-enter, change to review all..and it shows up. 7a) review all scrolling messes up text, if bottom of window is below the visible bottom border of netrek window. Actually will happen to whatever window is mapped -down there at bottom of screen +down there at bottom of screen. Apprently the native windows function doesn't properly +scroll text that is outside the viewable window. +8) Have client utilize new pingpong plasma server code +9) Have client utilize new server torp vector code Stas's list: - color coded playerlist. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 Binary files /tmp/cvsh2naTh and /tmp/cvsVBWvJM differ From modemhero at users.sourceforge.net Fri Jun 23 03:50:16 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 23 Jun 2006 08:50:16 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs README for Win95, Win98, and WinME.TXT, 1.4, 1.5 changes.txt, 1.73, 1.74 netrekrc, 1.5, 1.6 netrekrc_options.txt, 1.13, 1.14 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24034/resources/docs Modified Files: README for Win95, Win98, and WinME.TXT changes.txt netrekrc netrekrc_options.txt Log Message: Added "mainTitleBar: on/(off)" to choose whether to start game with title bar on. As always, title bar can be toggled by alt+enter. Changed default phaser window size. Updated to do list. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- netrekrc 13 Jun 2006 11:40:00 -0000 1.5 +++ netrekrc 23 Jun 2006 08:50:14 -0000 1.6 @@ -110,6 +110,9 @@ # Make main window resizeable mainResizeable: on +# Start main window with title bar on (can be toggled by alt+enter) +mainTitleBar: off + # Message hold threshold messageHoldThresh: 0 @@ -269,7 +272,7 @@ showArmy: on # Show hints window -showHints: off +showHints: on # Show hockey lines on map # Works only on hockey server Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- netrekrc_options.txt 13 Jun 2006 11:18:22 -0000 1.13 +++ netrekrc_options.txt 23 Jun 2006 08:50:14 -0000 1.14 @@ -78,6 +78,7 @@ login: (string) character login macroKey: (char, ESC, TAB) key to toggle macro mode mainResizeable: (on/off) make main window (netrek) resizeable +mainTitleBar: (on/off) start main window with title bar on (can be toggled by alt-enter) messageHoldThresh: (integer) put message on hold after mouse move (Adds # to the end of message) messageHUD: (0-2) where to duplicate message that is written in message window # 0 - none (default) Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- changes.txt 15 Jun 2006 05:09:04 -0000 1.73 +++ changes.txt 23 Jun 2006 08:50:14 -0000 1.74 @@ -1,4 +1,6 @@ Version 1.1: +- added "mainTitleBar: on/(off)" to choose whether to start game with title bar on. As always, + title bar can be toggled by alt+enter. - changed COW, KRP and text dashboard so they display ATT ship correctly - changed the way dashboard reports negative values for the bars (hull,shield,fuel,etc) - instead of getting a garbled display since most of the dashboards can't handle negative values, Index: README for Win95, Win98, and WinME.TXT =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/README for Win95, Win98, and WinME.TXT,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- README for Win95, Win98, and WinME.TXT 6 Jun 2006 08:23:05 -0000 1.4 +++ README for Win95, Win98, and WinME.TXT 23 Jun 2006 08:50:14 -0000 1.5 @@ -1,9 +1,3 @@ -As Windows 95/98/ME user, please use the executable labeled netrek9598ME, rather than -netrek. The reason for two executables is due to a font resource problem, that requires -the client to be compiled different to work on older vs newer operating systems. -I acknowledge this is not the best solution, I will try to have it fixed in a future -version. - The following options will NOT work with Windows 95/98/ME, due to the use of a native Windows transform function that was not added until Windows 2000: From modemhero at users.sourceforge.net Fri Jun 23 05:07:09 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 23 Jun 2006 10:07:09 +0000 Subject: [netrek-cvs] client/netrekxp/resources/weaplibm/color mplasmaC.bmp, 1.1, 1.2 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/weaplibm/color In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26407/resources/weaplibm/color Modified Files: mplasmaC.bmp Log Message: Client support for new server ping-pong plasma code (to tell whether plasma is hostile or friendly) Index: mplasmaC.bmp =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/weaplibm/color/mplasmaC.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 Binary files /tmp/cvsNbRUeA and /tmp/cvskjxl8z differ From modemhero at users.sourceforge.net Fri Jun 23 05:07:09 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 23 Jun 2006 10:07:09 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c,1.43,1.44 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26407/src Modified Files: local.c Log Message: Client support for new server ping-pong plasma code (to tell whether plasma is hostile or friendly) Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- local.c 13 Jun 2006 11:18:23 -0000 1.43 +++ local.c 23 Jun 2006 10:07:07 -0000 1.44 @@ -2210,10 +2210,7 @@ ptorpTeam = 2; } } - if (pt->pt_owner != me->p_no && ((pt->pt_war & me->p_team) || - (players[pt->pt_owner]. - p_team & (me->p_hostile | me-> - p_swar)))) + if (pt->pt_war & me->p_team) { W_WriteBitmap (dx - (BMP_CPLASMATORP_WIDTH / 2), dy - (BMP_CPLASMATORP_HEIGHT / 2), @@ -2232,14 +2229,10 @@ clearzone[2][clearcount] = BMP_CPLASMATORP_WIDTH; clearzone[3][clearcount] = BMP_CPLASMATORP_HEIGHT; clearcount++; - } - else - { - /* needmore: if(pt->pt_war & me->p_team) */ - if (pt->pt_owner != me->p_no && ((pt->pt_war & me->p_team) || - (players[pt->pt_owner]. - p_team & (me->p_hostile | me-> - p_swar)))) + } + else + { + if (pt->pt_war & me->p_team) { W_WriteBitmap (dx - (eplasmatorp_width / 2), dy - (eplasmatorp_height / 2), From modemhero at users.sourceforge.net Fri Jun 23 05:07:06 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 23 Jun 2006 10:07:06 +0000 Subject: [netrek-cvs] client/netrekxp NetrekXP to do list.C,1.57,1.58 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26407 Modified Files: NetrekXP to do list.C Log Message: Client support for new server ping-pong plasma code (to tell whether plasma is hostile or friendly) Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- NetrekXP to do list.C 23 Jun 2006 08:50:13 -0000 1.57 +++ NetrekXP to do list.C 23 Jun 2006 10:07:04 -0000 1.58 @@ -53,8 +53,7 @@ bottom border of netrek window. Actually will happen to whatever window is mapped down there at bottom of screen. Apprently the native windows function doesn't properly scroll text that is outside the viewable window. -8) Have client utilize new pingpong plasma server code -9) Have client utilize new server torp vector code +8) Have client utilize new server torp vector code Stas's list: - color coded playerlist. From modemhero at users.sourceforge.net Fri Jun 23 05:07:06 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Fri, 23 Jun 2006 10:07:06 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.74,1.75 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26407/resources/docs Modified Files: changes.txt Log Message: Client support for new server ping-pong plasma code (to tell whether plasma is hostile or friendly) Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -r1.74 -r1.75 --- changes.txt 23 Jun 2006 08:50:14 -0000 1.74 +++ changes.txt 23 Jun 2006 10:07:04 -0000 1.75 @@ -1,4 +1,7 @@ Version 1.1: +- client can now tell if a ping-pong plasma is hostile to your ship (no longer assumes your own + plasma or your team's plasmas are friendly) - the plasma will be drawn different depending + on if it is hostile to you or not. - added "mainTitleBar: on/(off)" to choose whether to start game with title bar on. As always, title bar can be toggled by alt+enter. - changed COW, KRP and text dashboard so they display ATT ship correctly From modemhero at users.sourceforge.net Sat Jun 24 18:48:59 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 24 Jun 2006 23:48:59 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs hints.dat,1.7,1.8 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2047/resources/docs Modified Files: hints.dat Log Message: Tip window entry for det circle. Build fix to remove unnecessary file from distribution. Index: hints.dat =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/hints.dat,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- hints.dat 26 May 2006 05:58:08 -0000 1.7 +++ hints.dat 24 Jun 2006 23:48:57 -0000 1.8 @@ -1,4 +1,5 @@ to disable this window permanently you should add "showHints: off" to your rc file +the red circle you may see around your ship is the range at which you can detonate enemy torpedoes, you can turn this circle off through the ship menu. you can use Alt+Enter to toggle the main title bar on and off. you can send messages from the player list window. Left click for individual messages, middle mouse button click for all board messages, and right click for team messages. you can remap keys by pointing at the key in the help window and pushing the key you want that option to be. From modemhero at users.sourceforge.net Sat Jun 24 18:48:59 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sat, 24 Jun 2006 23:48:59 +0000 Subject: [netrek-cvs] client/netrekxp build.cmd, 1.19, 1.20 clientr.suo, 1.34, 1.35 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2047 Modified Files: build.cmd clientr.suo Log Message: Tip window entry for det circle. Build fix to remove unnecessary file from distribution. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 Binary files /tmp/cvs3q8VUi and /tmp/cvsuT4qqh differ Index: build.cmd =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- build.cmd 14 Jun 2006 10:38:36 -0000 1.19 +++ build.cmd 24 Jun 2006 23:48:56 -0000 1.20 @@ -476,7 +476,10 @@ copy resources\misclib\mono\beeplite*.bmp %InstCWD%\netrek\bitmaps\misclib mkdir %InstCWD%\netrek\bitmaps\misclib\color -copy resources\misclib\color\*.bmp %InstCWD%\netrek\bitmaps\misclib\color +copy resources\misclib\color\clock.bmp %InstCWD%\netrek\bitmaps\misclib\color +copy resources\misclib\color\clockhand.bmp %InstCWD%\netrek\bitmaps\misclib\color +copy resources\misclib\color\genocide.bmp %InstCWD%\netrek\bitmaps\misclib\color +copy resources\misclib\color\genocide2.bmp %InstCWD%\netrek\bitmaps\misclib\color copy resources\fonts\ntfonts2.fon %InstCWD%\netrek From modemhero at users.sourceforge.net Sun Jun 25 03:19:42 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 25 Jun 2006 08:19:42 +0000 Subject: [netrek-cvs] client/netrekxp/src data.c, 1.39, 1.40 defaults.c, 1.27, 1.28 local.c, 1.44, 1.45 option.c, 1.23, 1.24 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25812/src Modified Files: data.c defaults.c local.c option.c Log Message: Puckcircle option to show max puck pressor range. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- local.c 23 Jun 2006 10:07:07 -0000 1.44 +++ local.c 25 Jun 2006 08:19:40 -0000 1.45 @@ -1179,7 +1179,22 @@ clearcount++; } } - +#ifdef HOCKEY_LINES + /* Puck circle */ + if (puckCircle && hockey_mode) + { + if (myPlayer(j) || isObsLockPlayer(j)) + { + W_WriteCircle(w, WINSIDE/2, WINSIDE/2, SHOTRANGE/SCALE, 0, W_Grey); + clearzone[0][clearcount] = WINSIDE/2 - (SHOTRANGE/SCALE); + clearzone[1][clearcount] = WINSIDE/2 - (SHOTRANGE/SCALE); + clearzone[2][clearcount] = 2*SHOTRANGE/SCALE; + clearzone[3][clearcount] = 2*SHOTRANGE/SCALE; + clearcount++; + } + } +#endif + #ifdef BEEPLITE if (tts_timer) { Index: defaults.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- defaults.c 23 Jun 2006 08:50:14 -0000 1.27 +++ defaults.c 25 Jun 2006 08:19:40 -0000 1.28 @@ -439,6 +439,12 @@ } }, #endif + {"puckCircle", &puckCircle, RC_BOOL, + { + "Show the puck's max shot range as a circle around your ship", + NULL + } + }, {"redrawDelay", &redrawDelay, RC_INT, { "Number of updates before redraw", @@ -1480,6 +1486,7 @@ showPlanetOwner = booleanDefault ("showPlanetOwner", showPlanetOwner); newDashboard = intDefault ("newDashboard", newDashboard); detCircle = booleanDefault ("detCircle", detCircle); + puckCircle = booleanDefault ("puckCircle", puckCircle); showArmy = booleanDefault ("showArmy", showArmy); updatesPerSec = intDefault ("updatesPerSec", updatesPerSec); redrawDelay = intDefault ("redrawDelay", redrawDelay); Index: option.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- option.c 13 Jun 2006 11:18:23 -0000 1.23 +++ option.c 25 Jun 2006 08:19:40 -0000 1.24 @@ -271,6 +271,9 @@ {1, "shrink phasers on a miss", &shrinkPhaserOnMiss, 0, 0, 0, NULL, NULL}, {1, "report kills", &reportKills, 0, 0, 0, NULL, NULL}, {1, "show det circle", &detCircle, 0, 0, 0, NULL, NULL}, +#ifdef HOCKEY_LINES + {1, "show puck circle", &puckCircle, 0, 0, 0, NULL, NULL}, +#endif {1, "done", ¬done, 0, 0, 0, NULL, NULL}, {-1, NULL, 0, 0, 0, 0, NULL, NULL} }; @@ -899,6 +902,12 @@ if (showHockeyScore && !hockey_mode ()) showHockeyScore = 0; } + else if (op->op_option == &puckCircle) + { + // same as above + if (puckCircle && !hockey_mode ()) + puckCircle = 0; + } #endif /* Let's see if this is our double buffering changed */ else if (op->op_option == &doubleBuffering) Index: data.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- data.c 23 Jun 2006 08:50:14 -0000 1.39 +++ data.c 25 Jun 2006 08:19:40 -0000 1.40 @@ -55,6 +55,7 @@ int old_db = 0; /* should be same as * newDashboard */ int detCircle = 0; /* Show det circle on tactical */ +int puckCircle = 0; /* Show maximum puck shooting distance on tactical */ int showArmy = 1; /* Show army count of planet you are orbiting */ int fastQuit = 0; int gen_distress = 0; /* generic distress/macro From modemhero at users.sourceforge.net Sun Jun 25 03:19:42 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 25 Jun 2006 08:19:42 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt, 1.75, 1.76 netrekrc, 1.6, 1.7 netrekrc_options.txt, 1.14, 1.15 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25812/resources/docs Modified Files: changes.txt netrekrc netrekrc_options.txt Log Message: Puckcircle option to show max puck pressor range. Index: netrekrc =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- netrekrc 23 Jun 2006 08:50:14 -0000 1.6 +++ netrekrc 25 Jun 2006 08:19:40 -0000 1.7 @@ -230,6 +230,9 @@ # Use new UDP code portSwap: on +# Show the puck's max shot range as a circle around your ship +puckCircle: off + # Number of updates before redraw redrawDelay: 0 @@ -690,9 +693,15 @@ macro.0.A:% __ __ ______ __ Want to see some better graphics? macro.0.A:% / \ / /__/_ __/______ / /__ Want a better sounding client? macro.0.A:% / /\ \/ / -_)/ / / __/ -_) '_/ -macro.0.A:% /_/ \__/\__//_/ /_/ \__/_/\_\ XP 2006, v1.0 +macro.0.A:% /_/ \__/\__//_/ /_/ \__/_/\_\ XP 2006, v1.1 macro.0.A:% Get it today at http://www.netrek.org +macro.).A: /* Get the latest version of Netrek XP 2006 today! */ +macro.).A: /* Current version is 1.1, released June 26, 2006 */ +macro.).A: /* Download it at http://www.netrek.org/files/NetrekXP_2006/ */ +macro.).A: /* or */ +macro.).A: /* http://www.playnetrek.org/ */ + macro.a.A:. o Just | Squeal boy... macro.a.A:. //\ %p: ABUSED! Plain | just like a macro.a.A:. o )/ Wrong (tm) | hog! Index: netrekrc_options.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/netrekrc_options.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- netrekrc_options.txt 23 Jun 2006 08:50:14 -0000 1.14 +++ netrekrc_options.txt 25 Jun 2006 08:19:40 -0000 1.15 @@ -195,6 +195,7 @@ port: (port) default port port.: (port) port for portSwap: (on/off) use UDP port swap code (use if you behind NAT) +puckCircle: (on/off) show the puck's max shot range as a circle around your ship rcfile-: (path) use this file as netrekrc for ship (sc,dd,ca,bb,as,sb,ga,att) redrawDelay: (0-10) how many updates to wait before redraw rejectMacro: (on/off) reject macros Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- changes.txt 23 Jun 2006 10:07:04 -0000 1.75 +++ changes.txt 25 Jun 2006 08:19:40 -0000 1.76 @@ -1,4 +1,6 @@ Version 1.1: +- added "puckCircle: on/(off)" to show the puck's max shot range as a circle around your ship, works + on hockey servers only. - client can now tell if a ping-pong plasma is hostile to your ship (no longer assumes your own plasma or your team's plasmas are friendly) - the plasma will be drawn different depending on if it is hostile to you or not. From modemhero at users.sourceforge.net Sun Jun 25 03:19:42 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 25 Jun 2006 08:19:42 +0000 Subject: [netrek-cvs] client/netrekxp/include data.h, 1.35, 1.36 defs.h, 1.9, 1.10 Message-ID: Update of /cvsroot/netrek/client/netrekxp/include In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25812/include Modified Files: data.h defs.h Log Message: Puckcircle option to show max puck pressor range. Index: defs.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/defs.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- defs.h 22 May 2006 08:27:52 -0000 1.9 +++ defs.h 25 Jun 2006 08:19:40 -0000 1.10 @@ -58,7 +58,8 @@ * explode */ #define DETDIST 1700 /* At this range a player * can detonate a torp */ - +#define SHOTRANGE 3000 /* At this range a player + * can shoot the puck */ #define PHASEDIST 6000 /* At this range a player * can do damage with * phasers */ Index: data.h =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/include/data.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- data.h 23 Jun 2006 08:50:13 -0000 1.35 +++ data.h 25 Jun 2006 08:19:39 -0000 1.36 @@ -172,6 +172,7 @@ extern int colorWeapons; extern int newDashboard, old_db; extern int detCircle; +extern int puckCircle; extern int showArmy; extern int niftyNewMessages; extern int fastQuit; From modemhero at users.sourceforge.net Sun Jun 25 03:19:42 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Sun, 25 Jun 2006 08:19:42 +0000 Subject: [netrek-cvs] client/netrekxp/resources/htmlhelp/html generalconfig.html, 1.17, 1.18 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv25812/resources/htmlhelp/html Modified Files: generalconfig.html Log Message: Puckcircle option to show max puck pressor range. Index: generalconfig.html =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/htmlhelp/html/generalconfig.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- generalconfig.html 23 Jun 2006 08:50:14 -0000 1.17 +++ generalconfig.html 25 Jun 2006 08:19:40 -0000 1.18 @@ -790,6 +790,16 @@ +puckCircle +Show the puck's max shot range as a circle around your ship + +
    +
  • on
    • +
  • off (default)
    • +
+ + + rcfile-<ship>
<ship> can be one of sc,dd,cs,bb,as,sb,ga,att Path to separate defaults for specific ship path From modemhero at users.sourceforge.net Sun Jun 25 20:21:03 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 26 Jun 2006 01:21:03 +0000 Subject: [netrek-cvs] client/netrekxp/resources/docs changes.txt,1.76,1.77 Message-ID: Update of /cvsroot/netrek/client/netrekxp/resources/docs In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21534/resources/docs Modified Files: changes.txt Log Message: Bug fix for puckcircle redraw. Preparation for final v1.1 release. Index: changes.txt =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/resources/docs/changes.txt,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- changes.txt 25 Jun 2006 08:19:40 -0000 1.76 +++ changes.txt 26 Jun 2006 01:21:01 -0000 1.77 @@ -1,4 +1,4 @@ -Version 1.1: +Netrek XP 2006, Version 1.1: (Released 26-Jun-2006) - added "puckCircle: on/(off)" to show the puck's max shot range as a circle around your ship, works on hockey servers only. - client can now tell if a ping-pong plasma is hostile to your ship (no longer assumes your own From modemhero at users.sourceforge.net Sun Jun 25 20:21:03 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 26 Jun 2006 01:21:03 +0000 Subject: [netrek-cvs] client/netrekxp clientr.suo,1.35,1.36 Message-ID: Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21534 Modified Files: clientr.suo Log Message: Bug fix for puckcircle redraw. Preparation for final v1.1 release. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 Binary files /tmp/cvsSlHq9g and /tmp/cvs2yPmSj differ From modemhero at users.sourceforge.net Sun Jun 25 20:21:03 2006 From: modemhero at users.sourceforge.net (Bill Balcerski) Date: Mon, 26 Jun 2006 01:21:03 +0000 Subject: [netrek-cvs] client/netrekxp/src local.c,1.45,1.46 Message-ID: Update of /cvsroot/netrek/client/netrekxp/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21534/src Modified Files: local.c Log Message: Bug fix for puckcircle redraw. Preparation for final v1.1 release. Index: local.c =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/src/local.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- local.c 25 Jun 2006 08:19:40 -0000 1.45 +++ local.c 26 Jun 2006 01:21:01 -0000 1.46 @@ -1174,8 +1174,8 @@ W_WriteCircle(w, WINSIDE/2, WINSIDE/2, DETDIST/SCALE, 0, W_Red); clearzone[0][clearcount] = WINSIDE/2 - (DETDIST/SCALE); clearzone[1][clearcount] = WINSIDE/2 - (DETDIST/SCALE); - clearzone[2][clearcount] = 2*DETDIST/SCALE; - clearzone[3][clearcount] = 2*DETDIST/SCALE; + clearzone[2][clearcount] = 2*DETDIST/SCALE + 1; + clearzone[3][clearcount] = 2*DETDIST/SCALE + 1; clearcount++; } } @@ -1188,8 +1188,8 @@ W_WriteCircle(w, WINSIDE/2, WINSIDE/2, SHOTRANGE/SCALE, 0, W_Grey); clearzone[0][clearcount] = WINSIDE/2 - (SHOTRANGE/SCALE); clearzone[1][clearcount] = WINSIDE/2 - (SHOTRANGE/SCALE); - clearzone[2][clearcount] = 2*SHOTRANGE/SCALE; - clearzone[3][clearcount] = 2*SHOTRANGE/SCALE; + clearzone[2][clearcount] = 2*SHOTRANGE/SCALE + 1; + clearzone[3][clearcount] = 2*SHOTRANGE/SCALE + 1; clearcount++; } }