Changeset 6 for trunk/src/game/Unit.cpp

Timestamp:

11/19/08 13:22:12 (17 years ago)

Author:

yumileroy

Message:

[svn] * Added ACE for Linux and Windows (Thanks Derex for Linux part and partial Windows part)
* Updated to 6721 and 676
* Fixed TrinityScript? logo
* Version updated to 0.2.6721.676

Original author: Neo2003
Date: 2008-10-04 06:17:19-05:00

Files:

• trunk/src/game/Unit.cpp (modified) (3 diffs)

trunk/src/game/Unit.cpp

@@ -2991 +2991 @@
         if(player->CanParry() )
         {
-            Item *tmpitem = ((Player*)this)->GetWeaponForAttack(BASE_ATTACK,true);
+            Item *tmpitem = player->GetWeaponForAttack(BASE_ATTACK,true);
             if(!tmpitem)
-                tmpitem = ((Player*)this)->GetWeaponForAttack(OFF_ATTACK,true);
+                tmpitem = player->GetWeaponForAttack(OFF_ATTACK,true);
 
             if(tmpitem)
@@ -3018 +3018 @@
     if(GetTypeId() == TYPEID_PLAYER)
     {
-        Item *tmpitem = ((Player const*)this)->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
-        if(tmpitem && !tmpitem->IsBroken() && tmpitem->GetProto()->Block)
-            return GetFloatValue(PLAYER_BLOCK_PERCENTAGE);
-        else
-            return 0.0f;
+        Player const* player = (Player const*)this;
+        if(player->CanBlock() )
+        {
+            Item *tmpitem = player->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
+            if(tmpitem && !tmpitem->IsBroken() && tmpitem->GetProto()->Block)
+                return GetFloatValue(PLAYER_BLOCK_PERCENTAGE);
+        }
+        // is player but has no block ability or no not broken shield equiped
+        return 0.0f;
     }
     else
@@ -3416 +3420 @@
         return c->canSwim();
     else
-        return c->canWalk();
+        return c->canWalk() || c->canFly();
 }