Removed instances_count #3464
Merged
Removed instances_count #3464
+50
−52
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PieterVdc
reviewed
Sep 16, 2024
src/creature_control.h
Outdated
| @@ -348,7 +348,7 @@ unsigned char sound_flag; | |||
| MapSubtlCoord targtstl_x; | |||
| MapSubtlCoord targtstl_y; | |||
| unsigned long instance_use_turn[INSTANCE_TYPES_MAX]; | |||
| char instance_available[INSTANCE_TYPES_MAX]; | |||
| short instance_available[INSTANCE_TYPES_MAX]; | |||
There was a problem hiding this comment.
this simply stores a yes or no INSTANCE_TYPES_MAXs times, the size of the yes or no can remain small, a TbBool makes more sense then a char though
src/config_creature.c
Outdated
| @@ -1645,14 +1636,6 @@ TbBool load_creaturetypes_config_file(const char *textname, const char *fname, u | |||
| WARNMSG("Parsing %s file \"%s\" experience block failed.",textname,fname); | |||
| } | |||
| if (result) | |||
| { | |||
| result = parse_creaturetype_instance_blocks(buf, len, textname, flags); | |||
There was a problem hiding this comment.
this looks like the reading of the block itself, so if you remove it it won't load the instances at all
PieterVdc
reviewed
Sep 16, 2024
src/creature_control.h
Outdated
| /** Required level to use the instances creature can learn. Scaled 1..CREATURE_MAX_LEVEL. */ | ||
| unsigned char learned_instance_level[LEARNED_INSTANCES_COUNT]; | ||
| unsigned short learned_instance_level[LEARNED_INSTANCES_COUNT]; |
There was a problem hiding this comment.
this one just stores a level so 0-9 no need for it to be a short
src/creature_control.h
Outdated
| @@ -464,9 +464,9 @@ struct CreatureStats { // These stats are not compatible with original DK - they | |||
| unsigned char attack_preference; | |||
| short field_of_view; | |||
| /** Instance identifiers of the instances creature can learn. */ | |||
| unsigned char learned_instance_id[LEARNED_INSTANCES_COUNT]; | |||
| short learned_instance_id[LEARNED_INSTANCES_COUNT]; | |||
There was a problem hiding this comment.
as for instance_id instance_available and active_instance_id those 3 could use type CrInstance
Linvail
reviewed
Sep 16, 2024
src/config_creature.c
Outdated
| // Loading file data | ||
| len = LbFileLoadAt(fname, buf); | ||
| TbBool result = (len > 0); | ||
| // Parse blocks of the config file | ||
| if (result) | ||
| { | ||
| result = parse_creaturetypes_common_blocks(buf, len, textname, flags); | ||
| result = parse_creaturetypes_common_blocks(buf, len, textname, flags); |
Loobinex
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.