Commitee51077

committed

Merge branch 'replication_hashing_fix' ofhttps://github.com/VitaminCpp/FlaxEngine into VitaminCpp-replication_hashing_fix

2 parents950e958 +56beca0 commitee51077Copy full SHA for ee51077

File tree

-2

lines changed

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -152,12 +152,12 @@ struct NetworkReplicatedObject`
`152`	`152`
`153`	`153`	`booloperator==(const NetworkReplicatedObject& other)const`
`154`	`154`	`{`
`155`		`-returnObject == other.Object;`
	`155`	`+returnObjectId == other.ObjectId;`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`booloperator==(const ScriptingObject* other)const`
`159`	`159`	`{`
`160`		`-returnObject== other;`
	`160`	`+returnother && ObjectId== other->GetID();`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`booloperator==(const Guid& other)const`
`@@ -176,6 +176,11 @@ inline uint32 GetHash(const NetworkReplicatedObject& key)`
`176`	`176`	`returnGetHash(key.ObjectId);`
`177`	`177`	`}`
`178`	`178`
	`179`	`+inline uint32GetHash(const ScriptingObject* key)`
	`180`	`+{`
	`181`	`+return key ?GetHash(key->GetID()) :0;`
	`182`	`+}`
	`183`	`+`
`179`	`184`	`structSerializer`
`180`	`185`	`{`
`181`	`186`	`NetworkReplicator::SerializeFunc Methods[2];`

Comments

(0)