diff options
| author | Ira Rice <irarice@gmail.com> | 2008-10-27 01:32:22 +0000 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2008-10-27 01:32:22 +0000 |
| commit | 8119f4ec53b64adc427f683077f65ce8aec85582 (patch) | |
| tree | ed95e9a85c4cfe412e391f95860866253d25b0a4 /src/being.cpp | |
| parent | fe76762f26180fdbbbac6e16bfa02c8bde3be78b (diff) | |
| download | mana-8119f4ec53b64adc427f683077f65ce8aec85582.tar.gz mana-8119f4ec53b64adc427f683077f65ce8aec85582.tar.bz2 mana-8119f4ec53b64adc427f683077f65ce8aec85582.tar.xz mana-8119f4ec53b64adc427f683077f65ce8aec85582.zip | |
Merged the Tametomo branch back into trunk. Targeting has been removed
from the viewport, and is now located on the beings themselves.
Eventually, this will be changed further so that the targets draw below
the being, instead of maintaining the same logic, but baby steps first.
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/being.cpp b/src/being.cpp index 519be4cc..c4569d4e 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -26,15 +26,15 @@ #include <cmath> #include "animatedsprite.h" +#include "configuration.h" #include "equipment.h" #include "game.h" #include "graphics.h" +#include "localplayer.h" #include "log.h" #include "map.h" #include "particle.h" #include "sound.h" -#include "localplayer.h" -#include "configuration.h" #include "text.h" #include "resources/resourcemanager.h" |