From f8a7533a92b78475c64204f72a0772cf7978e796 Mon Sep 17 00:00:00 2001 From: Salja Date: Wed, 8 Aug 2012 09:02:10 +0200 Subject: [PATCH] [0016] Some Clean from last Commits. Signed-off-by: Salja --- sql/realmd.sql | 4 +- sql/updates/00014_02_realmd_account.sql | 3 -- ... 00014_xxxxx_01_realmd_account_access.sql} | 32 ++++++++------- src/game/Level3.cpp | 39 ++++++++++--------- src/shared/revision_nr.h | 2 +- src/shared/revision_sql.h | 2 +- 6 files changed, 42 insertions(+), 40 deletions(-) delete mode 100644 sql/updates/00014_02_realmd_account.sql rename sql/updates/{00014_01_realmd_account_access.sql => 00014_xxxxx_01_realmd_account_access.sql} (65%) diff --git a/sql/realmd.sql b/sql/realmd.sql index 28b4a615c..9ab3e004e 100644 --- a/sql/realmd.sql +++ b/sql/realmd.sql @@ -21,7 +21,7 @@ DROP TABLE IF EXISTS `realmd_db_version`; CREATE TABLE `realmd_db_version` ( - `required_00014_01_realmd_account_access` bit(1) default NULL + `required_0014_xxxxx_01_realmd_account_access` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB'; -- @@ -86,7 +86,7 @@ CREATE TABLE `account_access` ( `gmlevel` tinyint(3) unsigned NOT NULL, `RealmID` int(11) NOT NULL DEFAULT '-1', PRIMARY KEY (`id`,`RealmID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=MYISAM DEFAULT CHARSET=utf8; -- -- Dumping data for table `account_access` diff --git a/sql/updates/00014_02_realmd_account.sql b/sql/updates/00014_02_realmd_account.sql deleted file mode 100644 index 06be7aaed..000000000 --- a/sql/updates/00014_02_realmd_account.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE realmd_db_version CHANGE COLUMN required_00014_01_realmd_account_access required_00014_02_realmd_account BIT; - -ALTER TABLE `account` DROP `gmlevel`; \ No newline at end of file diff --git a/sql/updates/00014_01_realmd_account_access.sql b/sql/updates/00014_xxxxx_01_realmd_account_access.sql similarity index 65% rename from sql/updates/00014_01_realmd_account_access.sql rename to sql/updates/00014_xxxxx_01_realmd_account_access.sql index 50a2d48f3..486920919 100644 --- a/sql/updates/00014_01_realmd_account_access.sql +++ b/sql/updates/00014_xxxxx_01_realmd_account_access.sql @@ -1,14 +1,18 @@ -ALTER TABLE realmd_db_version CHANGE COLUMN required_0001_xxxxx_01_realmd required_00014_01_realmd_account_access bit; - --- --- Table Stucture for table `account `account_access` --- - -DROP TABLE IF EXISTS `account_access`; - -CREATE TABLE `account_access` ( - `id` int(10) unsigned NOT NULL, - `gmlevel` tinyint(3) unsigned NOT NULL, - `RealmID` int(11) NOT NULL DEFAULT '-1', - PRIMARY KEY (`id`,`RealmID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +ALTER TABLE realmd_db_version CHANGE COLUMN required_0001_xxxxx_01_realmd required_0014_xxxxx_01_realmd_account_access bit; + +ALTER TABLE `account` DROP `gmlevel`; + +DROP TABLE IF EXISTS `account_access`; + +CREATE TABLE `account_access` ( + `id` int(10) unsigned NOT NULL, + `gmlevel` tinyint(3) unsigned NOT NULL, + `RealmID` int(11) NOT NULL DEFAULT '-1', + PRIMARY KEY (`id`,`RealmID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +INSERT INTO `account_access` VALUES +(1,3,-1), +(2,2,-1), +(3,1,-1), +(4,0,-1); \ No newline at end of file diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp index f93434804..2b76c146f 100644 --- a/src/game/Level3.cpp +++ b/src/game/Level3.cpp @@ -1143,7 +1143,7 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(char* args) return false; int32 gm; - uint32 gmRealmID = realmID; + uint32 gmRealmID = realmID; if (!ExtractInt32(&args, gm)) return false; @@ -1167,13 +1167,13 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(char* args) SetSentErrorMessage(true); return false; } -// Check if provided realmID is not current realmID, or isn't -1 - if (gmRealmID != realmID && gmRealmID != -1) - { - SendSysMessage(LANG_INVALID_REALMID); - SetSentErrorMessage(true); - return false; - } + /// check if provided realmID is not current realmID, or isn't -1 + if (gmRealmID != realmID && gmRealmID != -1) + { + SendSysMessage(LANG_INVALID_REALMID); + SetSentErrorMessage(true); + return false; + } if (targetPlayer) { @@ -1182,19 +1182,20 @@ bool ChatHandler::HandleAccountSetGmLevelCommand(char* args) } PSendSysMessage(LANG_YOU_CHANGE_SECURITY, targetAccountName.c_str(), gm); - // If gmRealmID is -1, delete all values for the account id, else, insert values for the specific realmID - if (gmRealmID == -1) - { - LoginDatabase.PExecute("DELETE FROM account_access WHERE id = '%u'", targetAccountId); - LoginDatabase.PExecute("INSERT INTO account_access VALUES ('%u', '%d', -1)", targetAccountId, gm); - } - else - { - LoginDatabase.PExecute("DELETE FROM account_access WHERE id = '%u' AND RealmID = '%d'", targetAccountId, realmID); - LoginDatabase.PExecute("INSERT INTO account_access VALUES ('%u','%d','%d')", targetAccountId, gm, realmID); - } //LoginDatabase.PExecute("UPDATE account_access SET gmlevel = '%i' WHERE id = '%u'", gm, targetAccountId); + /// If gmRealmID is -1, delete all values for the account id, else, insert values for the specific realmID + if (gmRealmID == -1) + { + LoginDatabase.PExecute("DELETE FROM account_access WHERE id = '%u'", targetAccountId); + LoginDatabase.PExecute("INSERT INTO account_access VALUES ('%u', '%d', -1)", targetAccountId, gm); + } + else + { + LoginDatabase.PExecute("DELETE FROM account_access WHERE id = '%u' AND RealmID = '%d'", targetAccountId, realmID); + LoginDatabase.PExecute("INSERT INTO account_access VALUES ('%u','%d','%d')", targetAccountId, gm, realmID); + } + return true; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 2139cb54e..df4f56c12 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "0015" + #define REVISION_NR "0016" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index b691c8ce7..8f5b86280 100644 --- a/src/shared/revision_sql.h +++ b/src/shared/revision_sql.h @@ -2,5 +2,5 @@ #define __REVISION_SQL_H__ #define REVISION_DB_CHARACTERS "required_0001_xxxxx_01_characters" #define REVISION_DB_MANGOS "required_0001_xxxxx_01_mangos" -#define REVISION_DB_REALMD "required_00014_02_realmd_account" +#define REVISION_DB_REALMD "required_0014_xxxxx_01_realmd_account_access" #endif // __REVISION_SQL_H__