Major revamp of the resource system. Only RMP files remain.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2962 8092fc87-c524-0410-9efc-e669fe64eaf9

tools/resmap/gen_resfiles.py

@@ -91,7 +91,7 @@ def rmp_text(vals):
 			result.append("%s = UNKNOWNRES:%s" % (entry.res_id, entry.res_file))
 	return result		
 
-def h_text(header, vals):
+def h_integer_text(header, vals):
 	result = ["/* This file was auto-generated by the gen_resfiles utility and",
 		  "   should not be edited directly.  Modify the master resource list",
 		  "   instead and regenerate. */",
@@ -102,6 +102,17 @@ def h_text(header, vals):
 		result.append("#define %s %s" % (entry.constant, res_encode_str(entry.package, entry.instance, entry.int_type)))
 	return result
 
+def h_string_text(header, vals):
+	result = ["/* This file was auto-generated by the gen_resfiles utility and",
+		  "   should not be edited directly.  Modify the master resource list",
+		  "   instead and regenerate. */",
+		  ""]
+	in_index = [x for x in vals if x.hfile == header]
+	in_index.sort(lambda x,y: x.res_number() - y.res_number())
+	for entry in in_index:
+		result.append("#define %s \"%s\"" % (entry.constant, entry.res_id))
+	return result
+
 def dump_values(data):
 	keys = data.keys()
 	keys.sort()
@@ -112,17 +123,25 @@ def dump_values(data):
 			print>>outfile, l
 		outfile.close()
 
-def collate_data(data):
+def collate_integer_data(data):
 	result = {}
 	headers = get_headers(data)
 	indices = get_resfiles(data)
 	for index in indices:
 		result[os.path.join(contentdir, *(index.split('/')))] = ls2_text(index, data)
 	for header in headers:
-		result[os.path.join(srcdir, *(header.split('/')))] = h_text(header, data)
+		result[os.path.join(srcdir, *(header.split('/')))] = h_integer_text(header, data)
 	result[os.path.join(contentdir, 'uqm.rmp')] = rmp_text(data)
 	return result
-	
+
+def collate_string_data(data):
+	result = {}
+	headers = get_headers(data)
+	for header in headers:
+		result[os.path.join(srcdir, *(header.split('/')))] = h_string_text(header, data)
+	result[os.path.join(contentdir, 'uqm.rmp')] = rmp_text(data)
+	return result
+
 if __name__=="__main__":
-	data = collate_data(read_csv())
+	data = collate_string_data(read_csv())
 	dump_values(data)