diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-08-24 22:48:35 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-08-24 22:48:35 +0300 |
| commit | b474de4a54c9b1d4d863971e40b807588d554436 (patch) | |
| tree | 761e71f86ea232d1688ee2838bd2294c59dea947 /src/actorsprite.cpp | |
| parent | a316d537dce50f4b4e1e10f5c26a7851baddbd8b (diff) | |
| download | mv-b474de4a54c9b1d4d863971e40b807588d554436.tar.gz mv-b474de4a54c9b1d4d863971e40b807588d554436.tar.bz2 mv-b474de4a54c9b1d4d863971e40b807588d554436.tar.xz mv-b474de4a54c9b1d4d863971e40b807588d554436.zip | |
replace defines to consts.
Diffstat (limited to 'src/actorsprite.cpp')
| -rw-r--r-- | src/actorsprite.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp index 4debab9e8..5e53febcd 100644 --- a/src/actorsprite.cpp +++ b/src/actorsprite.cpp @@ -42,7 +42,7 @@ #include "debug.h" -#define EFFECTS_FILE "effects.xml" +static const char *const EFFECTS_FILE = "effects.xml"; ImageSet *ActorSprite::targetCursorImages[2][NUM_TC]; SimpleAnimation *ActorSprite::targetCursor[2][NUM_TC]; @@ -188,8 +188,7 @@ static EffectDescription *getEffectDescription(int effectId) if (!root || !xmlNameEqual(root, "being-effects")) { - logger->log1("Error loading being effects file: " - EFFECTS_FILE); + logger->log1("Error loading being effects file"); return nullptr; } @@ -238,7 +237,7 @@ void ActorSprite::setStatusEffect(int index, bool active) void ActorSprite::setStatusEffectBlock(int offset, uint16_t newEffects) { - for (int i = 0; i < STATUS_EFFECTS; i++) + for (unsigned i = 0; i < STATUS_EFFECTS; i++) { int index = StatusEffect::blockEffectIndexToEffectIndex(offset + i); |