From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Wed, 22 May 2013 16:11:12 +0000 (+0200)
Subject: status bitfield moved from 0x0f00 to 0x00ff (from 16 to 255 possible status)
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=75db386ed459aa061fdf6d89a5aa1dc62f5bcc2d;p=brisk.git

status bitfield moved from 0x0f00 to 0x00ff (from 16 to 255 possible status)
---

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index e0dd01d..3e37535 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -34,24 +34,24 @@ define('USER_FLAG_ISOLAUTH', 0x08);
 define('USER_FLAG_DBFAILED', 0x10);
 
 //   user status
-define('USER_FLAG_S_NORM',  0x000); // done
-define('USER_FLAG_S_PAU',   0x100); // done
-define('USER_FLAG_S_OUT',   0x200); // done
-define('USER_FLAG_S_DOG',   0x300); // done
-define('USER_FLAG_S_EAT',   0x400); // done
-define('USER_FLAG_S_WRK',   0x500); // done
-define('USER_FLAG_S_SMK',   0x600); // done
-define('USER_FLAG_S_EYE',   0x700); // done
-define('USER_FLAG_S_RABB',  0x800); // done
-define('USER_FLAG_S_SOCC',  0x900); // done
-define('USER_FLAG_S_BABY',  0xa00); // done
-define('USER_FLAG_S_MOP',   0xb00); // done
-define('USER_FLAG_S_BABBO',   0xc00); // done
-define('USER_FLAG_S_RENNA',   0xd00); // done
-define('USER_FLAG_S_PUPAZ',   0xe00); // done
-define('USER_FLAG_S_VISCH',   0xf00); // done
-
-define('USER_FLAG_S_ALL',   0xf00); // done
+define('USER_FLAG_S_NORM',  0x00); // done
+define('USER_FLAG_S_PAU',   0x01); // done
+define('USER_FLAG_S_OUT',   0x02); // done
+define('USER_FLAG_S_DOG',   0x03); // done
+define('USER_FLAG_S_EAT',   0x04); // done
+define('USER_FLAG_S_WRK',   0x05); // done
+define('USER_FLAG_S_SMK',   0x06); // done
+define('USER_FLAG_S_EYE',   0x07); // done
+define('USER_FLAG_S_RABB',  0x08); // done
+define('USER_FLAG_S_SOCC',  0x09); // done
+define('USER_FLAG_S_BABY',  0x0a); // done
+define('USER_FLAG_S_MOP',   0x0b); // done
+define('USER_FLAG_S_BABBO',   0x0c); // done
+define('USER_FLAG_S_RENNA',   0x0d); // done
+define('USER_FLAG_S_PUPAZ',   0x0e); // done
+define('USER_FLAG_S_VISCH',   0x0f); // done
+
+define('USER_FLAG_S_ALL',   0xff); // done
 
 /* type of user normal, supporter etc ... */
 define('USER_FLAG_TY_ALL',     0xff0000); // done
diff --git a/web/room.js b/web/room.js
index e3f08b0..e65606a 100644
--- a/web/room.js
+++ b/web/room.js
@@ -36,67 +36,67 @@ function state_add(flags, flags_vlt, comp)
     var tit = "", supertit = "";
 
 
-    if ((flags_vlt & 0xf00) != 0) {
-        st = flags_vlt & 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;