Skip to content

Commit

Permalink
Renamed UpdateState to UpdateFromState.
Browse files Browse the repository at this point in the history
  • Loading branch information
vchelaru committed Mar 12, 2019
1 parent 14bbbba commit b87a5f2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion INetworkEntity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ public interface INetworkEntity
/// <param name="entityState">A generic object describing an entity state </param>
/// <param name="stateTime">The time this state was received, compare to current network time to understand elapsed time</param>
/// <param name="isReckoningState">Whether or not this is a dead reckoning update</param>
void UpdateState(object entityState, double stateTime);
void UpdateFromState(object entityState, double stateTime);
}
}
4 changes: 2 additions & 2 deletions NetworkManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ private void CreateEntity(long ownerId, long entityId, object payload, double ti
throw new RedGrinException(msg);
}

targetEntity.UpdateState(payload, time);
targetEntity.UpdateFromState(payload, time);
targetEntity.OwnerId = ownerId;
targetEntity.EntityId = entityId;
mEntities.Add(targetEntity);
Expand Down Expand Up @@ -493,7 +493,7 @@ private void UpdateEntity(long entityId, long ownerId, object payload, bool isRe
{
if(targetEntity.OwnerId != this.NetworkId || isReckoning)
{
targetEntity.UpdateState(payload, time);
targetEntity.UpdateFromState(payload, time);
}

BroadcastIfServer(entityId, targetEntity.OwnerId, payload,
Expand Down
8 changes: 6 additions & 2 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,9 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
// 1.1.0.0
// - NetworkManager is now a singleton
// - Reduced necessary arguments for INetworkEntity and INetworkArena implementation.
// -
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]

0 comments on commit b87a5f2

Please sign in to comment.