X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=src%2Fobjects.c;h=b957073d941f73c109ecf8b760bdb9d0d8dd0c54;hb=d8d68d0bd4c45af6f0dc69b4fc33d37d961aca85;hp=242ec3cdc16fac241f4a5edf07fc8f76c0e808e8;hpb=c881aa3386c00d7021ffabf2f66275d6c110c1c1;p=inform.git diff --git a/src/objects.c b/src/objects.c index 242ec3c..b957073 100644 --- a/src/objects.c +++ b/src/objects.c @@ -809,7 +809,7 @@ static int write_property_block_z(char *shortname) { uchar *tmp; if (mark+1+510 >= MAX_PROP_TABLE_SIZE) memoryerror("MAX_PROP_TABLE_SIZE",MAX_PROP_TABLE_SIZE); - tmp = translate_text(p+mark+1,p+mark+1+510,shortname); + tmp = translate_text(p+mark+1,p+mark+1+510,shortname,STRCTX_OBJNAME); if (!tmp) error ("Short name of object exceeded 765 Z-characters"); i = subtract_pointers(tmp,(p+mark+1)); p[mark] = i/2; @@ -1002,7 +1002,7 @@ static void manufacture_object_g(void) } objectsg[no_objects].shortname = compile_string(shortname_buffer, - FALSE, FALSE); + STRCTX_OBJNAME); /* The properties table consists simply of a sequence of property blocks, one for each object in order of definition, exactly as @@ -1756,7 +1756,6 @@ extern void make_class(char * metaclass_name) { int n, duplicates_to_make = 0, class_number = no_objects+1, metaclass_flag = (metaclass_name != NULL); char duplicate_name[128]; - int class_symbol; debug_location_beginning beginning_debug_location = get_token_location_beginning(); @@ -1847,8 +1846,6 @@ inconvenience, please contact the maintainers."); full_object_g.propdata[0].marker = OBJECT_MV; } - class_symbol = token_value; - if (!metaclass_flag) { get_next_token(); if ((token_type == SEP_TT) && (token_value == OPENB_SEP))