← Back to branch summary

~ubuntu-branches/ubuntu/vivid/manaplus/vivid

« back to all changes in this revision

Viewing changes to src/resources/db/itemdb.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2014-09-30 18:10:18 UTC
  • mfrom: (1.1.35)
  • Revision ID: package-import@ubuntu.com-20140930181018-pb73a0ogw29tjv8k
Tags: 1.4.9.27-1
* New upstream release.
* Bump Standards-Version to 3.9.6 (no changes required).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/resources/db/itemdb.cpp
35
35
 
36
36
#include "resources/db/itemdbstat.h"
37
37
 
 
38
#include "net/serverfeatures.h"
 
39
 
38
40
#include "utils/delete2.h"
39
41
#include "utils/dtor.h"
40
42
 
54
56
    std::map<std::string, ItemSoundEvent::Type> mSoundNames;
55
57
}  // namespace
56
58
 
57
 
extern int serverVersion;
58
 
 
59
59
// Forward declarations
60
60
static void loadSpriteRef(ItemInfo *const itemInfo,
61
61
                          const XmlNodePtr node);
672
672
    int id = -1;
673
673
    if (name == "down")
674
674
    {
675
 
        if (serverVersion > 0)
 
675
        if (serverFeatures->haveEightDirections())
676
676
            id = SpriteDirection::DOWN;
677
677
        else
678
678
            id = -2;
691
691
    }
692
692
    else if (name == "up")
693
693
    {
694
 
        if (serverVersion > 0)
 
694
        if (serverFeatures->haveEightDirections())
695
695
            id = SpriteDirection::UP;
696
696
        else
697
697
            id = -3;