From 7b7af4d67ef82fb8545159b408c26e146c6f8076 Mon Sep 17 00:00:00 2001 From: Yaki Khadafi Date: Fri, 24 Aug 2012 19:00:51 +0300 Subject: [PATCH] [0176] Update gameobject_template Also enable last tutorial opcodes Signed-off-by: Yaki Khadafi --- .../0176_xxxxx_01_mangos_gameobject_template.sql | 11 +++++++++++ src/game/GameObject.h | 3 ++- src/game/Opcodes.cpp | 6 +++--- src/game/SQLStorages.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- src/shared/revision_sql.h | 2 +- 6 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 sql/updates/0176_xxxxx_01_mangos_gameobject_template.sql diff --git a/sql/updates/0176_xxxxx_01_mangos_gameobject_template.sql b/sql/updates/0176_xxxxx_01_mangos_gameobject_template.sql new file mode 100644 index 000000000..6789cb998 --- /dev/null +++ b/sql/updates/0176_xxxxx_01_mangos_gameobject_template.sql @@ -0,0 +1,11 @@ +ALTER TABLE db_version CHANGE COLUMN required_0169_xxxxx_04_mangos_command required_0176_xxxxx_01_mangos_gameobject_template bit; + +ALTER TABLE `gameobject_template` ADD COLUMN `data24` int(10) unsigned NOT NULL DEFAULT '0' AFTER `data23`; +ALTER TABLE `gameobject_template` ADD COLUMN `data25` int(10) unsigned NOT NULL DEFAULT '0' AFTER `data23`; +ALTER TABLE `gameobject_template` ADD COLUMN `data26` int(10) unsigned NOT NULL DEFAULT '0' AFTER `data23`; +ALTER TABLE `gameobject_template` ADD COLUMN `data27` int(10) unsigned NOT NULL DEFAULT '0' AFTER `data23`; +ALTER TABLE `gameobject_template` ADD COLUMN `data28` int(10) unsigned NOT NULL DEFAULT '0' AFTER `data23`; +ALTER TABLE `gameobject_template` ADD COLUMN `data29` int(10) unsigned NOT NULL DEFAULT '0' AFTER `data23`; +ALTER TABLE `gameobject_template` ADD COLUMN `data30` int(10) unsigned NOT NULL DEFAULT '0' AFTER `data23`; +ALTER TABLE `gameobject_template` ADD COLUMN `data31` int(10) unsigned NOT NULL DEFAULT '0' AFTER `data23`; +ALTER TABLE `gameobject_template` ADD COLUMN `unk2` int(10) unsigned NOT NULL DEFAULT '0' AFTER `data23`; \ No newline at end of file diff --git a/src/game/GameObject.h b/src/game/GameObject.h index 017837fcb..bb4bb9bdf 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -393,10 +393,11 @@ struct GameObjectInfo // not use for specific field access (only for output with loop by all filed), also this determinate max union size struct { - uint32 data[24]; + uint32 data[32]; } raw; }; + uint32 unk2; uint32 MinMoneyLoot; uint32 MaxMoneyLoot; uint32 ScriptId; diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp index 0f9136652..30a6cfaf9 100644 --- a/src/game/Opcodes.cpp +++ b/src/game/Opcodes.cpp @@ -322,9 +322,9 @@ void InitializeOpcodes() //OPCODE(CMSG_NEXT_CINEMATIC_CAMERA, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleNextCinematicCamera ); //OPCODE(CMSG_COMPLETE_CINEMATIC, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleCompleteCinematic ); OPCODE(SMSG_TUTORIAL_FLAGS, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); - //OPCODE(CMSG_TUTORIAL_FLAG, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTutorialFlagOpcode ); - //OPCODE(CMSG_TUTORIAL_CLEAR, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTutorialClearOpcode ); - //OPCODE(CMSG_TUTORIAL_RESET, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTutorialResetOpcode ); + OPCODE(CMSG_TUTORIAL_FLAG, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTutorialFlagOpcode ); + OPCODE(CMSG_TUTORIAL_CLEAR, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTutorialClearOpcode ); + OPCODE(CMSG_TUTORIAL_RESET, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleTutorialResetOpcode ); OPCODE(CMSG_STANDSTATECHANGE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleStandStateChangeOpcode ); OPCODE(CMSG_EMOTE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleEmoteOpcode ); OPCODE(SMSG_EMOTE, STATUS_NEVER, PROCESS_INPLACE, &WorldSession::Handle_ServerSide ); diff --git a/src/game/SQLStorages.cpp b/src/game/SQLStorages.cpp index 66ffaf202..e441e7e6d 100644 --- a/src/game/SQLStorages.cpp +++ b/src/game/SQLStorages.cpp @@ -25,8 +25,8 @@ const char CreatureModelfmt[] = "iffbii"; const char CreatureInfoAddonInfofmt[] = "iiibbiis"; const char GameObjectInfoAddonInfofmt[] = "iffff"; const char EquipmentInfofmt[] = "iiii"; -const char GameObjectInfosrcfmt[] = "iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiis"; -const char GameObjectInfodstfmt[] = "iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii"; +const char GameObjectInfosrcfmt[] = "iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiis"; +const char GameObjectInfodstfmt[] = "iiissssiifiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii"; const char ItemPrototypesrcfmt[]= "iiiisiiiiffiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiifiiisiifiiiii"; const char ItemPrototypedstfmt[]= "iiiisiiiiffiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiifiiifiiiiiifiiiiiifiiiiiifiiiiiifiiiisiiiiiiiiiiiiiiiiiiiiiiiifiiiiiifiiiii"; const char PageTextfmt[] = "isi"; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 1ce826e73..bdbe862a4 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 "0175" +#define REVISION_NR "0176" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 2b56d523a..2d1539c1d 100644 --- a/src/shared/revision_sql.h +++ b/src/shared/revision_sql.h @@ -1,6 +1,6 @@ #ifndef __REVISION_SQL_H__ #define __REVISION_SQL_H__ #define REVISION_DB_CHARACTERS "required_0099_xxxxx_01_characters_character_phase_data" - #define REVISION_DB_MANGOS "required_0169_xxxxx_04_mangos_command" + #define REVISION_DB_MANGOS "required_0176_xxxxx_01_mangos_gameobject_template" #define REVISION_DB_REALMD "required_0014_xxxxx_01_realmd_account_access" #endif // __REVISION_SQL_H__