Changeset 127

Timestamp:

01/22/12 21:28:03 (13 years ago)

Author:

atzm

Message:

fixed error handling

File:

• pycodeshooter/trunk/index.html (modified) (5 diffs)

pycodeshooter/trunk/index.html

@@ -14 +14 @@
     <script type="text/javascript">
     window.onload = function () {
-        // load enemies
         var req = new XMLHttpRequest();
         req.open("GET", document.getElementById("api").value, false);
         req.send(null);
 
-        // global variables
-        var titleIntervalId = 0;
-        var msg             = document.getElementById("message");
-        var screen          = document.getElementById("screen");
-        var soundCheck      = document.getElementById("sound");
-        var ctx             = screen.getContext("2d");
-        var enemyList       = JSON.parse(req.responseText).result;
-
-        // system message clear
+        var enemyList = JSON.parse(req.responseText).result;
+        var msg       = document.getElementById("message");
+        var screen    = document.getElementById("screen");
+        var ctx       = screen.getContext("2d");
+
         setMessage(msg, "<br />");
+
+        // register enemy images to system
+        var imgs = document.getElementsByTagName("img");
+        for (var i = 0; i < imgs.length; i++) {
+            if (imgs[i].getAttribute("id").match(/^e_img/)) {
+                addEnemyImage(imgs[i]);
+            }
+        }
 
         // register sounds to system
@@ -45 +48 @@
 
         // sound on/off (default off)
+        var soundCheck = document.getElementById("sound");
         soundCheck.onclick = function() {
             toggleSound(soundCheck.checked);
@@ -52 +56 @@
 
         // title screen set
-        var logoimg  = document.getElementById("logoimg");
-        var x        = (screen.width - logoimg.width) / 2;
-        var y        = -1 - logoimg.height;
-        var titlePos = screen.height / 2 - logoimg.height / 2;
-
-        titleIntervalId = setInterval(function() {
+        var logoimg         = document.getElementById("logoimg");
+        var x               = (screen.width - logoimg.width) / 2;
+        var y               = -1 - logoimg.height;
+        var titlePos        = screen.height / 2 - logoimg.height / 2;
+        var titleIntervalId = setInterval(function() {
             drawScreen(ctx, "source-over", "rgba(8,8,8,0.5)", screen.width, screen.height);
             updateBackground(ctx, screen.width, screen.height, 1, "#AAF", 10);
@@ -78 +81 @@
             }
 
+            var player = {
+                "name":         document.getElementById("name").value,
+                "image":        document.getElementById("p_img0"),
+                "size":         parseInt(document.getElementById("size").value),
+                "hitsize":      parseInt(document.getElementById("hitsize").value),
+                "speed":        parseInt(document.getElementById("speed").value),
+                "hitpoint":     parseInt(document.getElementById("hitpoint").value),
+                "shotsize":     parseInt(document.getElementById("shotsize").value),
+                "shotinterval": parseInt(document.getElementById("shotinterval").value),
+                "shotspeed":    parseInt(document.getElementById("shotspeed").value),
+                "shotlevel":    parseInt(document.getElementById("shotlevel").value),
+                "numbombs":     parseInt(document.getElementById("numbombs").value)
+            };
+
+            for (var n in player) {
+                if (n == "name" || n == "image")
+                    continue;
+                if (!player[n] || player[n] < 1) {
+                    setMessage(msg, "Invalid Input Data");
+                    return;
+                }
+            }
+
+            setMessage(msg, "<br />");
             clearInterval(titleIntervalId);
             titleIntervalId = 0;
@@ -85 +112 @@
 
             setTimeout(function() {
-                var player = {
-                    "name":         document.getElementById("name").value,
-                    "image":        document.getElementById("p_img0"),
-                    "size":         parseInt(document.getElementById("size").value),
-                    "hitsize":      parseInt(document.getElementById("hitsize").value),
-                    "speed":        parseInt(document.getElementById("speed").value),
-                    "hitpoint":     parseInt(document.getElementById("hitpoint").value),
-                    "shotsize":     parseInt(document.getElementById("shotsize").value),
-                    "shotinterval": parseInt(document.getElementById("shotinterval").value),
-                    "shotspeed":    parseInt(document.getElementById("shotspeed").value),
-                    "shotlevel":    parseInt(document.getElementById("shotlevel").value),
-                    "numbombs":     parseInt(document.getElementById("numbombs").value)
-                };
-
-                for (var n in player) {
-                    if (n == "name")
-                        continue;
-                    if (!player[n] || player[n] < 0) {
-                        setMessage(msg, "Invalid Input Data");
-                        return;
-                    }
-                }
-
-                var imgs = document.getElementsByTagName("img");
-                for (var i = 0; i < imgs.length; i++) {
-                    if (imgs[i].getAttribute("id").match(/^e_img/)) {
-                        addEnemyImage(imgs[i]);
-                    }
-                }
-
                 initGame(document.getElementById("screen"), msg, player);