From: <wel...@us...> - 2009-11-07 08:47:52
|
Revision: 4726 http://planeshift.svn.sourceforge.net/planeshift/?rev=4726&view=rev Author: weltall2 Date: 2009-11-07 08:47:44 +0000 (Sat, 07 Nov 2009) Log Message: ----------- reverted things which shouldn't have been committed Modified Paths: -------------- trunk/src/server/bulkobjects/pscharacter.cpp trunk/src/server/cachemanager.cpp Modified: trunk/src/server/bulkobjects/pscharacter.cpp =================================================================== --- trunk/src/server/bulkobjects/pscharacter.cpp 2009-11-07 07:51:09 UTC (rev 4725) +++ trunk/src/server/bulkobjects/pscharacter.cpp 2009-11-07 08:47:44 UTC (rev 4726) @@ -3033,7 +3033,7 @@ return 0.0; Client* owner = EntityManager::GetSingleton().GetClients()->FindPlayer(params[0]); - if(owner->GetTargetType(GetActor()) & TARGET_FOE) + if(owner->GetTargetType(GetActor()) == TARGET_FOE) { return 1.0; } Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2009-11-07 07:51:09 UTC (rev 4725) +++ trunk/src/server/cachemanager.cpp 2009-11-07 08:47:44 UTC (rev 4726) @@ -1543,7 +1543,7 @@ return (id == csInvalidStringID) ? 0 : id.GetHash(); } -#define COMPRESSION_BUFFSIZE MAX_MESSAGE_SIZE-10000 +#define COMPRESSION_BUFFSIZE MAX_MESSAGE_SIZE/2 #define PACKING_BUFFSIZE COMPRESSION_BUFFSIZE*3 void CacheManager::GetCompressedMessageStrings(char*& data, unsigned long& size, uint32_t& num_strings, csMD5::Digest& digest) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |