Changeset 4764 for 2013

Timestamp:

2013-10-07 21:47:25 (9 years ago)

Author:

dezhidki

Message:

 

Location:

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster

Files:

• Entities/Entity.cs (modified) (1 diff)
• Units/Mobs/MobRanger.cs (modified) (2 diffs)
• Units/Mobs/MobWarrior.cs (modified) (2 diffs)
• Units/Mobs/MobWoodcutter.cs (modified) (1 diff)
• World/Level.cs (modified) (2 diffs)

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/Entities/Entity.cs

@@ -156 +156 @@
         private bool SkipCollisionCheck(BoundingRectangleOwner collidableOwner)
         {
-            if (typeof(Entity).IsAssignableFrom(collidableOwner.GetType()))
-                return !((Entity)collidableOwner).Blocks(this);
-            if (typeof(Tile).IsAssignableFrom(collidableOwner.GetType()))
+            //if (typeof(Entity).IsAssignableFrom(collidableOwner.GetType()))
+            //    return !((Entity)collidableOwner).Blocks(this);
+            //if (typeof(Tile).IsAssignableFrom(collidableOwner.GetType()))
+            //    return false;
+            Entity ent = collidableOwner as Entity;
+            if (ent != null)
+                return !ent.Blocks(this);
+            if (collidableOwner as Tile != null)
                 return false;
             return true;

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/Units/Mobs/MobRanger.cs

@@ -161 +161 @@
                         StopAttack();
                 }
-                if (target == null || target.Removed || (typeof(UnitBuilding).IsAssignableFrom(target.GetType()) && ((UnitBuilding)target).IsDestroyed))
+                UnitBuilding ub = target as UnitBuilding;
+                if (target == null || target.Removed || ub != null && ub.IsDestroyed)
                     StopAttack();
             }
@@ -182 +183 @@
                     }
                 }
-                if (target == null || target.Removed || (typeof(UnitBuilding).IsAssignableFrom(target.GetType()) && ((UnitBuilding)target).IsDestroyed))
+                UnitBuilding ub = target as UnitBuilding;
+                if (target == null || target.Removed || ub != null && ub.IsDestroyed)
                 {
                     StopAttack();

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/Units/Mobs/MobWarrior.cs

@@ -164 +164 @@
                         StopAttack();
                 }
-                if (target == null || target.Removed || (typeof(UnitBuilding).IsAssignableFrom(target.GetType()) && ((UnitBuilding)target).IsDestroyed))
+                UnitBuilding ub = target as UnitBuilding;
+                if (target == null || target.Removed || ub != null && ub.IsDestroyed)
                     StopAttack();
             }
@@ -185 +186 @@
                     }
                 }
-                if (target == null || target.Removed || (typeof(UnitBuilding).IsAssignableFrom(target.GetType()) && ((UnitBuilding)target).IsDestroyed))
+                UnitBuilding ub = target as UnitBuilding;
+                if (target == null || target.Removed || ub != null && ub.IsDestroyed)
                     StopAttack();
             }

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/Units/Mobs/MobWoodcutter.cs

@@ -91 +91 @@
             //emmitter.Position = new Vector3(ScreenPos.X, 0.0F, ScreenPos.Y);
             //Sound2D.PlaySound3D(emmitter, "sword1");
-            TileEntity te = level.GetTileEntity(this, (int)(x / Viewport.TILESIZE), (int)(z / Viewport.TILESIZE));
-            if (te != null && typeof(TileEntityTree).IsAssignableFrom(te.GetType()))
+            TileEntityTree te = level.GetTileEntity(this, (int)(x / Viewport.TILESIZE), (int)(z / Viewport.TILESIZE)) as TileEntityTree;
+            if (te != null)
             {
                 if (currentTarget != null) StopChopping();
-                OrderChop((TileEntityTree)te, sameOrderAmount, wasCalledBefore);
+                OrderChop(te, sameOrderAmount, wasCalledBefore);
             }
             else

2013/30/DenisZ/CastleMaster/CastleMaster/CastleMaster/World/Level.cs

@@ -261 +261 @@
             ent.Init();
 
-            if (typeof(TileEntity).IsAssignableFrom(ent.GetType()))
-                tileEntities.Add((TileEntity)ent);
+            TileEntity te = ent as TileEntity;
+            if (te != null)
+                tileEntities.Add(te);
             else
                 entities.Add(ent);
 
-            if (typeof(Unit).IsAssignableFrom(ent.GetType()))
-            {
-                Unit u = (Unit)ent;
+            Unit u = ent as Unit;
+            if (u != null)
+            {
                 units[u.Owner.Team.ID].Add(u);
             }
@@ -509 +510 @@
                     entitiesInTiles[x + z * width].ForEach(delegate(Entity ent)
                     {
-                        if (typeof(T).IsAssignableFrom(ent.GetType())) inRadius.Add((T)ent);
+                        T e = ent as T;
+                        if (e != null) 
+                            inRadius.Add(e);
                     });
                 }