diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-02-26 14:37:03 +0000 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-02-26 14:38:04 +0000 |
| commit | 9dbd9c02f47480d19bed4b79a3bb982a35bf8902 (patch) | |
| tree | 989a5272893b5059c27ae7030a2d0c7830024313 /src | |
| parent | b2e4f8f9585cd06af648929bb044b2cb5333f770 (diff) | |
Misc:
- Fix errors in recent SQLs (1fc122e5c6a5e0099,a3755f8355e64c9efc)
- Proper defines in DBCStructure.h (Holiday Entry)
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/DataStores/DBCStructure.h | 12 | ||||
| -rwxr-xr-x | src/server/game/Miscellaneous/SharedDefines.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 75a6b71d943..1978dbc71f9 100755 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -1066,14 +1066,18 @@ struct HolidayNamesEntry }; */ +#define MAX_HOLIDAY_DURATIONS 10 +#define MAX_HOLIDAY_DATES 26 +#define MAX_HOLIDAY_FLAGS 10 + struct HolidaysEntry { uint32 Id; // 0 m_ID - uint32 Duration[10]; // 1-10 m_duration (MAX_HOLIDAY_DURATIONS) - uint32 Date[26]; // 11-36 m_date (dates in unix time starting at January, 1, 2000) (MAX_HOLIDAY_DATES) + uint32 Duration[MAX_HOLIDAY_DURATIONS]; // 1-10 m_duration + uint32 Date[MAX_HOLIDAY_DATES]; // 11-36 m_date (dates in unix time starting at January, 1, 2000) uint32 Region; // 37 m_region (wow region) uint32 Looping; // 38 m_looping - uint32 CalendarFlags[10]; // 39-48 m_calendarFlags (MAX_HOLIDAY_FLAGS) + uint32 CalendarFlags[MAX_HOLIDAY_FLAGS]; // 39-48 m_calendarFlags //uint32 holidayNameId; // 49 m_holidayNameID (HolidayNames.dbc) //uint32 holidayDescriptionId; // 50 m_holidayDescriptionID (HolidayDescriptions.dbc) char* TextureFilename; // 51 m_textureFilename @@ -1086,7 +1090,7 @@ struct ItemEntry { uint32 ID; // 0 uint32 Class; // 1 - uint32 SubClass; // 2 some items have strnage subclasses + uint32 SubClass; // 2 some items have strange subclasses int32 Unk0; // 3 int32 Material; // 4 uint32 DisplayId; // 5 diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 369b20252ab..c404277f61f 100755 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -3424,10 +3424,6 @@ enum ActivateTaxiReply // Calendar - start -#define MAX_HOLIDAY_DATES 26 -#define MAX_HOLIDAY_FLAGS 10 -#define MAX_HOLIDAY_DURATIONS 10 - enum CalendarFlags { CALENDAR_FLAG_ALL_ALLOWED = 0x001, |