From 529f1898329961ab8761ed07e2d585e12dd67f63 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sun, 18 Sep 2016 21:53:00 +0100 Subject: [PATCH] Use sprintf for object_create_identifier_name --- src/object_list.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/object_list.c b/src/object_list.c index 49e86776ac..ee5b63c625 100644 --- a/src/object_list.c +++ b/src/object_list.c @@ -107,9 +107,6 @@ const rct_object_entry_group object_entry_groups[] = { (void**)(gStexEntries ), _objectEntriesStexs, // scenario text 0x009ADAE4, 0xF4287C }; -/** rct2: 0x0098DA64 */ -static const utf8 HexCharacters[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; - int check_object_entry(const rct_object_entry *entry) { uint32 *dwords = (uint32*)entry; @@ -122,26 +119,7 @@ int check_object_entry(const rct_object_entry *entry) */ void object_create_identifier_name(char* string_buffer, const rct_object_entry* object) { - for (uint8 i = 0; i < 8; ++i){ - if (object->name[i] != ' '){ - *string_buffer++ = object->name[i]; - } - } - - *string_buffer++ = '/'; - - for (uint8 i = 0; i < 4; ++i){ - uint8 flag_part = (object->flags >> (i * 8)) & 0xFF; - *string_buffer++ = HexCharacters[flag_part >> 4]; - *string_buffer++ = HexCharacters[flag_part & 0xF]; - } - - for (uint8 i = 0; i < 4; ++i){ - uint8 checksum_part = (object->checksum >> (i * 8)) & 0xFF; - *string_buffer++ = HexCharacters[checksum_part >> 4]; - *string_buffer++ = HexCharacters[checksum_part & 0xF]; - } - *string_buffer++ = '\0'; + sprintf(string_buffer, "%.8s/%4X%4X", object->name, object->flags, object->checksum); } /**