mirror of
https://github.com/mangosfour/server.git
synced 2025-12-17 07:37:03 +00:00
[c12627] Implement loading TransportAnimation.dbc
This commit is contained in:
parent
dad1b10c5b
commit
988bad89e8
5 changed files with 26 additions and 1 deletions
|
|
@ -228,6 +228,8 @@ DBCStorage <TaxiPathEntry> sTaxiPathStore(TaxiPathEntryfmt);
|
||||||
TaxiPathNodesByPath sTaxiPathNodesByPath;
|
TaxiPathNodesByPath sTaxiPathNodesByPath;
|
||||||
static DBCStorage <TaxiPathNodeEntry> sTaxiPathNodeStore(TaxiPathNodeEntryfmt);
|
static DBCStorage <TaxiPathNodeEntry> sTaxiPathNodeStore(TaxiPathNodeEntryfmt);
|
||||||
|
|
||||||
|
TransportAnimationsByEntry sTransportAnimationsByEntry;
|
||||||
|
DBCStorage <TransportAnimationEntry> sTransportAnimationStore(TransportAnimationEntryfmt);
|
||||||
DBCStorage <TotemCategoryEntry> sTotemCategoryStore(TotemCategoryEntryfmt);
|
DBCStorage <TotemCategoryEntry> sTotemCategoryStore(TotemCategoryEntryfmt);
|
||||||
DBCStorage <VehicleEntry> sVehicleStore(VehicleEntryfmt);
|
DBCStorage <VehicleEntry> sVehicleStore(VehicleEntryfmt);
|
||||||
DBCStorage <VehicleSeatEntry> sVehicleSeatStore(VehicleSeatEntryfmt);
|
DBCStorage <VehicleSeatEntry> sVehicleSeatStore(VehicleSeatEntryfmt);
|
||||||
|
|
@ -793,6 +795,12 @@ void LoadDBCStores(const std::string& dataPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTotemCategoryStore, dbcPath,"TotemCategory.dbc");
|
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTotemCategoryStore, dbcPath,"TotemCategory.dbc");
|
||||||
|
|
||||||
|
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTransportAnimationStore, dbcPath,"TransportAnimation.dbc");
|
||||||
|
for (uint32 i = 0; i < sTransportAnimationStore.GetNumRows(); ++i)
|
||||||
|
if (TransportAnimationEntry const* entry = sTransportAnimationStore.LookupEntry(i))
|
||||||
|
sTransportAnimationsByEntry[entry->transportEntry][entry->timeFrame] = entry;
|
||||||
|
|
||||||
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sVehicleStore, dbcPath,"Vehicle.dbc");
|
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sVehicleStore, dbcPath,"Vehicle.dbc");
|
||||||
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sVehicleSeatStore, dbcPath,"VehicleSeat.dbc");
|
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sVehicleSeatStore, dbcPath,"VehicleSeat.dbc");
|
||||||
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sWorldMapAreaStore, dbcPath,"WorldMapArea.dbc");
|
LoadDBC(availableDbcLocales,bar,bad_dbc_files,sWorldMapAreaStore, dbcPath,"WorldMapArea.dbc");
|
||||||
|
|
|
||||||
|
|
@ -232,6 +232,8 @@ extern TaxiMask sDeathKnightTaxiNodesMask;
|
||||||
extern TaxiPathSetBySource sTaxiPathSetBySource;
|
extern TaxiPathSetBySource sTaxiPathSetBySource;
|
||||||
extern TaxiPathNodesByPath sTaxiPathNodesByPath;
|
extern TaxiPathNodesByPath sTaxiPathNodesByPath;
|
||||||
extern DBCStorage <TotemCategoryEntry> sTotemCategoryStore;
|
extern DBCStorage <TotemCategoryEntry> sTotemCategoryStore;
|
||||||
|
extern TransportAnimationsByEntry sTransportAnimationsByEntry;
|
||||||
|
extern DBCStorage <TransportAnimationEntry> sTransportAnimationStore;
|
||||||
extern DBCStorage <VehicleEntry> sVehicleStore;
|
extern DBCStorage <VehicleEntry> sVehicleStore;
|
||||||
extern DBCStorage <VehicleSeatEntry> sVehicleSeatStore;
|
extern DBCStorage <VehicleSeatEntry> sVehicleSeatStore;
|
||||||
extern DBCStorage <WMOAreaTableEntry> sWMOAreaTableStore;
|
extern DBCStorage <WMOAreaTableEntry> sWMOAreaTableStore;
|
||||||
|
|
|
||||||
|
|
@ -2257,6 +2257,17 @@ struct TotemCategoryEntry
|
||||||
uint32 categoryMask; // 3 m_totemCategoryMask (compatibility mask for same type: different for totems, compatible from high to low for rods)
|
uint32 categoryMask; // 3 m_totemCategoryMask (compatibility mask for same type: different for totems, compatible from high to low for rods)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct TransportAnimationEntry
|
||||||
|
{
|
||||||
|
//uint32 id; // 0
|
||||||
|
uint32 transportEntry; // 1
|
||||||
|
uint32 timeFrame; // 2
|
||||||
|
//float xOffs; // 3
|
||||||
|
//float yOffs; // 4
|
||||||
|
//float zOffs; // 5
|
||||||
|
//uint32 unk; // 6
|
||||||
|
};
|
||||||
|
|
||||||
#define MAX_VEHICLE_SEAT 8
|
#define MAX_VEHICLE_SEAT 8
|
||||||
|
|
||||||
struct VehicleEntry
|
struct VehicleEntry
|
||||||
|
|
@ -2499,6 +2510,9 @@ struct TaxiPathNodePtr
|
||||||
typedef Path<TaxiPathNodePtr,TaxiPathNodeEntry const> TaxiPathNodeList;
|
typedef Path<TaxiPathNodePtr,TaxiPathNodeEntry const> TaxiPathNodeList;
|
||||||
typedef std::vector<TaxiPathNodeList> TaxiPathNodesByPath;
|
typedef std::vector<TaxiPathNodeList> TaxiPathNodesByPath;
|
||||||
|
|
||||||
|
typedef UNORDERED_MAP<uint32 /*frame*/, TransportAnimationEntry const*> TransportAnimationEntryMap;
|
||||||
|
typedef UNORDERED_MAP<uint32, TransportAnimationEntryMap> TransportAnimationsByEntry;
|
||||||
|
|
||||||
#define TaxiMaskSize 114
|
#define TaxiMaskSize 114
|
||||||
typedef uint8 TaxiMask[TaxiMaskSize];
|
typedef uint8 TaxiMask[TaxiMaskSize];
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -138,6 +138,7 @@ const char TaxiNodesEntryfmt[]="nifffsiixxx";
|
||||||
const char TaxiPathEntryfmt[]="niii";
|
const char TaxiPathEntryfmt[]="niii";
|
||||||
const char TaxiPathNodeEntryfmt[]="diiifffiiii";
|
const char TaxiPathNodeEntryfmt[]="diiifffiiii";
|
||||||
const char TotemCategoryEntryfmt[]="nxii";
|
const char TotemCategoryEntryfmt[]="nxii";
|
||||||
|
const char TransportAnimationEntryfmt[]="diixxxx";
|
||||||
const char VehicleEntryfmt[]="niffffiiiiiiiifffffffffffffffssssfifiixx";
|
const char VehicleEntryfmt[]="niffffiiiiiiiifffffffffffffffssssfifiixx";
|
||||||
const char VehicleSeatEntryfmt[]="niiffffffffffiiiiiifffffffiiifffiiiiiiiffiiiiixxxxxxxxxxxxxxxxxxxx";
|
const char VehicleSeatEntryfmt[]="niiffffffffffiiiiiifffffffiiifffiiiiiiiffiiiiixxxxxxxxxxxxxxxxxxxx";
|
||||||
const char WMOAreaTableEntryfmt[]="niiixxxxxiixxxx";
|
const char WMOAreaTableEntryfmt[]="niiixxxxxiixxxx";
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "12626"
|
#define REVISION_NR "12627"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue