Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename BLOB to species_BLOB #38134

Merged
merged 1 commit into from
Feb 18, 2020
Merged

Rename BLOB to species_BLOB #38134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cata_string_consts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" );
Expand Down
4 changes: 2 additions & 2 deletions src/monattack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2220,7 +2220,7 @@ bool mattack::formblob( monster *z )

monster &othermon = *( dynamic_cast<monster *>( 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.
Expand Down Expand Up @@ -2278,7 +2278,7 @@ bool mattack::callblobs( monster *z )
std::list<monster *> allies;
std::vector<tripoint> 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 );
Expand Down
2 changes: 1 addition & 1 deletion src/mondeath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}
}
Expand Down