From: <mg...@us...> - 2009-09-22 19:22:54
|
Revision: 4488 http://planeshift.svn.sourceforge.net/planeshift/?rev=4488&view=rev Author: mgist Date: 2009-09-22 19:22:48 +0000 (Tue, 22 Sep 2009) Log Message: ----------- - Cleaned up psconst.h a little. Modified Paths: -------------- trunk/src/common/paws/pawsgenericview.cpp trunk/src/common/util/psconst.h Modified: trunk/src/common/paws/pawsgenericview.cpp =================================================================== --- trunk/src/common/paws/pawsgenericview.cpp 2009-09-22 17:01:10 UTC (rev 4487) +++ trunk/src/common/paws/pawsgenericview.cpp 2009-09-22 19:22:48 UTC (rev 4488) @@ -92,7 +92,7 @@ csRef<iDocumentNode> worldNode = doc->GetRoot()->GetNode("world"); // Now load the map into the selected region - csRef<iThreadReturn> itr = loader->LoadMapWait(map, worldNode, CS_LOADER_KEEP_WORLD, col); + csRef<iThreadReturn> itr = loader->LoadMapWait(map, worldNode, false, col); if (!itr->WasSuccessful()) return false; Modified: trunk/src/common/util/psconst.h =================================================================== --- trunk/src/common/util/psconst.h 2009-09-22 17:01:10 UTC (rev 4487) +++ trunk/src/common/util/psconst.h 2009-09-22 19:22:48 UTC (rev 4488) @@ -27,31 +27,8 @@ #include <csutil/hash.h> #include "psstdint.h" //Added to fix msvc build -#define CS_PRIORITY_USE_CAMERA true - -#define CEL_CAMERA_USE_CD true -#define CEL_CAMERA_NO_CD false - -#define CEL_MESHSELECT_CAMERA_SPACE true -#define CEL_MESHSELECT_WORLD_SPACE false - -#define CS_TEXTURE_CREATE_MATERIAL true - -#define CS_MUTEX_RECURSIVE true - #define SOCKET_CLOSE_FORCED true -#define CS_FOLLOW_ONLY_PORTALS true - -#define CS_LIGHT_STATIC CS_LIGHT_DYNAMICTYPE_STATIC -#define CS_LIGHT_PSEUDO CS_LIGHT_DYNAMICTYPE_PSEUDO - -#define CS_LOADER_CLEAR_WORLD true -#define CS_LOADER_KEEP_WORLD false - -#define CS_LOADER_ONLY_REGION true -#define CS_LOADER_ACROSS_REGIONS false - #define DEF_PROX_DIST 100 ///< 100m is trial distance here #define DEF_UPDATE_DIST 5 ///< 30m is trial (default) delta to update #define PROX_LIST_ANY_RANGE 0.0 ///< range of 0 means all members of proxlist in multicast. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |