strings.c
changeset 2635 88b8b74c01ac
parent 2630 35249d2ded3e
child 2639 8a7342eb3a78
--- a/strings.c	Sun Nov 13 21:16:34 2005 +0000
+++ b/strings.c	Mon Nov 14 08:09:57 2005 +0000
@@ -161,9 +161,7 @@
 	uint index = GB(string,  0, 11);
 	uint tab   = GB(string, 11,  5);
 
-	if (!(string & 0xFFFF)) {
-		error("!invalid string id 0 in GetString");
-	}
+	if (GB(string, 0, 16) == 0) error("!invalid string id 0 in GetString");
 
 	switch (tab) {
 		case 4:
@@ -196,7 +194,7 @@
 			"Probably because an old version of the .lng file.\n", string
 		);
 
-	return FormatString(buffr, GetStringPtr(string&0xFFFF), argv, string >> 24);
+	return FormatString(buffr, GetStringPtr(GB(string, 0, 16)), argv, GB(string, 24, 8));
 }
 
 char *GetString(char *buffr, StringID string)