Revision: 6730
http://playerstage.svn.sourceforge.net/playerstage/?rev=6730&view=rev
Author: jeremy_asher
Date: 2008-07-02 10:08:34 -0700 (Wed, 02 Jul 2008)
Log Message:
-----------
Warning cleanup
Modified Paths:
--------------
code/stage/trunk/libstage/canvas.cc
code/stage/trunk/libstage/option.cc
code/stage/trunk/libstage/option.hh
Modified: code/stage/trunk/libstage/canvas.cc
===================================================================
--- code/stage/trunk/libstage/canvas.cc 2008-07-02 16:45:50 UTC (rev 6729)
+++ code/stage/trunk/libstage/canvas.cc 2008-07-02 17:08:34 UTC (rev 6730)
@@ -42,12 +42,12 @@
showFollow( "Follow", "show_follow", "F", false ),
showFootprints( "Footprints", "show_footprints", "f", false ),
showGrid( "Grid", "show_grid", "g", true ),
+ showOccupancy( "Debug/Occupancy", "show_occupancy", "#O", false ),
+ showScreenshots( "Save screenshots", "screenshots", "", false ),
showTrailArrows( "Trails/Rising Arrows", "show_trailarrows", "#a", false ),
showTrailRise( "Trails/Rising blocks", "show_trailrise", "#r", false ),
showTrails( "Trails/Fast", "show_trailfast", "t", false ),
- showTree( "Debug/Tree", "show_tree", "#T", false ),
- showOccupancy( "Debug/Occupancy", "show_occupancy", "#O", false ),
- showScreenshots( "Save screenshots", "screenshots", "", false )
+ showTree( "Debug/Tree", "show_tree", "#T", false )
{
end();
Modified: code/stage/trunk/libstage/option.cc
===================================================================
--- code/stage/trunk/libstage/option.cc 2008-07-02 16:45:50 UTC (rev 6729)
+++ code/stage/trunk/libstage/option.cc 2008-07-02 17:08:34 UTC (rev 6730)
@@ -2,6 +2,24 @@
using namespace Stg;
+
+Option::Option( std::string n, std::string tok, std::string key, bool v ) :
+optName( n ),
+value( v ),
+wf_token( tok ),
+shortcut( key ),
+menu_item( NULL )
+{ }
+
+Option::Option( const Option& o ) :
+optName( o.optName ),
+value( o.value ),
+wf_token( o.wf_token ),
+shortcut( o.shortcut ),
+menu_item( o.menu_item )
+{ }
+
+
void Option::Load( Worldfile* wf, int section )
{
Set( (bool)wf->ReadInt(section, wf_token.c_str(), value ));
Modified: code/stage/trunk/libstage/option.hh
===================================================================
--- code/stage/trunk/libstage/option.hh 2008-07-02 16:45:50 UTC (rev 6729)
+++ code/stage/trunk/libstage/option.hh 2008-07-02 17:08:34 UTC (rev 6730)
@@ -20,7 +20,7 @@
class Option {
private:
- friend bool compare( const Option* lhs, const Option* rhs );
+ friend bool compare( const Option* lhs, const Option* rhs );
std::string optName;
bool value;
@@ -30,20 +30,8 @@
Fl_Menu_Item* menu_item;
public:
- Option( std::string n, std::string tok, std::string key, bool v ) :
- optName( n ),
- wf_token( tok ),
- value( v ),
- shortcut( key ),
- menu_item( NULL )
- { }
-
- Option( const Option& o ) :
- optName( o.optName ),
- wf_token( o.wf_token ),
- shortcut( o.shortcut ),
- value( o.value )
- { }
+ Option( std::string n, std::string tok, std::string key, bool v
);
+ Option( const Option& o );
const std::string name() const { return optName; }
inline bool val() const { return value; }
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
