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.

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

Disable erroneous old-style-cast warning #36

Merged
merged 2 commits into from
Jan 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions data/json/items/book/cooking.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
"id": "modern_tanner",
"type": "BOOK",
"name": { "str": "The Modern Tanner", "str_pl": "copies of The Modern Tanner" },
"description": "A in-depth and easy to read guide that details a very modern take on the ancient art of leather tanning.",
"description": "An in-depth and easy to read guide that details a very modern take on the ancient art of leather tanning.",
"weight": "568 g",
"volume": "750 ml",
"price": 2000,
Expand All @@ -191,7 +191,7 @@
"id": "recipe_alpha",
"type": "BOOK",
"name": { "str": "PE050 \"Alpha\": Preliminary Report", "str_pl": "copies of PE050 \"Alpha\": Preliminary Report" },
"description": "This sheaf of papers-dated two weeks before all this started-describes some new chemical formula, and its effects on human subjects. It's stamped \"APPROVED\"…",
"description": "This sheaf of papers--dated two weeks before all this started--describes some new chemical formula, and its effects on human subjects. It's stamped \"APPROVED\"…",
"weight": "50 g",
"volume": "500 ml",
"price": 125000,
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/book/electronics.json
Original file line number Diff line number Diff line change
Expand Up @@ -232,14 +232,14 @@
"id": "schematics_nursebot",
"type": "BOOK",
"name": { "str": "nurse bot schematics", "str_pl": "nurse bot schematics" },
"description": "Bearing the logo of Uncanny, those are assembly plans, design specs, and technical drawings for the nurse bot. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
"description": "Bearing the logo of Uncanny, these are assembly plans, design specs, and technical drawings for the nurse bot. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
"copy-from": "schematics_generic"
},
{
"id": "schematics_grocerybot",
"type": "BOOK",
"name": { "str": "grocery bot schematics", "str_pl": "grocery bot schematics" },
"description": "Bearing the logo of Uncanny, those are assembly plans, design specs, and technical drawings for the grocery bot. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
"description": "Bearing the logo of Uncanny, these are assembly plans, design specs, and technical drawings for the grocery bot. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
"copy-from": "schematics_generic"
},
{
Expand Down Expand Up @@ -302,14 +302,14 @@
"id": "schematics_dispatch",
"type": "BOOK",
"name": { "str": "dispatch schematics", "str_pl": "dispatch schematics" },
"description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the dispatch. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
"description": "Bearing the logo of Northrop, these are assembly plans, design specs, and technical drawings for the dispatch. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
"copy-from": "schematics_generic"
},
{
"id": "schematics_dispatch_military",
"type": "BOOK",
"name": { "str": "military dispatch schematics", "str_pl": "military dispatch schematics" },
"description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the military dispatch. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
"description": "Bearing the logo of Northrop, these are assembly plans, design specs, and technical drawings for the military dispatch. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.",
"copy-from": "schematics_generic"
},
{
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/book/fabrication.json
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@
"id": "101_carpentry",
"type": "BOOK",
"name": { "str": "101 Home Repairs", "str_pl": "copies of 101 Home Repairs" },
"description": "A paperback book detailing 101 home repair projects the novice carpenter.",
"description": "A paperback book detailing 101 home repair projects for the novice carpenter.",
"weight": "454 g",
"volume": "500 ml",
"price": 1800,
Expand Down Expand Up @@ -466,7 +466,7 @@
"id": "reference_fabrication1",
"type": "BOOK",
"name": { "str": "Machinery's Handbook", "str_pl": "copies of Machinery's Handbook" },
"description": "This classic reference work contains extensive, dense chapters and tables on materials, metrology, toolmaking, gears, threading and more. This recent edition includes extensive data on what was the latest techniques in additive manufacturing. If you need to know how best complete a certain machining operation, the answer lies somewhere in these pages.",
"description": "This classic reference work contains extensive, dense chapters and tables on materials, metrology, toolmaking, gears, threading and more. This recent edition includes extensive data on what were the latest techniques in additive manufacturing. If you need to know how best complete a certain machining operation, the answer lies somewhere in these pages.",
"weight": "454 g",
"volume": "500 ml",
"price": 8000,
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/book/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
},
{
"id": "fairyat_408",
"text": "A book of Italian fairy tales translated in English. The cover features an orange fairy juggling a lemon, a lime, and a tangerine."
"text": "A book of Italian fairy tales translated into English. The cover features an orange fairy juggling a lemon, a lime, and a tangerine."
},
{ "id": "fairyat_451", "text": "A book of fables about people who change into birds." },
{
Expand Down Expand Up @@ -977,7 +977,7 @@
},
{
"id": "scifi1_22",
"text": "This is a copy of \"Wasp\" by Eric Frank Russel. The futuristic terrorists handbook."
"text": "This is a copy of \"Wasp\" by Eric Frank Russel. The futuristic terrorist's handbook."
},
{
"id": "scifi1_23",
Expand Down Expand Up @@ -1022,7 +1022,7 @@
{ "id": "scifi1_36", "text": "This is a copy of Jean-Baptiste Cousin de Grainville's \"Le Dernier Homme\"." },
{
"id": "scifi1_37",
"text": "This is a copy of Orwells \"Nineteen Eighty-Four\". The pages are loose and thin. You should probably be careful with this copy."
"text": "This is a copy of Orwell's \"Nineteen Eighty-Four\". The pages are loose and thin. You should probably be careful with this copy."
},
{
"id": "scifi1_38",
Expand Down Expand Up @@ -1725,7 +1725,7 @@
},
{
"id": "fancy13",
"text": "This copy of Douglas Adams\" \"The Hitchhiker's Guide to the Galaxy\" has a certificate of authenticity declaring it to be a first edition, and is autographed by the author himself."
"text": "This copy of Douglas Adams' \"The Hitchhiker's Guide to the Galaxy\" has a certificate of authenticity declaring it to be a first edition, and is autographed by the author himself."
},
{
"id": "fancy14",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/smg.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"id": "manual_smg",
"type": "BOOK",
"name": { "str": "The Submachine Gun Handbook", "str_pl": "copies of The Submachine Gun Handbook" },
"description": "This concise guide details the proper care and operation of most forms of machine pistols and submachine guns currently used by regular armed and reserve forces as well as several obsolete weapons.",
"description": "This concise guide details the proper care and operation of most forms of machine pistols and submachine guns currently used by regular armed and reserve forces, as well as several obsolete weapons.",
"weight": "362 g",
"volume": "500 ml",
"price": 2100,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/unarmed.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"id": "manual_brawl",
"type": "BOOK",
"name": { "str": "101 Wrestling Moves", "str_pl": "copies of 101 Wrestling Moves" },
"description": "It seems to be a wrestling manual, poorly photocopied and released on spiral- bound paper. Still, there are lots of useful tips for unarmed combat.",
"description": "It seems to be a wrestling manual, poorly photocopied and released on spiral-bound paper. Still, there are lots of useful tips for unarmed combat.",
"weight": "227 g",
"volume": "500 ml",
"price": 3800,
Expand Down
6 changes: 6 additions & 0 deletions src/crash.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,10 @@ extern "C" {

static void signal_handler( int sig )
{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast"
signal( sig, SIG_DFL );
#pragma GCC diagnostic pop
const char *msg;
switch( sig ) {
case SIGSEGV:
Expand All @@ -281,7 +284,10 @@ extern "C" {
return;
}
log_crash( "Signal", msg );
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wold-style-cast"
std::signal( SIGABRT, SIG_DFL );
#pragma GCC diagnostic pop
abort();
}

Expand Down