[Scummvm-git-logs] scummvm master -> cd68086ff01e18fb824bf3477e30a9306b2fcf5d

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cd68086ff0 ICB: Minor Code Readability Improvements


Commit: cd68086ff01e18fb824bf3477e30a9306b2fcf5d
    https://github.com/scummvm/scummvm/commit/cd68086ff01e18fb824bf3477e30a9306b2fcf5d
Author: D G Turner (digitall at scummvm.org)
Date: 2022-07-07T00:41:08+01:00

Commit Message:
ICB: Minor Code Readability Improvements

No functional change.

Changed paths:
    engines/icb/animation_mega_set.cpp


diff --git a/engines/icb/animation_mega_set.cpp b/engines/icb/animation_mega_set.cpp
index b1e81472655..9946de53346 100644
--- a/engines/icb/animation_mega_set.cpp
+++ b/engines/icb/animation_mega_set.cpp
@@ -227,29 +227,25 @@ void _vox_image::___init(const char *chr, const char *set, __weapon weapon) {
 }
 
 void _vox_image::MakeAnimEntry(int32 i) {
-// make name
-
 	char name[ANIM_NAME_STR_LEN];
-	int32 len;
 
-	len = sprintf(name, "%s%s.rab", (const char *)image_path, (const char *)master_anim_name_table[i].name);
+	int32 len = sprintf(name, "%s%s.rab", (const char *)image_path, (const char *)master_anim_name_table[i].name);
 
-	if (len > ANIM_NAME_STR_LEN)
+	if (len > ANIM_NAME_STR_LEN) {
 		Fatal_error("_vox_image::___init [%s] string too long", name);
+	}
 	strcpy(anim_name[i], name);
 
-
-	anim_name_hash[i] = HashString(name);
-
+	anim_name_hash[i] = HashString(anim_name[i]);
 
 	len = sprintf(name, "%s%s.raj", (const char *)image_path, (const char *)master_anim_name_table[i].name);
 
-	if (len > ANIM_NAME_STR_LEN)
+	if (len > ANIM_NAME_STR_LEN) {
 		Fatal_error("_vox_image::___init [%s] string too long", name);
+	}
 	strcpy(info_name[i], name);
 
-
-	info_name_hash[i] = HashString(name);
+	info_name_hash[i] = HashString(info_name[i]);
 
 	// do the test file
 	anim_table[i] = (int8)(rs_anims->Test_file(get_anim_name(i), anim_name_hash[i], base_path, base_path_hash));