diff options
author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-01-13 21:58:21 +0000 |
---|---|---|
committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2006-01-13 21:58:21 +0000 |
commit | f0a3f100f1c21e41447a420f8a729f2fb46c31eb (patch) | |
tree | 4a459a14d1df17c31ed9f14580ccea13ac6f58c9 /src/dalstorage.cpp | |
parent | 50f46449cc04e085b3fbbc821f9108be5e23f715 (diff) | |
download | manaserv-f0a3f100f1c21e41447a420f8a729f2fb46c31eb.tar.gz manaserv-f0a3f100f1c21e41447a420f8a729f2fb46c31eb.tar.bz2 manaserv-f0a3f100f1c21e41447a420f8a729f2fb46c31eb.tar.xz manaserv-f0a3f100f1c21e41447a420f8a729f2fb46c31eb.zip |
Made minimum client version and default map id configurable, set/getMapId are now preferred.
Diffstat (limited to 'src/dalstorage.cpp')
-rw-r--r-- | src/dalstorage.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/dalstorage.cpp b/src/dalstorage.cpp index 539d5ac1..17ed5e27 100644 --- a/src/dalstorage.cpp +++ b/src/dalstorage.cpp @@ -23,12 +23,13 @@ #include <sstream> #include <vector> +#include "configuration.h" +#include "dalstorage.h" + #include "utils/cipher.h" #include "utils/functors.h" #include "utils/logger.h" -#include "dalstorage.h" - namespace tmwserv { @@ -269,13 +270,13 @@ DALStorage::getAccount(const std::string& userName) ssMapId >> mapId; if ( mapId > 0 ) { - being->setMap(mapId); + being->setMapId(mapId); } else { // Set player to default map and one of the default location // Default map is to be 1, as not found return value will be 0. - being->setMap(DEFAULT_MAP_ID); + being->setMapId((int)config.getValue("defaultMap", 1)); } mCharacters.push_back(being); @@ -653,7 +654,7 @@ DALStorage::_addAccount(const AccountPtr& account) << (*it)->getMoney() << ", " << (*it)->getX() << ", " << (*it)->getY() << ", " - << (int)(*it)->getMap() << ", " + << (int)(*it)->getMapId() << ", " << stats.strength << ", " << stats.agility << ", " << stats.vitality << ", " @@ -750,7 +751,7 @@ DALStorage::_updAccount(const AccountPtr& account) << (*it)->getMoney() << ", " << (*it)->getX() << ", " << (*it)->getY() << ", " - << (*it)->getMap() << ", " + << (*it)->getMapId() << ", " << stats.strength << ", " << stats.agility << ", " << stats.vitality << ", " @@ -768,7 +769,7 @@ DALStorage::_updAccount(const AccountPtr& account) << " money = " << (*it)->getMoney() << ", " << " x = " << (*it)->getX() << ", " << " y = " << (*it)->getY() << ", " - << " map_id = " << (*it)->getMap() << ", " + << " map_id = " << (*it)->getMapId() << ", " << " str = " << stats.strength << ", " << " agi = " << stats.agility << ", " << " vit = " << stats.vitality << ", " |