[s1826] Drop temp CREATURE_FLAG_EXTRA_NO_TALKTO_CREDIT

Also toggle git-id tool to work well with recent milestone

(based on commit [12279] - b33c51e)

Author: Schmoozerd

.gitattributes

@@ -3,6 +3,9 @@
 *.vcproj     eol=crlf
 *.vcxproj*   eol=crlf
 
+src/shared/revision_nr.h eol=lf
+src/shared/revision_sql.h eol=lf
+
 # Whitespace rules
 # strict (no trailing, no tabs)
 *.cpp        whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol

contrib/git_id/git_id.cpp

@@ -478,6 +478,14 @@ bool find_sql_updates()
 
     pclose(cmd_pipe);
 
+    // Add last milestone's file information
+    last_sql_rev[0] = 11785;
+    last_sql_nr[0] = 2;
+    sscanf("11785_02_characters_instance", "%s", last_sql_update[0]);
+    last_sql_rev[2] = 10008;
+    last_sql_nr[2] = 1;
+    sscanf("10008_01_realmd_realmd_db_version", "%s", last_sql_update[2]);
+
     // remove updates from the last commit also found on origin
     snprintf(cmd, MAX_CMD, "git show %s:%s", origin_hash, sql_update_dir);
     if ((cmd_pipe = popen(cmd, "r")) == NULL)

sql/mangos.sql

@@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `db_version`;
 CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
   `creature_ai_version` varchar(120) default NULL,
-  `required_s1825_12278_01_mangos_creature_template` bit(1) default NULL
+  `required_s1826_12279_01_mangos_creature_template` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --

sql/updates/s1826_12279_01_mangos_creature_template.sql

@@ -0,0 +1,3 @@
+ALTER TABLE db_version CHANGE COLUMN required_s1825_12278_01_mangos_creature_template required_s1826_12279_01_mangos_creature_template bit;
+
+UPDATE creature_template SET flags_extra=flags_extra & ~0x800;

src/game/Creature.h

@@ -54,7 +54,6 @@ enum CreatureFlagsExtra
     CREATURE_FLAG_EXTRA_NOT_TAUNTABLE   = 0x00000100,       // creature is immune to taunt auras and effect attack me
     CREATURE_FLAG_EXTRA_AGGRO_ZONE      = 0x00000200,       // creature sets itself in combat with zone on aggro
     CREATURE_FLAG_EXTRA_GUARD           = 0x00000400,       // creature is a guard
-    CREATURE_FLAG_EXTRA_NO_TALKTO_CREDIT = 0x00000800,      // creature doesn't give quest-credits when talked to (temporarily flag)
 };
 
 // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform

src/game/Player.cpp

@@ -12188,8 +12188,6 @@ void Player::PrepareGossipMenu(WorldObject* pSource, uint32 menuId)
     if (pMenuItemBounds.first == pMenuItemBounds.second && canSeeQuests)
         pMenuItemBounds = sObjectMgr.GetGossipMenuItemsMapBounds(0);
 
-    bool canTalkToCredit = pSource->GetTypeId() == TYPEID_UNIT;
-
     for (GossipMenuItemsMap::const_iterator itr = pMenuItemBounds.first; itr != pMenuItemBounds.second; ++itr)
     {
         bool hasMenuItem = true;
@@ -12216,8 +12214,6 @@ void Player::PrepareGossipMenu(WorldObject* pSource, uint32 menuId)
             switch (itr->second.option_id)
             {
                 case GOSSIP_OPTION_GOSSIP:
-                    if (itr->second.action_menu_id != 0)    // has sub menu (or close gossip), so do not "talk" with this NPC yet
-                        canTalkToCredit = false;
                     break;
                 case GOSSIP_OPTION_QUESTGIVER:
                     hasMenuItem = false;
@@ -12325,12 +12321,6 @@ void Player::PrepareGossipMenu(WorldObject* pSource, uint32 menuId)
     if (canSeeQuests)
         PrepareQuestMenu(pSource->GetObjectGuid());
 
-    if (canTalkToCredit)
-    {
-        if (pSource->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP) && !(((Creature*)pSource)->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_NO_TALKTO_CREDIT))
-            TalkedToCreature(pSource->GetEntry(), pSource->GetObjectGuid());
-    }
-
     // some gossips aren't handled in normal way ... so we need to do it this way .. TODO: handle it in normal way ;-)
     /*if (pMenu->Empty())
     {

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "1825"
+ #define REVISION_NR "1826"
 #endif // __REVISION_NR_H__

src/shared/revision_sql.h

@@ -1,6 +1,6 @@
 #ifndef __REVISION_SQL_H__
 #define __REVISION_SQL_H__
  #define REVISION_DB_CHARACTERS "required_"
- #define REVISION_DB_MANGOS "required_s1825_12278_01_mangos_creature_template"
+ #define REVISION_DB_MANGOS "required_s1826_12279_01_mangos_creature_template"
  #define REVISION_DB_REALMD "required_"
 #endif // __REVISION_SQL_H__