[PlaneShift-svn] SF.net SVN: planeshift:[2081] stable

[<mg...@us...>]

Revision: 2081
          http://planeshift.svn.sourceforge.net/planeshift/?rev=2081&view=rev
Author:   mgist
Date:     2008-08-18 13:11:14 +0000 (Mon, 18 Aug 2008)

Log Message:
-----------
- Merged r2080 from trunk.

Modified Paths:
--------------
    stable/src/server/combatmanager.cpp

Property Changed:
----------------
    stable/


Property changes on: stable
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:1911,1915-1916,1918-1919,1923-1927,1930,1934,1936,1939,1941,1945-1949,1951-1953,1958,1960-1961,1964,1966,1968,1970-1972,1974,1978-1979,1981-1982,1986-1988,1990-1991,1994,1996-2001,2003-2004,2008,2019,2023,2026-2031,2037-2038,2078
   + /trunk:1911,1915-1916,1918-1919,1923-1927,1930,1934,1936,1939,1941,1945-1949,1951-1953,1958,1960-1961,1964,1966,1968,1970-1972,1974,1978-1979,1981-1982,1986-1988,1990-1991,1994,1996-2001,2003-2004,2008,2019,2023,2026-2031,2037-2038,2078,2080

Modified: stable/src/server/combatmanager.cpp
===================================================================
--- stable/src/server/combatmanager.cpp	2008-08-18 13:06:09 UTC (rev 2080)
+++ stable/src/server/combatmanager.cpp	2008-08-18 13:11:14 UTC (rev 2081)
@@ -770,7 +770,7 @@
     // If the slot next attack time is not yet up, abort (another event sequence should have been started)
     if (attacker_data->GetSlotNextAttackTime(event->GetWeaponSlot()) > csGetTicks())
     {
-        psserver->SendSystemError(event->AttackerCID, "Combat stopped as you have no longer an item to attack equipped.");
+        psserver->SendSystemError(event->AttackerCID, "Combat stopped as you have attacked several times.");
         return;
     }
     
@@ -789,6 +789,7 @@
     if (event->WeaponID != weapon->GetUID())
     {
         Debug2(LOG_COMBAT, gemAttacker->GetClientID(),"%s has changed weapons mid battle", gemAttacker->GetName() );
+        psserver->SendSystemError(event->AttackerCID, "Weapon changed. Skipping");
         skipThisRound = true;
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.