From: <ac...@us...> - 2008-07-13 00:19:22
|
Revision: 1893 http://planeshift.svn.sourceforge.net/planeshift/?rev=1893&view=rev Author: acraig Date: 2008-07-12 17:19:30 -0700 (Sat, 12 Jul 2008) Log Message: ----------- Removed the 'action' parameter from gemObject::InitMesh() since it was never used. Modified Paths: -------------- trunk/docs/history.txt trunk/src/server/gem.cpp trunk/src/server/gem.h Modified: trunk/docs/history.txt =================================================================== --- trunk/docs/history.txt 2008-07-12 23:28:52 UTC (rev 1892) +++ trunk/docs/history.txt 2008-07-13 00:19:30 UTC (rev 1893) @@ -1,6 +1,7 @@ *** 2008-07-12 by Andrew Craig -- Added in a helper function that will be used to attach gemObjects to meshes. Part - of a server side clean up. +- Added in a helper function that will be used to attach gemObjects to meshes. + Part of a server side clean up. +- Removed the 'action' from gemObject::InitMesh() function since it was never used. *** 2008-07-12 by Mike Gist - Fixed FS#1872, thanks to peeg for looking at this. Modified: trunk/src/server/gem.cpp =================================================================== --- trunk/src/server/gem.cpp 2008-07-12 23:28:52 UTC (rev 1892) +++ trunk/src/server/gem.cpp 2008-07-13 00:19:30 UTC (rev 1893) @@ -709,7 +709,7 @@ prox_distance_desired=DEF_PROX_DIST; prox_distance_current=DEF_PROX_DIST; - if (!InitMesh(name,factname,filename,pos,rotangle,room,NULL)) + if (!InitMesh(name,factname,filename,pos,rotangle,room)) { Error1("Could not create gemObject because mesh could not be Init'd."); Error4("Name: %s Factory: %s File: %s\n", name, factname, filename ); @@ -786,8 +786,7 @@ const char *filename, const csVector3& pos, const float rotangle, - iSector* room, - const char *action) + iSector* room) { csRef<iCelPropertyClass> pc; @@ -921,9 +920,6 @@ Move(pos,rotangle,room); - if (action) - pcmesh->SetAnimation(action, false); - return true; } Modified: trunk/src/server/gem.h =================================================================== --- trunk/src/server/gem.h 2008-07-12 23:28:52 UTC (rev 1892) +++ trunk/src/server/gem.h 2008-07-13 00:19:30 UTC (rev 1893) @@ -363,7 +363,7 @@ bool InitProximityList(float radius,int clientnum); bool InitMesh(const char *name,const char *factname,const char *filename, - const csVector3& pos,const float rotangle,iSector* room, const char *action); + const csVector3& pos,const float rotangle,iSector* room); }; /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |