Merge branch 'master' of bitbucket.org:fsfahrttoolteam/registration-system

registration-system/view/signups/game1/js/character.js

@@ -242,4 +242,4 @@ Char.prototype.setMoveTarget = function(x, y, onArrival, onArrivalParams) {
 
 Char.prototype.stopMovement = function() {
 	this.moveTarget = null;
-};
\ No newline at end of file
+};

registration-system/view/signups/game1/js/story.js

@@ -194,6 +194,7 @@ Story.actions = {
                         condition: Environment.progress.inventory_money,
                         action: function () {
                             Environment.progress.inventory_ruestung = true;
+							if (Game.char) Game.char.animate(); // apply new visuals
                         }
                     }, {
                         message: 'Was? Spende? Ich hab\' nichts!',
@@ -1246,4 +1247,4 @@ Story.dialogueHelper = function (dialogue, context, done) {
             }
         }, speed.talk);
     }
-};
\ No newline at end of file
+};

registration-system/view/signups/index.php

@@ -241,9 +241,8 @@ class SignupMethods {
 
             // check captcha
             elseif($check == "captcha"){
-                if(isset($_SESSION['captcha']) && strtolower($tmp) == strtolower($_SESSION['captcha'])){
-                    unset($_SESSION['captcha']);
-                } else{
+                unset($_SESSION['captcha']);
+                if(!(isset($_SESSION['captcha']) && strtolower($tmp) == strtolower($_SESSION['captcha']))) {
                     array_push($errarr, $errmess);
                     $datarr[$index] = "";
                 }
@@ -280,4 +279,4 @@ class SignupMethods {
             }
         }
     }
-}
\ No newline at end of file
+}