X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Froom.js;h=e65606a9a33deba04c81da2d671d6a1b52506c7f;hb=0afea1ef9bfb43e9c1fe82aef2f13421b71836bb;hp=85ea6993ce015237d6057fa6b2cee21aba0d911c;hpb=698268dca9fec84ee56bdad33209683c0c4148a9;p=brisk.git

diff --git a/web/room.js b/web/room.js
index 85ea699..e65606a 100644
--- a/web/room.js
+++ b/web/room.js
@@ -24,79 +24,79 @@
 
 /* 
 
-   data = [ [ flags, name ],  ... ]
+   data = [ [ flags, flags_vlt, name ],  ... ]
    
 */
 
 
-function state_add(flags, comp)
+function state_add(flags, flags_vlt, comp)
 {
     var content = "", supercont = "";
     var st, superst, name = "", supername = "", supersfx = "";
     var tit = "", supertit = "";
 
 
-    if ((flags & 0xf00) != 0) {
-        st = flags & 0xf00;
+    if ((flags_vlt & 0xff) != 0) {
+        st = flags_vlt & 0xff;
         // MLANG 4,12,16,20,24,28
         switch (st) {
-        case 0x100:
+        case 0x01:
             name = "st_pau.png";
             tit = (g_lang == 'en' ? "I'm doing a break" : "sono in pausa");
             break;
-        case 0x200:
+        case 0x02:
             name = "st_out.png";
             tit = (g_lang == 'en' ? "I'm away" : "sono fuori");
             break;
-        case 0x300:
+        case 0x03:
             name = "st_dog.png";
             tit = (g_lang == 'en' ? "Dog time" : "sono a spasso col cane");
             break;
-        case 0x400:
+        case 0x04:
             name = "st_eat.png";
             tit = (g_lang == 'en' ? "I'm eating" : "sto mangiando");
             break;
-        case 0x500:
+        case 0x05:
             name = "st_wrk.png";
             tit = (g_lang == 'en' ? "I'm working" : "sono a lavoro");
             break;
-        case 0x600:
+        case 0x06:
             name = "st_smk.png";
             tit = (g_lang == 'en' ? "I'm smoking a sigarett (and keeping a cancer)" : "sto fumando una sigaretta (e facendomi venire il cancro)");
             break;
-        case 0x700:
+        case 0x07:
             name = "st_eye.png";
             tit = (g_lang == 'en' ? "I'm here!" : "sono presente!");
             break;
-        case 0x800:
+        case 0x08:
             name = "st_rabbit.png";
             tit = (g_lang == 'en' ? "Rabbit time" : "sono a spasso col coniglio");
             break;
-        case 0x900:
+        case 0x09:
             name = "st_soccer.png";
             tit = (g_lang == 'en' ? "Soccer time" : "c'è la partita!!");
             break;
-        case 0xa00:
+        case 0x0a:
             name = "st_baby.png";
             tit = (g_lang == 'en' ? "Children time" : "ho il pupo da accudire");
             break;
-        case 0xb00:
+        case 0x0b:
             name = "st_mop.png";
             tit = (g_lang == 'en' ? "Mop time" : "sto rassettando");
             break;
-        case 0xc00:
+        case 0x0c:
             name = "st_babbo.png";
             tit = (g_lang == 'en' ? "Sto dando i regali" : "sto dando i regali");
             break;
-        case 0xd00:
+        case 0x0d:
             name = "st_renna.png";
             tit = (g_lang == 'en' ? "in giro per regali" : "in giro per regali");
             break;
-        case 0xe00:
+        case 0x0e:
             name = "st_pupaz.png";
             tit = (g_lang == 'en' ? "Neve a gogò" : "neve a gogò");
             break;
-        case 0xf00:
+        case 0x0f:
             name = "st_visch.png";
             tit = (g_lang == 'en' ? "aspettando sotto al vischio" : "aspettando sotto al vischio");
             break;
@@ -264,7 +264,7 @@ function j_stand_tdcont(el)
 }
 
 /*
-  ddata = [ [ <flags-int>, <nick-str>, <color-str> ], ... ]
+  ddata = [ [ <flags-int>, <flags-vlt-int>, <nick-str>, <color-str> ], ... ]
  */
 function j_stand_cont(ddata)
 {
@@ -279,7 +279,7 @@ function j_stand_cont(ddata)
         data = new Array();
 
         for (i = 0, ii = 0 ; ii < ddata.length ; ii++) {
-            if ((ddata[ii][0] & 0x02) == 0) {
+            if ((ddata[ii][BSK_USER_FLAGS] & 0x02) == 0) {
                 continue;
             }
             data[i++] = ddata[ii];
@@ -329,7 +329,7 @@ function j_stand_cont(ddata)
         // find removed entries
         for (i = 0 ; i < standup_data_old.length ; i++) {
             for (e = 0 ; e < data.length ; e++) {
-                if (standup_data_old[i][1] == data[e][1]) {
+                if (standup_data_old[i][BSK_USER_NICK] == data[e][BSK_USER_NICK]) {
                     break;
                 }
             }
@@ -339,9 +339,10 @@ function j_stand_cont(ddata)
             }
             else {
                 /* modified entries */
-                if (standup_data_old[i][0] != data[e][0] ||
+                if (standup_data_old[i][BSK_USER_FLAGS] != data[e][BSK_USER_FLAGS] ||
+                    standup_data_old[i][BSK_USER_FLGVL] != data[e][BSK_USER_FLGVL] ||
                     standup_data_old[i].length != data[e].length ||
-                    (data[e].length == 3 && standup_data_old[i][2] != data[e][2])) {
+                    (data[e].length == 4 && standup_data_old[i][BSK_USER_SCOL] != data[e][BSK_USER_SCOL])) {
                     arr_mod[idx_mod_n] = data[e];
                     idx_mod[idx_mod_n++] = i;
                 }
@@ -352,12 +353,12 @@ function j_stand_cont(ddata)
         // find new entries
         for (e = 0 ; e < data.length ; e++) {
             for (i = 0 ; i < standup_data_old.length ; i++) {
-                if (data[e][1] == standup_data_old[i][1] ) {
+                if (data[e][BSK_USER_NICK] == standup_data_old[i][BSK_USER_NICK] ) {
                     break;
                 }
             }
             if (i == standup_data_old.length) {
-                // console.log("ADD: "+data[e][1]);
+                // console.log("ADD: "+data[e][BSK_USER_NICK]);
                 arr_add[idx_add_n]   = data[e];
                 map_add[idx_add_n++] = e;
             }
@@ -414,7 +415,7 @@ function j_stand_cont(ddata)
         // console.log("fineloop");
 
         for (i ; i_add < idx_add_n ; i_add++, i++) {
-            // console.log("ADD: "+i+" arr_add: "+ arr_add[i_add][1]);
+            // console.log("ADD: "+i+" arr_add: "+ arr_add[i_add][BSK_USER_NICK]);
             td = document.createElement("td");
             td.className = "room_standup";
             td.id = map_add[i_add];
@@ -444,8 +445,6 @@ function j_tab_cont(table_idx, data)
     var content = '';
 
     for (i = 0 ; i < data.length ; i++) {
-        // content += user_decorator(data[i]);
-        // content += state_add(data[i][0]);
         content += j_stand_tdcont(data[i]);
 
         content += '<br>';