From 714b3933ac24be7a3066082c4c31971aa7a11c5c Mon Sep 17 00:00:00 2001
From: Tim Repke <timmothey@gmx.de>
Date: Sat, 19 Sep 2015 00:26:46 +0200
Subject: [PATCH] fixed environment reference bug
---
registration-system/view/signups/game1/js/environment.js | 8 ++++----
registration-system/view/signups/game1/js/game.js | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/registration-system/view/signups/game1/js/environment.js b/registration-system/view/signups/game1/js/environment.js
index 84fe22a..b2a867d 100644
--- a/registration-system/view/signups/game1/js/environment.js
+++ b/registration-system/view/signups/game1/js/environment.js
@@ -2,22 +2,22 @@ function Environment () {
// something?
}
-Environment.prototype.progress = {
+Environment.progress = {
fs_firstApproach: false,
fs_georgeScreamed: false,
fs_filledBoard: false,
killedGoat: false
};
-Environment.prototype.inventory = {
+Environment.inventory = {
money: false,
goatDrops: false
};
-Environment.prototype.mapEvents = {
+Environment.mapEvents = {
'map_landing': {
init: function(svg) {
- if (this.progress.fs_filledBoard) {
+ if (Environment.progress.fs_filledBoard) {
// TODO: remove baustelle (that doesn't exist yet)
} else {
var ship = svg.select("#shipGroup");
diff --git a/registration-system/view/signups/game1/js/game.js b/registration-system/view/signups/game1/js/game.js
index d218acf..c1cbf18 100644
--- a/registration-system/view/signups/game1/js/game.js
+++ b/registration-system/view/signups/game1/js/game.js
@@ -5,7 +5,6 @@ function Game(config) {
Game.instance = this;
Game.achievements = new Achievements();
- Game.environment = new Environment();
Game.eventHandler = null;
Game.char = null;
Game.cam = null;
@@ -74,7 +73,7 @@ Game.prototype.loadMap = function(map, spawn) {
// -------------------------------------
// init map specific things
- Game.environment.mapEvents[mapId].init(svg);
+ Environment.mapEvents[mapId].init(svg);
// init view stuff
Game.char = new Char(svg, {spawnid: spawn});
--
GitLab