Update of /cvsroot/netrek/client/netrekxp In directory sc8-pr-cvs16:/tmp/cvs-serv31445 Modified Files: build.cmd clientr.suo Log Message: A bunch of paradise additions, mostly separated by #ifdef's but a few things impact outside that condition, which are listed below. 1) Added paradise ships (CL, CV, FL, JS, PT, UT, WB) bitmap set and bitmaps for stars (local and map). 2) New function W_WriteRectangle, only used in paradise gridbox drawing, but it's available for general use. 3) Removed unused PLCLEAR flag. It overlapped with a paradise flag, and it wasn't used at all with current code so I just removed it. 4) Moved the redrawall = 0 from near top of main map function to bottom. I don't see any harm in doing this, and it was necessary to get a paradise draw function to work. 5) The BIGBITMAP_WIDTH size was changed from 240x240 to 500x500 to accomodate MOTD pics from paradise servers. Again I don't see any harm in increasing size. And this wasn't even used with bitmap storage, the StoreBitmap() function had been completely phased out. Along the way of adding in paradise functionality, numerous problems with defines have come up, ie MAXSECTOR, GWIDTH, ship array, and most seriously, overlapping packet types. There are also very serious problems with overlapping p_flag and p_status values, namely observers overlap with warp states and tournament queue status. Some p_whydead messages also overlap. Also paradise servers send phaser damage caps differently. Things that could use work are the motd paging system (gutted it for sake of simplicity), planet window (paradise has 2 planet windows, also sorting doesn't work), a bunch of gridline/zoom options should be made into netrekrc options. The galactic zoom doesn't work. Ships disappear while warping (due to the aforementioned problem with PFOBSERV overlap with PFWARP). Most of the paradise packet types, including special weapons and game parameters, are still not handled. Gwidth is not malleable based on paradise vs bronco server. No color ship bitmaps were added. No special items other than stars were added. No new weapon types like fighters were added. A bunch of keys like afterburners and engage warp don't exist. Info windows and rank windows not working right with paradise. Index: clientr.suo =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/clientr.suo,v retrieving revision 1.131 retrieving revision 1.132 diff -u -d -r1.131 -r1.132 Binary files /tmp/cvsjXgAYY and /tmp/cvsVTaM5U differ Index: build.cmd =================================================================== RCS file: /cvsroot/netrek/client/netrekxp/build.cmd,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- build.cmd 14 May 2007 02:56:35 -0000 1.27 +++ build.cmd 17 May 2007 08:49:45 -0000 1.28 @@ -441,6 +441,7 @@ copy resources\ships\mono\kli\klishipM.bmp %InstCWD%\netrek\bitmaps\shiplib copy resources\ships\mono\ori\orishipM.bmp %InstCWD%\netrek\bitmaps\shiplib copy resources\ships\mono\rom\romshipM.bmp %InstCWD%\netrek\bitmaps\shiplib +copy resources\ships\mono\paradise_ships.bmp %InstCWD%\netrek\bitmaps\shiplib copy resources\ships\grayscale\fed\fedshipG.bmp %InstCWD%\netrek\bitmaps\shiplib copy resources\ships\grayscale\ind\indshipG.bmp %InstCWD%\netrek\bitmaps\shiplib @@ -502,6 +503,7 @@ copy resources\misclib\color\genocide.bmp %InstCWD%\netrek\bitmaps\misclib\color copy resources\misclib\color\genocide2.bmp %InstCWD%\netrek\bitmaps\misclib\color copy resources\misclib\color\*team.bmp %InstCWD%\netrek\bitmaps\misclib\color +copy resources\misclib\color\star*.bmp %InstCWD%\netrek\bitmaps\misclib\color copy resources\fonts\ntfonts2.fon %InstCWD%\netrek