diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-03-24 16:24:43 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-03-24 16:24:43 +0000 |
| commit | bfbb797e6c528e0650826e917d498c52362abbb0 (patch) | |
| tree | 8d111b92eefe8451a66b57599217829b4127318e /src/being.h | |
| parent | dae5c721bf974792db526f1d736384d95a75635e (diff) | |
| download | mana-bfbb797e6c528e0650826e917d498c52362abbb0.tar.gz mana-bfbb797e6c528e0650826e917d498c52362abbb0.tar.bz2 mana-bfbb797e6c528e0650826e917d498c52362abbb0.tar.xz mana-bfbb797e6c528e0650826e917d498c52362abbb0.zip | |
Merged 0.0 changes from revision 3177 to 3234 to trunk.
Diffstat (limited to 'src/being.h')
| -rw-r--r-- | src/being.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/being.h b/src/being.h index c3cba247..332f1b4a 100644 --- a/src/being.h +++ b/src/being.h @@ -41,7 +41,7 @@ class Equipment; class Item; class Map; class Graphics; -class Spriteset; +class ImageSet; /** * A position along a being's path. @@ -397,7 +397,7 @@ class Being : public Sprite Uint16 mStepTime; static int instances; /**< Number of Being instances */ - static Spriteset *emotionset; /**< Emoticons used by beings */ + static ImageSet *emotionSet; /**< Emoticons used by beings */ }; #endif |