diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-06-06 00:04:33 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-06-06 00:04:33 +0300 |
commit | 7b155f111daf5d7ae477b16d0f0789b1113bea74 (patch) | |
tree | 2d2711ab1f9daed793171383af1a7e1fa6ff737c /src/resources | |
parent | c3afff20d4989ab2835545715bbe67e5b5d9b353 (diff) | |
download | manaverse-7b155f111daf5d7ae477b16d0f0789b1113bea74.tar.gz manaverse-7b155f111daf5d7ae477b16d0f0789b1113bea74.tar.bz2 manaverse-7b155f111daf5d7ae477b16d0f0789b1113bea74.tar.xz manaverse-7b155f111daf5d7ae477b16d0f0789b1113bea74.zip |
Fix some issues after auto checking.
Diffstat (limited to 'src/resources')
-rw-r--r-- | src/resources/beinginfo.h | 8 | ||||
-rw-r--r-- | src/resources/resource.h | 9 | ||||
-rw-r--r-- | src/resources/spritedef.h | 5 |
3 files changed, 12 insertions, 10 deletions
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h index 8142cc194..4aa8f96c8 100644 --- a/src/resources/beinginfo.h +++ b/src/resources/beinginfo.h @@ -37,11 +37,11 @@ struct Attack std::string missileParticle; Attack(std::string action0, std::string particleEffect0, - std::string missileParticle0) + std::string missileParticle0) : + action(action0), + particleEffect(particleEffect0), + missileParticle(missileParticle0) { - action = action0; - particleEffect = particleEffect0; - missileParticle = missileParticle0; } }; diff --git a/src/resources/resource.h b/src/resources/resource.h index c0ea7ca23..1b62c0206 100644 --- a/src/resources/resource.h +++ b/src/resources/resource.h @@ -39,11 +39,14 @@ class Resource /** * Constructor */ - Resource(): mRefCount(0) - { + Resource() : #ifdef DEBUG_DUMP_LEAKS - mDumped = false; + mRefCount(0), + mDumped(false) +#else + mRefCount(0) #endif + { } /** diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h index b0cb5f1b6..461e60230 100644 --- a/src/resources/spritedef.h +++ b/src/resources/spritedef.h @@ -44,10 +44,9 @@ struct SpriteReference sprite(""), variant(0) {} - SpriteReference(std::string sprite0, int variant0) + SpriteReference(std::string sprite0, int variant0) : + sprite(sprite0), variant(variant0) { - sprite = sprite0; - variant = variant0; } std::string sprite; |