diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-16 20:39:33 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-16 20:39:33 +0300 |
| commit | bc92643d8db723b5049db2dbad1ce052a0ae77a9 (patch) | |
| tree | 4471be99711ee310c811e990d7c210e2393aeb6e /src/resources | |
| parent | 82cc576b7896f39bcf71aa85c8c4b3ef786c065b (diff) | |
| download | manaplus-bc92643d8db723b5049db2dbad1ce052a0ae77a9.tar.gz manaplus-bc92643d8db723b5049db2dbad1ce052a0ae77a9.tar.bz2 manaplus-bc92643d8db723b5049db2dbad1ce052a0ae77a9.tar.xz manaplus-bc92643d8db723b5049db2dbad1ce052a0ae77a9.zip | |
Fix code style and some other minor issues.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/music.h | 1 | ||||
| -rw-r--r-- | src/resources/specialdb.h | 17 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/resources/music.h b/src/resources/music.h index d1e3d1836..039b887d6 100644 --- a/src/resources/music.h +++ b/src/resources/music.h @@ -36,6 +36,7 @@ class Music final : public Resource { public: Music() : + Resource(), mMusic(nullptr) { } diff --git a/src/resources/specialdb.h b/src/resources/specialdb.h index 725542a29..f456f6a45 100644 --- a/src/resources/specialdb.h +++ b/src/resources/specialdb.h @@ -29,6 +29,15 @@ struct SpecialInfo final { + enum TargetMode + { + TARGET_SELF = 0, // no target selection + TARGET_FRIEND, // target friendly being + TARGET_ENEMY, // target hostile being + TARGET_BEING, // target any being + TARGET_POINT // target map location + }; + SpecialInfo() : id(0), isActive(false), @@ -42,14 +51,6 @@ struct SpecialInfo final A_DELETE_COPY(SpecialInfo) - enum TargetMode - { - TARGET_SELF = 0, // no target selection - TARGET_FRIEND, // target friendly being - TARGET_ENEMY, // target hostile being - TARGET_BEING, // target any being - TARGET_POINT // target map location - }; int id; std::string set; // tab on which the special is shown std::string name; // displayed name of special |