diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp index 979093a94..164d8c38d 100644 --- a/src/game/AuctionHouseMgr.cpp +++ b/src/game/AuctionHouseMgr.cpp @@ -18,7 +18,7 @@ #include "AuctionHouseMgr.h" #include "Database/DatabaseEnv.h" -#include "Database/SQLStorage.h" +#include "SQLStorages.h" #include "DBCStores.h" #include "ProgressBar.h" diff --git a/src/game/CreatureEventAIMgr.cpp b/src/game/CreatureEventAIMgr.cpp index 892d53b4f..0f883dc1c 100644 --- a/src/game/CreatureEventAIMgr.cpp +++ b/src/game/CreatureEventAIMgr.cpp @@ -18,7 +18,7 @@ #include "Common.h" #include "Database/DatabaseEnv.h" -#include "Database/SQLStorage.h" +#include "SQLStorages.h" #include "CreatureEventAI.h" #include "CreatureEventAIMgr.h" #include "ObjectMgr.h" diff --git a/src/game/GMTicketMgr.cpp b/src/game/GMTicketMgr.cpp index f5c237ae0..16770ba9f 100644 --- a/src/game/GMTicketMgr.cpp +++ b/src/game/GMTicketMgr.cpp @@ -18,7 +18,7 @@ #include "Common.h" #include "Database/DatabaseEnv.h" -#include "Database/SQLStorage.h" +#include "SQLStorages.h" #include "GMTicketMgr.h" #include "ObjectMgr.h" #include "ObjectGuid.h" diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/InstanceSaveMgr.cpp index ceff0e373..fed871bf7 100644 --- a/src/game/InstanceSaveMgr.cpp +++ b/src/game/InstanceSaveMgr.cpp @@ -18,7 +18,7 @@ #include "InstanceSaveMgr.h" -#include "Database/SQLStorage.h" +#include "SQLStorages.h" #include "Player.h" #include "GridNotifiers.h" #include "Log.h" diff --git a/src/game/Makefile.am b/src/game/Makefile.am index 87216857e..a1c6b7187 100644 --- a/src/game/Makefile.am +++ b/src/game/Makefile.am @@ -252,6 +252,8 @@ libmangosgame_a_SOURCES = \ SocialMgr.h \ SpellMgr.cpp \ SpellMgr.h \ + SQLStorages.cpp \ + SQLStorages.h \ StatSystem.cpp \ TargetedMovementGenerator.cpp \ TargetedMovementGenerator.h \ diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 9289892e9..0281510cf 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -18,10 +18,10 @@ #include "ObjectMgr.h" #include "Database/DatabaseEnv.h" -#include "Database/SQLStorage.h" #include "Database/SQLStorageImpl.h" #include "Policies/SingletonImp.h" +#include "SQLStorages.h" #include "Log.h" #include "MapManager.h" #include "ObjectGuid.h" diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index ab56405c1..7b715ecf9 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -35,22 +35,12 @@ #include "ObjectAccessor.h" #include "ObjectGuid.h" #include "Policies/Singleton.h" -#include "Database/SQLStorage.h" +#include "SQLStorages.h" #include #include #include -extern SQLStorage sCreatureStorage; -extern SQLStorage sCreatureDataAddonStorage; -extern SQLStorage sCreatureInfoAddonStorage; -extern SQLStorage sCreatureModelStorage; -extern SQLStorage sEquipmentStorage; -extern SQLStorage sGOStorage; -extern SQLStorage sPageTextStore; -extern SQLStorage sItemStorage; -extern SQLStorage sInstanceTemplate; - class Group; class Guild; class ArenaTeam; diff --git a/src/game/PlayerDump.cpp b/src/game/PlayerDump.cpp index 70ab19e34..1ee6f9013 100644 --- a/src/game/PlayerDump.cpp +++ b/src/game/PlayerDump.cpp @@ -19,7 +19,7 @@ #include "Common.h" #include "PlayerDump.h" #include "Database/DatabaseEnv.h" -#include "Database/SQLStorage.h" +#include "SQLStorages.h" #include "UpdateFields.h" #include "ObjectMgr.h" #include "AccountMgr.h" diff --git a/src/game/SQLStorages.cpp b/src/game/SQLStorages.cpp new file mode 100644 index 000000000..c9765e026 --- /dev/null +++ b/src/game/SQLStorages.cpp @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "SQLStorages.h" +#include "Database/SQLStorage.h" +#include "Database/SQLStorageImpl.h" +#include "Database/DatabaseEnv.h" + +const char CreatureInfosrcfmt[]="iiiiiiiiiisssiiiiiiiiiiifffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiisiiffliiiiiiiliiiis"; +const char CreatureInfodstfmt[]="iiiiiiiiiisssiiiiiiiiiiifffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiisiiffliiiiiiiliiiii"; +const char CreatureDataAddonInfofmt[]="iiilliis"; +const char CreatureModelfmt[]="iffbii"; +const char CreatureInfoAddonInfofmt[]="iiilliis"; +const char EquipmentInfofmt[]="iiii"; +const char GameObjectInfosrcfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiis"; +const char GameObjectInfodstfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii"; +const char ItemPrototypesrcfmt[]="iiiisiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffiffiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiiifiiisiiiii"; +const char ItemPrototypedstfmt[]="iiiisiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffiffiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiiifiiiiiiiii"; +const char PageTextfmt[]="isi"; +const char InstanceTemplatesrcfmt[]="iiiis"; +const char InstanceTemplatedstfmt[]="iiiii"; + +SQLStorage sCreatureStorage(CreatureInfosrcfmt, CreatureInfodstfmt, "entry","creature_template"); +SQLStorage sCreatureDataAddonStorage(CreatureDataAddonInfofmt,"guid","creature_addon"); +SQLStorage sCreatureModelStorage(CreatureModelfmt,"modelid","creature_model_info"); +SQLStorage sCreatureInfoAddonStorage(CreatureInfoAddonInfofmt,"entry","creature_template_addon"); +SQLStorage sEquipmentStorage(EquipmentInfofmt,"entry","creature_equip_template"); +SQLStorage sGOStorage(GameObjectInfosrcfmt, GameObjectInfodstfmt, "entry","gameobject_template"); +SQLStorage sItemStorage(ItemPrototypesrcfmt, ItemPrototypedstfmt, "entry","item_template"); +SQLStorage sPageTextStore(PageTextfmt,"entry","page_text"); +SQLStorage sInstanceTemplate(InstanceTemplatesrcfmt, InstanceTemplatedstfmt, "map","instance_template"); diff --git a/src/game/SQLStorages.h b/src/game/SQLStorages.h new file mode 100644 index 000000000..51b20fe73 --- /dev/null +++ b/src/game/SQLStorages.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2005-2010 MaNGOS + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef MANGOS_SQLSTORAGES_H +#define MANGOS_SQLSTORAGES_H + +#include "Common.h" +#include "Database/SQLStorage.h" + +extern SQLStorage sCreatureStorage; +extern SQLStorage sCreatureDataAddonStorage; +extern SQLStorage sCreatureInfoAddonStorage; +extern SQLStorage sCreatureModelStorage; +extern SQLStorage sEquipmentStorage; +extern SQLStorage sGOStorage; +extern SQLStorage sPageTextStore; +extern SQLStorage sItemStorage; +extern SQLStorage sInstanceTemplate; + +#endif diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h index 5c4237bc2..994dec016 100644 --- a/src/game/SpellMgr.h +++ b/src/game/SpellMgr.h @@ -27,7 +27,7 @@ #include "SpellAuraDefines.h" #include "DBCStructure.h" #include "DBCStores.h" -#include "Database/SQLStorage.h" +#include "SQLStorages.h" #include "Utilities/UnorderedMapSet.h" diff --git a/src/game/pchdef.h b/src/game/pchdef.h index 88df6220b..9b7515d95 100644 --- a/src/game/pchdef.h +++ b/src/game/pchdef.h @@ -6,7 +6,7 @@ #include "Log.h" #include "ObjectAccessor.h" #include "ObjectGuid.h" -#include "Database/SQLStorage.h" +#include "SQLStorages.h" #include "Opcodes.h" #include "SharedDefines.h" #include "ObjectMgr.h" diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp index 41d7c6557..9f8d3f191 100644 --- a/src/shared/Database/SQLStorage.cpp +++ b/src/shared/Database/SQLStorage.cpp @@ -19,36 +19,6 @@ #include "SQLStorage.h" #include "SQLStorageImpl.h" -#ifdef DO_POSTGRESQL -extern DatabasePostgre WorldDatabase; -#else -extern DatabaseMysql WorldDatabase; -#endif - -const char CreatureInfosrcfmt[]="iiiiiiiiiisssiiiiiiiiiiifffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiisiiffliiiiiiiliiiis"; -const char CreatureInfodstfmt[]="iiiiiiiiiisssiiiiiiiiiiifffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiisiiffliiiiiiiliiiii"; -const char CreatureDataAddonInfofmt[]="iiilliis"; -const char CreatureModelfmt[]="iffbii"; -const char CreatureInfoAddonInfofmt[]="iiilliis"; -const char EquipmentInfofmt[]="iiii"; -const char GameObjectInfosrcfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiis"; -const char GameObjectInfodstfmt[]="iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii"; -const char ItemPrototypesrcfmt[]="iiiisiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffiffiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiiifiiisiiiii"; -const char ItemPrototypedstfmt[]="iiiisiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiffiffiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiiifiiiiiiiii"; -const char PageTextfmt[]="isi"; -const char InstanceTemplatesrcfmt[]="iiiis"; -const char InstanceTemplatedstfmt[]="iiiii"; - -SQLStorage sCreatureStorage(CreatureInfosrcfmt, CreatureInfodstfmt, "entry","creature_template"); -SQLStorage sCreatureDataAddonStorage(CreatureDataAddonInfofmt,"guid","creature_addon"); -SQLStorage sCreatureModelStorage(CreatureModelfmt,"modelid","creature_model_info"); -SQLStorage sCreatureInfoAddonStorage(CreatureInfoAddonInfofmt,"entry","creature_template_addon"); -SQLStorage sEquipmentStorage(EquipmentInfofmt,"entry","creature_equip_template"); -SQLStorage sGOStorage(GameObjectInfosrcfmt, GameObjectInfodstfmt, "entry","gameobject_template"); -SQLStorage sItemStorage(ItemPrototypesrcfmt, ItemPrototypedstfmt, "entry","item_template"); -SQLStorage sPageTextStore(PageTextfmt,"entry","page_text"); -SQLStorage sInstanceTemplate(InstanceTemplatesrcfmt, InstanceTemplatedstfmt, "map","instance_template"); - void SQLStorage::EraseEntry(uint32 id) { uint32 offset=0; diff --git a/src/shared/Database/SQLStorageImpl.h b/src/shared/Database/SQLStorageImpl.h index 4b8ccbde7..f113b9822 100644 --- a/src/shared/Database/SQLStorageImpl.h +++ b/src/shared/Database/SQLStorageImpl.h @@ -16,6 +16,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifndef SQLSTORAGE_IMPL_H +#define SQLSTORAGE_IMPL_H + #include "ProgressBar.h" #include "Log.h" #include "DBCFileLoader.h" @@ -214,3 +217,5 @@ void SQLStorageLoaderBase::Load(SQLStorage &store) store.MaxEntry = maxi; store.data = _data; } + +#endif diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 92545c1d8..b9cba5d5f 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 "10824" + #define REVISION_NR "10825" #endif // __REVISION_NR_H__ diff --git a/win/VC100/game.vcxproj b/win/VC100/game.vcxproj index 2c387c66b..7460ecca4 100644 --- a/win/VC100/game.vcxproj +++ b/win/VC100/game.vcxproj @@ -480,6 +480,7 @@ + @@ -623,6 +624,7 @@ + diff --git a/win/VC100/game.vcxproj.filters b/win/VC100/game.vcxproj.filters index 34eec9767..d82100fc1 100644 --- a/win/VC100/game.vcxproj.filters +++ b/win/VC100/game.vcxproj.filters @@ -399,6 +399,9 @@ Server + + Server + Server @@ -813,6 +816,9 @@ Server + + Server + Server diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj index 43e8bff70..39fa82d13 100644 --- a/win/VC80/game.vcproj +++ b/win/VC80/game.vcproj @@ -1493,6 +1493,14 @@ RelativePath="..\..\src\game\SharedDefines.h" > + + + + diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj index 695956483..56fbe7250 100644 --- a/win/VC90/game.vcproj +++ b/win/VC90/game.vcproj @@ -1494,6 +1494,14 @@ RelativePath="..\..\src\game\SharedDefines.h" > + + + +