summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-08-22 00:06:49 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-08-22 00:27:30 +0200
commitea8134cc83d33c116e359175656d93fc4b59821a (patch)
tree95fd839d843d2b55f5cef6673c7db35a19432dff /src
parentd5b4cb1e0fab142b536e83a452f6ec5bb4f8368e (diff)
downloadmanaserv-ea8134cc83d33c116e359175656d93fc4b59821a.tar.gz
manaserv-ea8134cc83d33c116e359175656d93fc4b59821a.tar.bz2
manaserv-ea8134cc83d33c116e359175656d93fc4b59821a.tar.xz
manaserv-ea8134cc83d33c116e359175656d93fc4b59821a.zip
Avoid collision with type 'int' in SQL query
Was causing the account server to crash when using MySQL backend. Mantis-issue: 188 Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src')
-rw-r--r--src/account-server/storage.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/account-server/storage.cpp b/src/account-server/storage.cpp
index efaf40b8..551df01c 100644
--- a/src/account-server/storage.cpp
+++ b/src/account-server/storage.cpp
@@ -631,12 +631,7 @@ bool Storage::updateCharacter(Character *character,
<< "agi = '" << character->getAttribute(CHAR_ATTR_AGILITY) << "', "
<< "dex = '" << character->getAttribute(CHAR_ATTR_DEXTERITY) << "', "
<< "vit = '" << character->getAttribute(CHAR_ATTR_VITALITY) << "', "
-#if defined(MYSQL_SUPPORT) || defined(POSTGRESQL_SUPPORT)
- << "`int` = '"
-#else
- << "int = '"
-#endif
- << character->getAttribute(CHAR_ATTR_INTELLIGENCE) << "', "
+ << "`int` = '" << character->getAttribute(CHAR_ATTR_INTELLIGENCE) << "', "
<< "will = '" << character->getAttribute(CHAR_ATTR_WILLPOWER) << "' "
<< "where id = '" << character->getDatabaseID() << "';";
@@ -1101,12 +1096,12 @@ void Storage::updateCharacterPoints(int charId,
switch (attribId)
{
- case CHAR_ATTR_STRENGTH: sql << "str = "; break;
- case CHAR_ATTR_AGILITY: sql << "agi = "; break;
- case CHAR_ATTR_DEXTERITY: sql << "dex = "; break;
- case CHAR_ATTR_VITALITY: sql << "vit = "; break;
- case CHAR_ATTR_INTELLIGENCE: sql << "int = "; break;
- case CHAR_ATTR_WILLPOWER: sql << "will = "; break;
+ case CHAR_ATTR_STRENGTH: sql << "`str` = "; break;
+ case CHAR_ATTR_AGILITY: sql << "`agi` = "; break;
+ case CHAR_ATTR_DEXTERITY: sql << "`dex` = "; break;
+ case CHAR_ATTR_VITALITY: sql << "`vit` = "; break;
+ case CHAR_ATTR_INTELLIGENCE: sql << "`int` = "; break;
+ case CHAR_ATTR_WILLPOWER: sql << "`will` = "; break;
}
sql << attribValue
<< " WHERE id = " << charId;