epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

World, SyncHash, cache per tick.

Browse Source
This commit is contained in:
Vapre
2021-10-10 17:44:43 +02:00
committed by abcdefg30
parent dd9d600ef9
commit d53601daa6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Sync.cs
View File

@@ -112,7 +112,7 @@ namespace OpenRA
public static int HashCPos(CPos i2) public static int HashCPos(CPos i2)
{ {
return ((i2.X * 5) ^ (i2.Y * 3)) / 4; return i2.Bits;
} }
public static int HashCVec(CVec i2) public static int HashCVec(CVec i2)
@@ -142,10 +142,11 @@ namespace OpenRA
return (int)(t.Actor.ActorID << 16) * 0x567; return (int)(t.Actor.ActorID << 16) * 0x567;
case TargetType.FrozenActor: case TargetType.FrozenActor:
if (t.FrozenActor.Actor == null) var actor = t.FrozenActor.Actor;
if (actor == null)
return 0; return 0;
return (int)(t.FrozenActor.Actor.ActorID << 16) * 0x567; return (int)(actor.ActorID << 16) * 0x567;
case TargetType.Terrain: case TargetType.Terrain:
return HashUsingHashCode(t.CenterPosition); return HashUsingHashCode(t.CenterPosition);