Merge branch 'master' into 2.4_Lite

Author: NovaRain

data/text/swedish/dialog/absamuel.msg

@@ -19,10 +19,10 @@
 {301}{}{Är du gravvakt?}
 {302}{}{Vad kan du berätta om Klostret?}
 {303}{}{Någonting jag kan hjälpa dig med?}
-{400}{}{Yes, *hickup* I tend to these 'ere graves. Nobody else wants to *hickup* do it, so Ol' Sammy got th' job. It's
- not as bad as one might think. It's got its... perks, if you know what I mean. [He grins sloppily and wiggles his bushy
- eyebrows at you.]}
-{401}{}{No. I don't know what you mean, and I never want to. Bye.}
+{400}{}{Ja, *hick* jag ta' hand om grava'na här. Ingen annan vill *hick* gör' det, så gamle Sammy fick jobbet. Det e' inte så 
+ illa som du kan tro. Det har... fö'måner, om du fattar vad jag mena'. [Han flinar och vinkar sina buskiga
+ ögonbryn mot dig.]}
+{401}{}{Nej. Jag vet inte vad du menar, och jag vill aldrig göra det. Hej då.}
 {402}{}{No. I don't know what you mean. But I think I'd rather ask you something else. }
 {403}{}{No. I don't know what you mean, but I'm morbidly curious...}
 {404}{}{Hell yeah I do. Nothing turns me on like a rotten cadaver.}

scripts_src/headers/define.h

@@ -823,35 +823,35 @@
 #define bit_2                       (2)
 #define bit_3                       (4)
 #define bit_4                       (8)
-#define bit_5                       (16)
-#define bit_6                       (32)
-#define bit_7                       (64)
-#define bit_8                       (128)
-#define bit_9                       (256)
-#define bit_10                      (512)
-#define bit_11                      (1024)
-#define bit_12                      (2048)
-#define bit_13                      (4096)
-#define bit_14                      (8192)
-#define bit_15                      (16384)
-#define bit_16                      (32768)
-#define bit_17                      (65536)
-#define bit_18                      (131072)
-#define bit_19                      (262144)
-#define bit_20                      (524288)
-#define bit_21                      (1048576)
-#define bit_22                      (2097152)
-#define bit_23                      (4194304)
-#define bit_24                      (8388608)
-#define bit_25                      (16777216)
-#define bit_26                      (33554432)
-#define bit_27                      (67108864)
-#define bit_28                      (134217728)
-#define bit_29                      (268435456)
-#define bit_30                      (536870912)
-#define bit_31                      (1073741824)
-#define bit_32                      (-2147483648)
-#define bit_ALL                     (-1)
+#define bit_5                       (0x10)
+#define bit_6                       (0x20)
+#define bit_7                       (0x40)
+#define bit_8                       (0x80)
+#define bit_9                       (0x100)
+#define bit_10                      (0x200)
+#define bit_11                      (0x400)
+#define bit_12                      (0x800)
+#define bit_13                      (0x1000)
+#define bit_14                      (0x2000)
+#define bit_15                      (0x4000)
+#define bit_16                      (0x8000)
+#define bit_17                      (0x10000)
+#define bit_18                      (0x20000)
+#define bit_19                      (0x40000)
+#define bit_20                      (0x80000)
+#define bit_21                      (0x100000)
+#define bit_22                      (0x200000)
+#define bit_23                      (0x400000)
+#define bit_24                      (0x800000)
+#define bit_25                      (0x1000000)
+#define bit_26                      (0x2000000)
+#define bit_27                      (0x4000000)
+#define bit_28                      (0x8000000)
+#define bit_29                      (0x10000000)
+#define bit_30                      (0x20000000)
+#define bit_31                      (0x40000000)
+#define bit_32                      (0x80000000)
+#define bit_ALL                     (0xFFFFFFFF)
 
 /* macros for pickup_p_proc responses. */
 #define REACTION_TG   1