From 50b684eb9ae7cbf32ed83b4a635538b595c0dfb5 Mon Sep 17 00:00:00 2001 From: AMurkin Date: Tue, 18 Feb 2020 21:37:11 +0400 Subject: [PATCH] Rename BLOB to species_BLOB --- src/cata_string_consts.h | 2 +- src/monattack.cpp | 4 ++-- src/mondeath.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cata_string_consts.h b/src/cata_string_consts.h index b64c59d334d1d..cc3a7f262b960 100644 --- a/src/cata_string_consts.h +++ b/src/cata_string_consts.h @@ -1364,7 +1364,7 @@ static const matype_id style_wingchun( "style_wingchun" ); static const matype_id style_zui_quan( "style_zui_quan" ); static const species_id ABERRATION( "ABERRATION" ); -static const species_id BLOB( "BLOB" ); +static const species_id species_BLOB( "BLOB" ); static const species_id FISH( "FISH" ); static const species_id FUNGUS( "FUNGUS" ); static const species_id HALLUCINATION( "HALLUCINATION" ); diff --git a/src/monattack.cpp b/src/monattack.cpp index 0e52da8abb402..775363b88d8ad 100644 --- a/src/monattack.cpp +++ b/src/monattack.cpp @@ -2220,7 +2220,7 @@ bool mattack::formblob( monster *z ) monster &othermon = *( dynamic_cast( critter ) ); // Hit a monster. If it's a blob, give it our speed. Otherwise, blobify it? - if( z->get_speed_base() > 40 && othermon.type->in_species( BLOB ) ) { + if( z->get_speed_base() > 40 && othermon.type->in_species( species_BLOB ) ) { if( othermon.type->id == mon_blob_brain ) { // Brain blobs don't get sped up, they heal at the cost of the other blob. // But only if they are hurt badly. @@ -2278,7 +2278,7 @@ bool mattack::callblobs( monster *z ) std::list allies; std::vector nearby_points = closest_tripoints_first( z->pos(), 3 ); for( monster &candidate : g->all_monsters() ) { - if( candidate.type->in_species( BLOB ) && candidate.type->id != mon_blob_brain ) { + if( candidate.type->in_species( species_BLOB ) && candidate.type->id != mon_blob_brain ) { // Just give the allies consistent assignments. // Don't worry about trying to make the orders optimal. allies.push_back( &candidate ); diff --git a/src/mondeath.cpp b/src/mondeath.cpp index 75c6b7a1e1739..3571cdf0a129c 100644 --- a/src/mondeath.cpp +++ b/src/mondeath.cpp @@ -466,7 +466,7 @@ void mdeath::blobsplit( monster &z ) void mdeath::brainblob( monster &z ) { for( monster &critter : g->all_monsters() ) { - if( critter.type->in_species( BLOB ) && critter.type->id != mon_blob_brain ) { + if( critter.type->in_species( species_BLOB ) && critter.type->id != mon_blob_brain ) { critter.remove_effect( effect_controlled ); } }