From 997afd00f1f1856ea252cb3eb14a64c3c69b51a6 Mon Sep 17 00:00:00 2001 From: Jeremiah Billmann Date: Tue, 9 Jul 2013 21:46:23 -0400 Subject: [PATCH] Code cleanup --- lib/server/controllers/entitycontroller.js | 4 ++-- lib/server/controllers/playercontroller.js | 10 +++++----- lib/server/entities/player.js | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/server/controllers/entitycontroller.js b/lib/server/controllers/entitycontroller.js index 95b0910..c6a14dd 100644 --- a/lib/server/controllers/entitycontroller.js +++ b/lib/server/controllers/entitycontroller.js @@ -1,4 +1,4 @@ -var Entity = require('../entities/entity'); +var entity = require('../entities/entity'); exports = module.exports = EntityController; @@ -19,7 +19,7 @@ EntityController.prototype = { }); if (!entityFound) { - newEntity = new Entity(id); + newEntity = new entity(id); this.entities.push(newEntity); } return newEntity; diff --git a/lib/server/controllers/playercontroller.js b/lib/server/controllers/playercontroller.js index 1591ab1..a0a9ca3 100644 --- a/lib/server/controllers/playercontroller.js +++ b/lib/server/controllers/playercontroller.js @@ -1,13 +1,13 @@ -var EntityController = require('./entitycontroller'), - Player = require('../entities/player'); +var entityController = require('./entitycontroller'), + player = require('../entities/player'); exports = module.exports = PlayerController; function PlayerController () { - EntityController.call(this); + entityController.call(this); } -PlayerController.prototype = Object.create(EntityController.prototype); +PlayerController.prototype = Object.create(entityController.prototype); PlayerController.prototype.add = function (client) { var newPlayer, playerFound = false; @@ -21,7 +21,7 @@ PlayerController.prototype.add = function (client) { }); if (!playerFound) { - newPlayer = new Player(client); + newPlayer = new player(client); this.entities.push(newPlayer); } return newPlayer; diff --git a/lib/server/entities/player.js b/lib/server/entities/player.js index 4131413..9b1eed7 100644 --- a/lib/server/entities/player.js +++ b/lib/server/entities/player.js @@ -1,11 +1,11 @@ -var Entity = require('./entity'); +var entity = require('./entity'); exports = module.exports = Player; function Player (client) { - Entity.call(this, client.id); + entity.call(this, client.id); this.client = client; this.inputs = []; } -Player.prototype = Object.create(Entity.prototype); \ No newline at end of file +Player.prototype = Object.create(entity.prototype); \ No newline at end of file