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

Jump to bottom

Fix compilation errors #18

Merged
merged 1 commit into from
Apr 24, 2020
Merged

Fix compilation errors #18

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
14 changes: 7 additions & 7 deletions data/json/items/comestibles/carnivore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@
"copy-from": "raw_leather",
"name": "raw demihuman skin",
"description": "A carefully folded raw skin harvested from a demihuman. You can cure it for storage and tanning, or eat it if you're desperate enough.",
"material": "hflesh",
"material": "flesh",
"flags": [ "STRICT_HUMANITARIANISM" ]
},
{
Expand Down Expand Up @@ -1031,12 +1031,12 @@
"type": "COMESTIBLE",
"name": "demihuman stomach",
"description": "The stomach of an intelligent demihuman. It is surprisingly durable.",
"material": "hflesh",
"material": "flesh",
"flags": [ "STRICT_HUMANITARIANISM" ]
},
{
"id": "demihuman_stomach_large",
"copy-from": "hstomach",
"copy-from": "stomach_large",
"type": "COMESTIBLE",
"name": "large demihuman stomach",
"description": "The stomach of a large humanoid creature. It is surprisingly durable.",
Expand All @@ -1050,7 +1050,7 @@
"name": "chunk of demihuman fat",
"name_plural": "chunks of demihuman fat",
"description": "Freshly harvested from a human body.",
"material": "hflesh",
"material": "flesh",
"flags": [ "STRICT_HUMANITARIANISM" ]
},
{
Expand All @@ -1061,7 +1061,7 @@
"description": "A smooth white block of cleaned and rendered demihuman fat. It will remain edible for a very long time, and can be used as an ingredient in many foods and projects.",
"price": 500,
"//": "*May* have been commercially traded.",
"material": "hflesh",
"material": "flesh",
"flags": [ "STRICT_HUMANITARIANISM" ]
},
{
Expand All @@ -1080,7 +1080,7 @@
"name": "demihuman flesh",
"name_plural": "demihuman fleshes",
"description": "Freshly butchered from a demihuman body.",
"material": "hflesh",
"material": "flesh",
"flags": [ "STRICT_HUMANITARIANISM" ]
},
{
Expand All @@ -1102,7 +1102,7 @@
"name": "boiled human stomach",
"calories": 120,
"description": "A small boiled stomach from a demihuman, nothing else. It looks all but appetizing.",
"material": "hflesh",
"material": "flesh",
"flags": [ "STRICT_HUMANITARIANISM" ]
}
]
2 changes: 0 additions & 2 deletions src/character.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,6 @@ enum edible_rating {
ALLERGY_WEAK,
// Cannibalism (unless psycho/cannibal)
CANNIBALISM,
// Cannibalism of near human (unless strict humanitarian)
STRICT_HUMANITARIANISM,
// Rotten or not rotten enough (for saprophages)
ROTTEN,
// Can provoke vomiting if you already feel nauseous.
Expand Down
3 changes: 1 addition & 2 deletions src/consumption.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,8 +748,7 @@ ret_val<edible_rating> Character::will_eat( const item &food, bool interactive )
}
}

const bool humanitarian = has_trait( trait_STRICT_HUMANITARIAN );
if( food.has_flag( flag_STRICT_HUMANITARIANISM ) && !has_trait_flag( flag_STRICT_HUMANITARIAN ) ) {
if( food.has_flag( flag_STRICT_HUMANITARIANISM ) && !has_trait_flag( "STRICT_HUMANITARIAN" ) ) {
add_consequence( _( "The thought of eating demihuman flesh makes you feel sick." ), CANNIBALISM );
}

Expand Down