mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10825] Move specific SQLStorage defines to game dir

Browse source 
This let have in shared dir only generic declarations of class SQLStorage
Not game specific details.
This commit is contained in:
VladimirMangos 2010-12-05 03:25:18 +03:00
parent c7a4f74676
commit 80712b928a
19 changed files with 122 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/AuctionHouseMgr.cpp
View file

@ -18,7 +18,7 @@
#include "AuctionHouseMgr.h"
#include "Database/DatabaseEnv.h"
#include "Database/SQLStorage.h"
#include "SQLStorages.h"
#include "DBCStores.h"
#include "ProgressBar.h"

2
src/game/CreatureEventAIMgr.cpp
View file

@ -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"

2
src/game/GMTicketMgr.cpp
View file

@ -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"

2
src/game/InstanceSaveMgr.cpp
View file

@ -18,7 +18,7 @@
#include "InstanceSaveMgr.h"
#include "Database/SQLStorage.h"
#include "SQLStorages.h"
#include "Player.h"
#include "GridNotifiers.h"
#include "Log.h"

2
src/game/Makefile.am
View file

@ -252,6 +252,8 @@ libmangosgame_a_SOURCES = \
SocialMgr.h \
SpellMgr.cpp \
SpellMgr.h \
SQLStorages.cpp \
SQLStorages.h \
StatSystem.cpp \
TargetedMovementGenerator.cpp \
TargetedMovementGenerator.h \

2
src/game/ObjectMgr.cpp
View file

@ -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"

12
src/game/ObjectMgr.h
View file

@ -35,22 +35,12 @@
#include "ObjectAccessor.h"
#include "ObjectGuid.h"
#include "Policies/Singleton.h"
#include "Database/SQLStorage.h"
#include "SQLStorages.h"
#include <string>
#include <map>
#include <limits>
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;

2
src/game/PlayerDump.cpp
View file

@ -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"

46
src/game/SQLStorages.cpp Normal file
View file

@ -0,0 +1,46 @@
/*
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* 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");

35
src/game/SQLStorages.h Normal file
View file

@ -0,0 +1,35 @@
/*
* Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
*
* 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

2
src/game/SpellMgr.h
View file

@ -27,7 +27,7 @@
#include "SpellAuraDefines.h"
#include "DBCStructure.h"
#include "DBCStores.h"
#include "Database/SQLStorage.h"
#include "SQLStorages.h"
#include "Utilities/UnorderedMapSet.h"

2
src/game/pchdef.h
View file

@ -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"

30
src/shared/Database/SQLStorage.cpp
View file

@ -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;

5
src/shared/Database/SQLStorageImpl.h
View file

@ -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<T>::Load(SQLStorage &store)
store.MaxEntry = maxi;
store.data = _data;
}
#endif

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "10824"
#define REVISION_NR "10825"
#endif // __REVISION_NR_H__

2
win/VC100/game.vcxproj
View file

@ -480,6 +480,7 @@
<ClCompile Include="..\..\src\game\SocialMgr.cpp" />
<ClCompile Include="..\..\src\game\Spell.cpp" />
<ClCompile Include="..\..\src\game\SpellAuras.cpp" />
<ClCompile Include="..\..\src\game\SQLStorages.cpp" />
<ClCompile Include="..\..\src\game\UnitAuraProcHandler.cpp" />
<ClCompile Include="..\..\src\game\SpellEffects.cpp" />
<ClCompile Include="..\..\src\game\SpellHandler.cpp" />
@ -623,6 +624,7 @@
<ClInclude Include="..\..\src\game\SpellAuraDefines.h" />
<ClInclude Include="..\..\src\game\SpellAuras.h" />
<ClInclude Include="..\..\src\game\SpellMgr.h" />
<ClInclude Include="..\..\src\game\SQLStorages.h" />
<ClInclude Include="..\..\src\game\TargetedMovementGenerator.h" />
<ClInclude Include="..\..\src\game\TemporarySummon.h" />
<ClInclude Include="..\..\src\game\ThreatManager.h" />

6
win/VC100/game.vcxproj.filters
View file

@ -399,6 +399,9 @@
<ClCompile Include="..\..\src\game\Opcodes.cpp">
<Filter>Server</Filter>
</ClCompile>
<ClCompile Include="..\..\src\game\SQLStorages.cpp">
<Filter>Server</Filter>
</ClCompile>
<ClCompile Include="..\..\src\game\WorldSession.cpp">
<Filter>Server</Filter>
</ClCompile>
@ -813,6 +816,9 @@
<ClInclude Include="..\..\src\game\SharedDefines.h">
<Filter>Server</Filter>
</ClInclude>
<ClInclude Include="..\..\src\game\SQLStorages.h">
<Filter>Server</Filter>
</ClInclude>
<ClInclude Include="..\..\src\game\WorldSession.h">
<Filter>Server</Filter>
</ClInclude>

8
win/VC80/game.vcproj
View file

@ -1493,6 +1493,14 @@
RelativePath="..\..\src\game\SharedDefines.h"
>
</File>
<File
RelativePath="..\..\src\game\SQLStorages.cpp"
>
</File>
<File
RelativePath="..\..\src\game\SQLStorages.h"
>
</File>
<File
RelativePath="..\..\src\game\WorldSession.cpp"
>

8
win/VC90/game.vcproj
View file

@ -1494,6 +1494,14 @@
RelativePath="..\..\src\game\SharedDefines.h"
>
</File>
<File
RelativePath="..\..\src\game\SQLStorages.cpp"
>
</File>
<File
RelativePath="..\..\src\game\SQLStorages.h"
>
</File>
<File
RelativePath="..\..\src\game\WorldSession.cpp"
>