Changeset 84

Timestamp:

01/01/11 14:42:26 (14 years ago)

Author:

atzm

Message:

fixed messaging

Location:

pycodeshooter/trunk

Files:

• index.html (modified) (4 diffs)
• shooter/system.js (modified) (7 diffs)

pycodeshooter/trunk/index.html

@@ -16 +16 @@
 
     function start(id, list) {
+        var msg    = document.getElementById("message");
         var player = {
             "name":         document.getElementById("name").value,
@@ -31 +32 @@
                 continue;
             if (!player[n] || player[n] < 0) {
-                debugMsgSet("Invalid Input Data");
+                setMessage(msg, "Invalid Input Data");
                 return;
             }
+        }
+
+        if (titleIntervalId) {
+            clearInterval(titleIntervalId);
+            titleIntervalId = 0;
         }
 
@@ -40 +46 @@
         document.onkeypress = function (ev) { setKeyPress(ev.charCode); };
 
-        initGame(document.getElementById("screen"), id, list[id], player);
+        initGame(document.getElementById("screen"), msg, id, list[id], player);
     }
 
@@ -54 +60 @@
 
         document.getElementById("bossSelection").onchange = function (ev) {
-            if (titleIntervalId) {
-                clearInterval(titleIntervalId);
-                titleIntervalId = 0;
-            }
             start(this[this.selectedIndex].value, list);
         };
-    }
-
-    function debugMsgSet(msg) {
-        document.getElementById("message").innerHTML = msg;
-    }
-
-    function debugMsgAdd(msg) {
-        document.getElementById("message").innerHTML += msg;
     }
 

pycodeshooter/trunk/shooter/system.js

@@ -21 +21 @@
         "height": 0
     },
+    "message":          null,
     "boss":             null,
     "player":           null,
@@ -96 +97 @@
 }
 
+function setMessage(elem, msg) {
+    if (elem)
+        elem.innerHTML = msg;
+}
+
+function addMessage(elem, msg) {
+    if (elem)
+        elem.innerHTML += msg;
+}
+
 
 /*
@@ -189 +200 @@
  *  Initializer
  */
-function initGame(canvas, bossId, bossData, playerData) {
+function initGame(canvas, msg, bossId, bossData, playerData) {
     System.screen.canvas = canvas;
+    System.message       = msg;
     System.screen.ctx    = System.screen.canvas.getContext("2d");
     System.screen.width  = System.screen.canvas.width;
@@ -252 +264 @@
     var brrgs   = new Array();
 
-    debugMsgSet("ActionsIdx:");
+    setMessage(System.message, "ActionsIdx:");
 
     for (i = 0; i < numAct; i++) {
@@ -258 +270 @@
         acts.push(new EnemyActions[idx](new shot()));
 
-        debugMsgAdd(String(idx) + ",");
-    }
-
-    debugMsgAdd("<br>");
+        addMessage(System.message, String(idx) + ",");
+    }
+
+    addMessage(System.message, "<br>");
 
     for (i = 0; i < numBrrg; i++) {
@@ -267 +279 @@
         var brrgCls = EnemyBarrages[idx];
 
-        debugMsgAdd("BarragesIdx:" + String(idx) + " / BulletsIdx:");
+        addMessage(System.message,
+                   "BarragesIdx:" + String(idx) + " / BulletsIdx:");
 
         for (k = 0; k < numBlt; k++) {
@@ -283 +296 @@
             );
 
-            debugMsgAdd(String(iidx) + ",");
+            addMessage(System.message, String(iidx) + ",");
         }
 
-        debugMsgAdd("<br>");
+        addMessage(System.message, "<br>");
     }