[Frontierproject-cvs] frontierproject/include ClientObjects.h,1.4,1.5 FrontierClient.h,1.6,1.7 autoT
Status: Pre-Alpha
Brought to you by:
bdragon28
|
From: Brandon B. <bdr...@us...> - 2006-05-18 07:08:26
|
Update of /cvsroot/frontierproject/frontierproject/include In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv31984/include Modified Files: ClientObjects.h FrontierClient.h autoTarget.h widget_painter.h Log Message: Got a lot done today. Index: autoTarget.h =================================================================== RCS file: /cvsroot/frontierproject/frontierproject/include/autoTarget.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** autoTarget.h 17 May 2006 20:45:29 -0000 1.1 --- autoTarget.h 18 May 2006 07:08:20 -0000 1.2 *************** *** 26,30 **** * AutoTarget. * So there I was, wondering how the hell I was going to make the Set Packet Destination ! * button work. All of the sudden, I had a flash of inspiration. */ class autoTarget --- 26,33 ---- * AutoTarget. * So there I was, wondering how the hell I was going to make the Set Packet Destination ! * button work. All of the sudden, I had a flash of inspiration: ! * Why not combine gdArt style storage with FXDataTarget? ! * Then, for example, you can connect to /object/whatever and manipulate stuff, and it will ! * apply automatically elsewhere. */ class autoTarget *************** *** 33,39 **** static bool init(); static FXDataTarget* tieInt(const char *key, FXint def=0); ! // static FXIcon* getIcon(const FXchar *name); ! // static FXIcon* getPlanetIcon(int num); ! // static FXIcon* getPartSlot(const FXchar *name); private: --- 36,40 ---- static bool init(); static FXDataTarget* tieInt(const char *key, FXint def=0); ! static FXDataTarget* tieBool(const char *key, FXbool def=false); private: Index: FrontierClient.h =================================================================== RCS file: /cvsroot/frontierproject/frontierproject/include/FrontierClient.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FrontierClient.h 17 May 2006 20:45:29 -0000 1.6 --- FrontierClient.h 18 May 2006 07:08:20 -0000 1.7 *************** *** 27,30 **** --- 27,34 ---- //Toolkit includes #include <fx.h> + using namespace FX; + + #include <deque> + #include <vector> //Server includes Index: ClientObjects.h =================================================================== RCS file: /cvsroot/frontierproject/frontierproject/include/ClientObjects.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ClientObjects.h 14 May 2006 05:22:11 -0000 1.4 --- ClientObjects.h 18 May 2006 07:08:20 -0000 1.5 *************** *** 41,44 **** --- 41,49 ---- :Galaxy(){} virtual ~CGalaxy(); + + // void GetWormholes( + // std::deque<FreeStars::Wormhole*>::const_iterator&, + // std::deque<FreeStars::Wormhole*>::const_iterator&); + const std::deque<FreeStars::Wormhole*>& GetWormholes(); }; Index: widget_painter.h =================================================================== RCS file: /cvsroot/frontierproject/frontierproject/include/widget_painter.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** widget_painter.h 17 May 2006 20:45:29 -0000 1.14 --- widget_painter.h 18 May 2006 07:08:20 -0000 1.15 *************** *** 115,119 **** FXfloat zoom; //Zoom factor. ! bool d_DrawFlags; bool d_PlanetSizeIsHab; bool d_PlanetSizeIsPop; --- 115,121 ---- FXfloat zoom; //Zoom factor. ! //bool d_DrawFlags; ! ! bool d_PlanetSizeIsHab; bool d_PlanetSizeIsPop; *************** *** 122,131 **** //Public inlines ! FXbool canFocus() const { return 1; } protected: FXPixel bgcol; ! FXint simulateShift; //Disable default and copy ctors. --- 124,135 ---- //Public inlines ! FXbool canFocus(){ return 1; } protected: FXPixel bgcol; ! ! FXbool *simulateShift; ! FXbool *d_drawFlags; //Disable default and copy ctors. *************** *** 191,195 **** - }; #endif --- 195,198 ---- |