Revision: 6695
http://playerstage.svn.sourceforge.net/playerstage/?rev=6695&view=rev
Author: jeremy_asher
Date: 2008-06-26 13:33:09 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
Cleaned up code changes from Options additions
Modified Paths:
--------------
code/stage/trunk/libstage/stage.hh
code/stage/trunk/libstage/world.cc
Modified: code/stage/trunk/libstage/stage.hh
===================================================================
--- code/stage/trunk/libstage/stage.hh 2008-06-26 20:29:42 UTC (rev 6694)
+++ code/stage/trunk/libstage/stage.hh 2008-06-26 20:33:09 UTC (rev 6695)
@@ -55,8 +55,6 @@
#include <sys/time.h>
#include <iostream>
#include <vector>
-#include <map>
-#include <set>
// we use GLib's data structures extensively. Perhaps we'll move to
// C++ STL types to lose this dependency one day.
@@ -1017,7 +1015,6 @@
//GHashTable* models_by_id; ///< the models that make up the world,
indexed by id
GHashTable* models_by_name; ///< the models that make up the world,
indexed by name
- std::map< std::string, StgModel* > modelsByName;
GList* velocity_list; ///< a list of models that have non-zero
velocity, for efficient updating
//stg_usec_t wall_last_update; ///< the real time of the last update in ms
@@ -2076,8 +2073,6 @@
// GUI functions
bool saveAsDialog();
bool closeWindowQuery();
-
- std::set<Option*> DrawOptions;
};
Modified: code/stage/trunk/libstage/world.cc
===================================================================
--- code/stage/trunk/libstage/world.cc 2008-06-26 20:29:42 UTC (rev 6694)
+++ code/stage/trunk/libstage/world.cc 2008-06-26 20:33:09 UTC (rev 6695)
@@ -320,7 +320,6 @@
//g_hash_table_remove_all( models_by_id );
g_hash_table_remove_all( models_by_name );
- modelsByName.clear();
g_list_free( velocity_list );
velocity_list = NULL;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
