2 files changed, 14 insertions, 26 deletions
diff --git a/client/src/akkamon/render/engine/GridPhysics.ts b/client/src/akkamon/render/engine/GridPhysics.ts
index 7c266bf..4a7d1e1 100644
--- a/client/src/akkamon/render/engine/GridPhysics.ts
+++ b/client/src/akkamon/render/engine/GridPhysics.ts
@@ -66,9 +66,7 @@ export class GridPhysics extends AkkamonEngine {
 
     private startMoving(direction: Direction): void {
         console.log("Sending startMovingEvent");
-        this.client.send(
-            new StartMovingEvent(this.playerSprite.getScene(), direction)
-        );
+        this.client.sendStartMove(direction);
         this.playerSprite.startAnimation(direction);
         this.movementDirection = direction;
         this.updatePlayerSpriteTilePosition();
@@ -96,12 +94,7 @@ export class GridPhysics extends AkkamonEngine {
     }
 
     private updatePlayerSpriteTilePosition() {
-        this.client.send(
-            new NewTilePosEvent(
-                this.playerSprite.getScene(),
-                this.playerSprite.getTilePos()
-            )
-        );
+        this.client.sendNewTilePos(this.playerSprite.getTilePos());
         this.playerSprite.setTilePos(
             this.playerSprite
             .getTilePos()
@@ -149,12 +142,7 @@ export class GridPhysics extends AkkamonEngine {
     }
 
     private stopMoving(): void {
-        this.client.send(
-            new StopMovingEvent(
-                this.playerSprite.getScene(),
-                this.movementDirection
-            )
-        );
+        this.client.sendStopMoving(this.movementDirection);
         this.playerSprite.stopAnimation(this.movementDirection);
         this.movementDirection = Direction.NONE;
     }
diff --git a/client/src/akkamon/render/engine/RemotePlayerEngine.ts b/client/src/akkamon/render/engine/RemotePlayerEngine.ts
index 7ce5fa9..037b26c 100644
--- a/client/src/akkamon/render/engine/RemotePlayerEngine.ts
+++ b/client/src/akkamon/render/engine/RemotePlayerEngine.ts
@@ -24,7 +24,7 @@ export class RemotePlayerEngine extends AkkamonEngine {
 
     private scene: WorldScene;
 
-    private trainerIdToRemotePlayerSprite: Map<string, RemotePlayerSprite> = new Map();
+    private trainerIDToRemotePlayerSprite: Map<string, RemotePlayerSprite> = new Map();
 
     constructor(scene: WorldScene) {
         super();
@@ -37,13 +37,13 @@ export class RemotePlayerEngine extends AkkamonEngine {
     }
 
     pushMovesToSprites(remoteMovementQueues: RemoteMovementQueues) {
-        this.trainerIdToRemotePlayerSprite.forEach((remoteSprite: RemotePlayerSprite, key: string) => {
+        this.trainerIDToRemotePlayerSprite.forEach((remoteSprite: RemotePlayerSprite, key: string) => {
             remoteSprite.push(remoteMovementQueues[key].value);
         });
     }
 
     update(delta: number): void {
-        this.trainerIdToRemotePlayerSprite.forEach((remoteSprite: RemotePlayerSprite, key: string) => {
+        this.trainerIDToRemotePlayerSprite.forEach((remoteSprite: RemotePlayerSprite, key: string) => {
             if (remoteSprite.isMoving()) {
                 console.log("remote player currently walking");
                 remoteSprite.updatePixelPosition(delta);
@@ -55,18 +55,18 @@ export class RemotePlayerEngine extends AkkamonEngine {
     }
 
     updateMembers(newRemoteMovementQueues: RemoteMovementQueues) {
-        const traineridToQueueValue = newRemoteMovementQueues;
+        const trainerIDToQueueValue = newRemoteMovementQueues;
 
         Object.keys(newRemoteMovementQueues).forEach((key: string) => {
 
-            var moveQueue = traineridToQueueValue[key].value;
+            var moveQueue = trainerIDToQueueValue[key].value;
             if (moveQueue !== undefined) {
 
                 // console.log("-> key: " + key + " has position " + newTilePos.x + ", " + newTilePos.y);
 
-                if (!this.trainerIdToRemotePlayerSprite.has(key)) {
+                if (!this.trainerIDToRemotePlayerSprite.has(key)) {
                     // console.log("adding remote player sprite for " + key);
-                    this.trainerIdToRemotePlayerSprite.set(key,
+                    this.trainerIDToRemotePlayerSprite.set(key,
                                                           new RemotePlayerSprite({
                                                               scene: this.scene,
                                                               tilePos: new Phaser.Math.Vector2(this.scene.spawnPointTilePos!),
@@ -82,11 +82,11 @@ export class RemotePlayerEngine extends AkkamonEngine {
 
         });
 
-        this.trainerIdToRemotePlayerSprite.forEach((value: RemotePlayerSprite, key: string) => {
+        this.trainerIDToRemotePlayerSprite.forEach((value: RemotePlayerSprite, key: string) => {
             if (!(key in newRemoteMovementQueues)) {
                 // console.log("removing remote player sprite for " + key);
-                this.trainerIdToRemotePlayerSprite.get(key)!.destroy();
-                this.trainerIdToRemotePlayerSprite.delete(key);
+                this.trainerIDToRemotePlayerSprite.get(key)!.destroy();
+                this.trainerIDToRemotePlayerSprite.delete(key);
             } else {
                 // console.log("Player " + key + " was not removed!");
             }
@@ -94,6 +94,6 @@ export class RemotePlayerEngine extends AkkamonEngine {
     }
 
     getData() {
-        return this.trainerIdToRemotePlayerSprite;
+        return this.trainerIDToRemotePlayerSprite;
     }
 }