From: <ral...@us...> - 2014-02-18 19:04:15
|
Revision: 9278 http://sourceforge.net/p/planeshift/code/9278 Author: ralphcampbell Date: 2014-02-18 19:04:09 +0000 (Tue, 18 Feb 2014) Log Message: ----------- Fix signed,->unsigned warnings Modified Paths: -------------- trunk/src/common/net/messages.cpp trunk/src/server/bulkobjects/psattackqueue.cpp trunk/src/server/bulkobjects/psattackqueue.h Modified: trunk/src/common/net/messages.cpp =================================================================== --- trunk/src/common/net/messages.cpp 2014-02-18 18:59:26 UTC (rev 9277) +++ trunk/src/common/net/messages.cpp 2014-02-18 19:04:09 UTC (rev 9278) @@ -1434,7 +1434,7 @@ if(command == "/queue") { attack = words.Get(1); - for(int i = 2; i < words.GetCount();i++) + for(size_t i = 2; i < words.GetCount();i++) { attack.Append(" "); attack.Append(words.Get(i)); Modified: trunk/src/server/bulkobjects/psattackqueue.cpp =================================================================== --- trunk/src/server/bulkobjects/psattackqueue.cpp 2014-02-18 18:59:26 UTC (rev 9277) +++ trunk/src/server/bulkobjects/psattackqueue.cpp 2014-02-18 19:04:09 UTC (rev 9278) @@ -60,9 +60,9 @@ } -int psAttackQueue::getAttackListCount() +size_t psAttackQueue::getAttackListCount() { - int i=0; + size_t i = 0; csList<csRef<psAttack> >::Iterator it(attackList); while(it.HasNext()) { @@ -100,7 +100,6 @@ float psAttackQueue::GetTotalQueueTime() { - int x = getAttackListCount(); float totalTime = 0; csList<csRef<psAttack> >::Iterator it(attackList); while(it.HasNext()) Modified: trunk/src/server/bulkobjects/psattackqueue.h =================================================================== --- trunk/src/server/bulkobjects/psattackqueue.h 2014-02-18 18:59:26 UTC (rev 9277) +++ trunk/src/server/bulkobjects/psattackqueue.h 2014-02-18 19:04:09 UTC (rev 9278) @@ -81,12 +81,12 @@ /* * Returns the number of special attacks in the queue. */ - int getAttackListCount(); + size_t getAttackListCount(); /* * returns the maximum number of elements in the queue */ - int getMax() + size_t getMax() { return DEFAULT_ATTACKQUEUE_SIZE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |