MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes unhelpful inheritance

develop
Josh Cooper 2022-06-05 13:05:14 -07:00 committed by Myk
parent 0eb9eee773
commit f8d46a10c1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/prospector.cpp
Unescape Escape View File

@ -85,10 +85,10 @@ bool operator>(const matdata & q1, const matdata & q2)
return q1.count > q2.count; return q1.count > q2.count;
} }
template<typename _Tp = matdata > template<typename Tp = matdata >
struct shallower : public binary_function<_Tp, _Tp, bool> struct shallower
{ {
bool operator()(const _Tp& top, const _Tp& bottom) const bool operator()(const Tp& top, const Tp& bottom) const
{ {
float topavg = (top.lower_z + top.upper_z)/2.0f; float topavg = (top.lower_z + top.upper_z)/2.0f;
float btmavg = (bottom.lower_z + bottom.upper_z)/2.0f; float btmavg = (bottom.lower_z + bottom.upper_z)/2.0f;

2
plugins/stockpiles/StockpileUtils.h
Unescape Escape View File

@ -52,7 +52,7 @@ static inline size_t find_plant ( const std::string &plant_id )
return linear_index ( df::global::world->raws.plants.all, &df::plant_raw::id, plant_id ); return linear_index ( df::global::world->raws.plants.all, &df::plant_raw::id, plant_id );
} }
struct less_than_no_case: public std::binary_function< char,char,bool > struct less_than_no_case
{ {
bool operator () (char x, char y) const bool operator () (char x, char y) const
{ {