diff options
author | 2012-09-17 06:49:13 +0000 | |
---|---|---|
committer | 2012-09-17 06:49:13 +0000 | |
commit | e25c13f2532730ebf50d0cffa0147393fd8e0228 (patch) | |
tree | a6c25d1de7041f26afed559dbc6670fa550e6b41 /src/lib/util | |
parent | f97e8f00818bd8d898facc206ed33ab72cf10a75 (diff) |
Clean-ups and version bumpmame0147
note: hoarded dump removed too from coco_cart.xml, this will not be tolerated
Diffstat (limited to 'src/lib/util')
-rw-r--r-- | src/lib/util/bitmap.h | 6 | ||||
-rw-r--r-- | src/lib/util/opresolv.h | 2 | ||||
-rw-r--r-- | src/lib/util/options.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/util/bitmap.h b/src/lib/util/bitmap.h index ee2cc33f3d9..91f393d37fb 100644 --- a/src/lib/util/bitmap.h +++ b/src/lib/util/bitmap.h @@ -76,7 +76,7 @@ public: rectangle() { } rectangle(INT32 minx, INT32 maxx, INT32 miny, INT32 maxy) : min_x(minx), max_x(maxx), min_y(miny), max_y(maxy) { } - + // getters INT32 left() const { return min_x; } INT32 right() const { return max_x; } @@ -102,7 +102,7 @@ public: if (src.max_y > max_y) max_y = src.max_y; return *this; } - + // comparisons bool operator==(const rectangle &rhs) const { return min_x == rhs.min_x && max_x == rhs.max_x && min_y == rhs.min_y && max_y == rhs.max_y; } bool operator!=(const rectangle &rhs) const { return min_x != rhs.min_x || max_x != rhs.max_x || min_y != rhs.min_y || max_y != rhs.max_y; } @@ -128,7 +128,7 @@ public: void set_height(INT32 height) { max_y = min_y + height - 1; } void set_origin(INT32 x, INT32 y) { max_x += x - min_x; max_y += y - min_y; min_x = x; min_y = y; } void set_size(INT32 width, INT32 height) { set_width(width); set_height(height); } - + // offset helpers void offset(INT32 xdelta, INT32 ydelta) { min_x += xdelta; max_x += xdelta; min_y += ydelta; max_y += ydelta; } void offsetx(INT32 delta) { min_x += delta; max_x += delta; } diff --git a/src/lib/util/opresolv.h b/src/lib/util/opresolv.h index dbd891181ea..87066bb89af 100644 --- a/src/lib/util/opresolv.h +++ b/src/lib/util/opresolv.h @@ -91,7 +91,7 @@ struct option_guide #define OPTION_ENUM_END -enum optreserr_t +enum optreserr_t { OPTIONRESOLUTION_ERROR_SUCCESS, OPTIONRESOLUTION_ERROR_OUTOFMEMORY, diff --git a/src/lib/util/options.c b/src/lib/util/options.c index 5e46d0e98b2..bd50ff45fdc 100644 --- a/src/lib/util/options.c +++ b/src/lib/util/options.c @@ -813,7 +813,7 @@ bool core_options::validate_and_set_data(core_options::entry &curentry, const ch } //------------------------------------------------- -// options_count - take number of existing +// options_count - take number of existing // number of options in structure //------------------------------------------------- @@ -822,4 +822,4 @@ int core_options::options_count() int number = 0; for (entry *curentry = m_entrylist; curentry != NULL; curentry = curentry->next()) number++; return number; -}
\ No newline at end of file +} |