Elimination of OBJSND.

This commit is contained in:
Eric S. Raymond 2017-06-24 08:45:22 -04:00
parent 606b590c1e
commit 3a93b2b5f0
8 changed files with 88 additions and 37 deletions

View file

@ -22,6 +22,8 @@ h_template = """/* Generated from adventure.yaml - do not hand-hack! */
typedef struct {{
const char* inventory;
const char** longs;
const char** sounds;
const char** texts;
}} object_description_t;
typedef struct {{
@ -216,6 +218,12 @@ def get_object_descriptions(obj):
template = """ {{
.inventory = {},
.longs = (const char* []) {{
{}
}},
.sounds = (const char* []) {{
{}
}},
.texts = (const char* []) {{
{}
}},
}},
@ -242,7 +250,21 @@ def get_object_descriptions(obj):
message = message[:45] + "..."
statedefines += "#define %s\t%d /* %s */\n" % (label, i, message)
statedefines += "\n"
obj_str += template.format(i_msg, longs_str)
sounds_str = ""
if item[1].get("sounds") == None:
sounds_str = " " * 12 + "NULL,"
else:
for l_msg in item[1]["sounds"]:
sounds_str += " " * 12 + make_c_string(l_msg) + ",\n"
sounds_str = sounds_str[:-1] # trim trailing newline
texts_str = ""
if item[1].get("texts") == None:
texts_str = " " * 12 + "NULL,"
else:
for l_msg in item[1]["texts"]:
texts_str += " " * 12 + make_c_string(l_msg) + ",\n"
texts_str = texts_str[:-1] # trim trailing newline
obj_str += template.format(i_msg, longs_str, sounds_str, texts_str)
obj_str = obj_str[:-1] # trim trailing newline
return obj_str