← Back to branch summary

~ubuntu-branches/ubuntu/saucy/manaplus/saucy-proposed

« back to all changes in this revision

Viewing changes to src/statuseffect.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi, Andrei Karas, Patrick Matthäi
  • Date: 2013-06-10 10:53:26 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20130610105326-c3xqk5ebcgy3jxmb
Tags: 1.3.6.9-1
[ Andrei Karas ]
* Add new files to copyright file.

[ Patrick Matthäi ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/statuseffect.cpp
33
33
 
34
34
#include "debug.h"
35
35
 
36
 
static const char *const STATUS_EFFECTS_FILE = "status-effects.xml";
37
 
 
38
36
static void unloadMap(std::map<int, StatusEffect *> &map);
39
37
 
40
38
bool StatusEffect::mLoaded = false;
129
127
    if (mLoaded)
130
128
        unload();
131
129
 
132
 
    XML::Document doc(STATUS_EFFECTS_FILE);
 
130
    XML::Document doc(paths.getStringValue("statusEffectsFile"));
133
131
    const XmlNodePtr rootNode = doc.rootNode();
134
132
 
135
133
    if (!rootNode || !xmlNameEqual(rootNode, "status-effects"))