Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv14570 Modified Files: NetrekXP to do list.C Log Message: This lengthy patch contains one groundbreaking item - allowing user to configure directly the size of the local and map windows. Most of this patch fixes all the problems that needed to be solved to make this happen. First off, it was necessary to have the netrekrc defaults read in BEFORE windows are generated. So in both cowmain. and playback.c, the order of newwin() and resetdefaults() were exchanged. This created a problem though in the netrekrc Windows Allowed Message settings required the window to actually exist first, so this was yanked out of the resetdefaults() routine and placed into newwin(). It was also copied over to the reread netrekrc function, so that rereading netrekrc will update the WAMs. Half-finished code for rechecking windows geometry after reading defaults is now obsolete, and a comment has been left to that effect. This exchange also fixes one of the problems with richText. The netrekrc richText option now works, as it controls what sort of message windows are created. Still buggy, but at least it's mostly functional. Getting back to the initial goal, WINSIDE and SCALE were moved from defines to variables. This required some changes to be made. Any static variable which relied on WINSIDE had to be moved into functions. This was not so difficult, as it just required some view/fullview variables to be redefined in the star redraw functions, and tts_ypos had to be changed a bit so that the preferred value was not the value in data.c but rather a value based on WINSIDE. With WINSIDE now a variable, the checkGeometry function can now set WINSIDE to match the geometry in the user's netrekrc file. Some (ok a LOT) of work still needs to be done, to separate WINSIDE into 2 variables, TWINSIDE and GWINSIDE, so local and map can be different size squares. Testing WINSIDE=1000 revealed that the star sectors did not scale properly, and indeed it was a design flaw which needed to be fixed. Star sectors now are defined to be the size of the local window, and the star density remains constant no matter what size window. As it is now possible to have GWIDTH divided by star sectors != integer, it was necessary to put in some additonal checks against drawing stars outside of galactic bounds, and to add an additional star sector in either direction to handle the case where we need a fraction of a star sector to fill in space (i.e if WINSIDE = 1000, local stretches 40000 galactic units, that makes galaxy 2.5 star sectors wide, and since most things get rounded down, we need to create 2.5 + 1 = 3 star sectors). It turns out the old code made 4x as many star sectors as there was galaxy, for some odd reason, so this is a nice improvement actually! Since the local window can now be expanded, I added in a dashed line to show the old 20000x20000 local scale, because some data is not sent beyond this (ie other people's weapons). A new INFORANGE constant is defined, and if WINSIDE > INFORANGE, we draw these dashed lines to indicate fog of war. The SMALL_SCREEN option, which wasn't functional anyways, was removed as it is now obsolete. New draw line function W_MakeDashedLine for making a line using the dashed pen. Added in a debug statement to ignore feature packet settings to test the new infoborg features. Index: NetrekXP to do list.C =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/NetrekXP to do list.C,v retrieving revision 1.124 retrieving revision 1.125 diff -u -d -r1.124 -r1.125 --- NetrekXP to do list.C 4 Apr 2007 10:34:19 -0000 1.124 +++ NetrekXP to do list.C 5 Apr 2007 12:57:22 -0000 1.125 @@ -7,8 +7,6 @@ Things not gonna happen, or server problems: 2) torp_other and plasma_other not working right due to lack of torp fuse info 3) twarping to base docked on base causes the twarp problem, but hard to reproduce -4) Server sometimes not updating tract/press flags for observers, several instances -where a ship is seen to have pressors on constantly, even when they are off 5) Triple mode blanks planet names, if you vote to dogfight or hockey, names are not restored 6) "The 0 0 20 minutes before empire collapses" - with surrenderstart = 1 7) mars - lose nb_robots