diff options
43 files changed, 2659 insertions, 165 deletions
diff --git a/sql/updates/917_world.sql b/sql/updates/917_world.sql new file mode 100644 index 00000000000..084091ec0af --- /dev/null +++ b/sql/updates/917_world.sql @@ -0,0 +1,8 @@ +CREATE TABLE `version` ( + `core_version` varchar(120) default NULL COMMENT 'Core revision dumped at startup.', + `db_version` varchar(120) default NULL COMMENT 'Version of world DB.', + `script_version` varchar(120) default NULL COMMENT 'Version of scripts DB.' +) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Version Notes'; +INSERT INTO version (core_version, db_version, script_version) VALUES ("",(SELECT version FROM db_version),(SELECT version FROM script_db_version)); +DROP TABLE IF EXISTS db_version; +DROP TABLE IF EXISTS script_db_version;
\ No newline at end of file diff --git a/sql/updates/919_world.sql b/sql/updates/919_world.sql new file mode 100644 index 00000000000..24267d49223 --- /dev/null +++ b/sql/updates/919_world.sql @@ -0,0 +1,2 @@ +ALTER TABLE version + ADD `core_revision` BIGINT UNSIGNED AFTER `core_version`;
\ No newline at end of file diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt index ef9a6927e30..dc983f8c14d 100644 --- a/sql/updates/CMakeLists.txt +++ b/sql/updates/CMakeLists.txt @@ -138,4 +138,8 @@ INSTALL(FILES 857_world_scripts.sql 863_world_scripts.sql 871_world.sql +884_world.sql +905_world_scripts.sql +917_world.sql +919_world.sql DESTINATION share/trinity/sql/updates) diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt index 0ee315816e1..1995d80e9f6 100644 --- a/src/bindings/scripts/CMakeLists.txt +++ b/src/bindings/scripts/CMakeLists.txt @@ -67,25 +67,19 @@ SET(trinityscript_LIB_SRCS scripts/zone/black_temple/def_black_temple.h scripts/zone/black_temple/illidari_council.cpp scripts/zone/black_temple/instance_black_temple.cpp - scripts/zone/blackrock_depths/blackrock_depths.cpp - scripts/zone/blackrock_depths/instance_blackrock_depths.cpp - scripts/zone/blackrock_depths/def_blackrock_depths.h - scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp - scripts/zone/blackrock_depths/boss_angerrel.cpp - scripts/zone/blackrock_depths/boss_anubshiah.cpp - scripts/zone/blackrock_depths/boss_doomrel.cpp - scripts/zone/blackrock_depths/boss_doperel.cpp - scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp - scripts/zone/blackrock_depths/boss_general_angerforge.cpp - scripts/zone/blackrock_depths/boss_gloomrel.cpp + scripts/zone/blackrock_depths/blackrock_depths.cpp + scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp + scripts/zone/blackrock_depths/boss_anubshiah.cpp + scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp + scripts/zone/blackrock_depths/boss_general_angerforge.cpp scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp - scripts/zone/blackrock_depths/boss_grizzle.cpp - scripts/zone/blackrock_depths/boss_haterel.cpp - scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp - scripts/zone/blackrock_depths/boss_magmus.cpp - scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp - scripts/zone/blackrock_depths/boss_seethrel.cpp - scripts/zone/blackrock_depths/boss_vilerel.cpp + scripts/zone/blackrock_depths/boss_grizzle.cpp + scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp + scripts/zone/blackrock_depths/boss_magmus.cpp + scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp + scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp + scripts/zone/blackrock_depths/def_blackrock_depths.h + scripts/zone/blackrock_depths/instance_blackrock_depths.cpp scripts/zone/blackrock_spire/boss_drakkisath.cpp scripts/zone/blackrock_spire/boss_gyth.cpp scripts/zone/blackrock_spire/boss_halycon.cpp @@ -347,6 +341,7 @@ SET(trinityscript_LIB_SRCS scripts/zone/uldaman/boss_ironaya.cpp scripts/zone/uldaman/uldaman.cpp scripts/zone/undercity/undercity.cpp + scripts/zone/ungoro_crater/ungoro_crater.cpp scripts/zone/wailing_caverns/instance_wailing_caverns.cpp scripts/zone/western_plaguelands/western_plaguelands.cpp scripts/zone/westfall/westfall.cpp diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp index 5876fa63b06..cbfda734989 100644 --- a/src/bindings/scripts/ScriptMgr.cpp +++ b/src/bindings/scripts/ScriptMgr.cpp @@ -630,7 +630,7 @@ void LoadDatabase() QueryResult *result; //Get Version information - result = TScriptDB.PQuery("SELECT version FROM script_db_version"); + result = TScriptDB.PQuery("SELECT script_version FROM version LIMIT 1"); if (result) { @@ -641,7 +641,7 @@ void LoadDatabase() }else { - error_log("TSCR: Missing `script_db_version` information."); + error_log("TSCR: Missing `version.script_version` information."); outstring_log(""); } diff --git a/src/bindings/scripts/scripts/item/item_scripts.cpp b/src/bindings/scripts/scripts/item/item_scripts.cpp index 22e437079f3..9d1c35f1781 100644 --- a/src/bindings/scripts/scripts/item/item_scripts.cpp +++ b/src/bindings/scripts/scripts/item/item_scripts.cpp @@ -105,8 +105,11 @@ bool ItemUse_item_attuned_crystal_cores(Player *player, Item* _Item, SpellCastTa { if( targets.getUnitTarget() && targets.getUnitTarget()->GetTypeId()==TYPEID_UNIT && targets.getUnitTarget()->GetEntry() == 24972 && targets.getUnitTarget()->isDead() ) - return false; - + { + ((Creature*)targets.getUnitTarget())->RemoveCorpse(); + return false; + } + player->SendEquipError(EQUIP_ERR_CANT_DO_RIGHT_NOW,_Item,NULL); return true; } diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp new file mode 100644 index 00000000000..d687b6aae01 --- /dev/null +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp @@ -0,0 +1,643 @@ +/* Copyright (C) 2006 - 2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> + * 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 + */ + +/* ScriptData +SDName: Boss_Tomb_Of_Seven +SD%Complete: 50 +SDComment: Learning Smelt Dark Iron if tribute quest rewarded. Missing event and re-spawn GO Spectral Chalice +SDCategory: Blackrock Depths +EndScriptData */ + +#include "precompiled.h" +#include "def_blackrock_depths.h" + +#define FACTION_NEUTRAL 734 +#define FACTION_HOSTILE 754 + +#define SPELL_SUNDERARMOR 24317 +#define SPELL_SHIELDBLOCK 12169 +#define SPELL_STRIKE 15580 + +struct TRINITY_DLL_DECL boss_angerrelAI : public ScriptedAI +{ + boss_angerrelAI(Creature *c) : ScriptedAI(c) {Reset();} + + uint32 SunderArmor_Timer; + uint32 ShieldBlock_Timer; + uint32 Strike_Timer; + + void Reset() + { + SunderArmor_Timer = 8000; + ShieldBlock_Timer = 15000; + Strike_Timer = 12000; + } + + void Aggro(Unit *who) + { + } + + void UpdateAI(const uint32 diff) + { + if (!m_creature->SelectHostilTarget() || !m_creature->getVictim()) + return; + + //SunderArmor_Timer + if (SunderArmor_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_SUNDERARMOR); + SunderArmor_Timer = 28000; + }else SunderArmor_Timer -= diff; + + //ShieldBlock_Timer + if (ShieldBlock_Timer < diff) + { + DoCast(m_creature,SPELL_SHIELDBLOCK); + ShieldBlock_Timer = 25000; + }else ShieldBlock_Timer -= diff; + + //Strike_Timer + if (Strike_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_STRIKE); + Strike_Timer = 10000; + }else Strike_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_angerrel(Creature *_Creature) +{ + return new boss_angerrelAI (_Creature); +} + +#define SPELL_SINISTERSTRIKE 15581 +#define SPELL_BACKSTAB 15582 +#define SPELL_GOUGE 13579 + +struct TRINITY_DLL_DECL boss_doperelAI : public ScriptedAI +{ + boss_doperelAI(Creature *c) : ScriptedAI(c) {Reset();} + + uint32 SinisterStrike_Timer; + uint32 BackStab_Timer; + uint32 Gouge_Timer; + + void Reset() + { + SinisterStrike_Timer = 8000; + BackStab_Timer = 12000; + Gouge_Timer = 6000; + } + + void Aggro(Unit *who) + { + } + + void UpdateAI(const uint32 diff) + { + if (!m_creature->SelectHostilTarget() || !m_creature->getVictim()) + return; + + //SinisterStrike_Timer + if (SinisterStrike_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_SINISTERSTRIKE); + SinisterStrike_Timer = 7000; + }else SinisterStrike_Timer -= diff; + + //BackStab_Timer + if (BackStab_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_BACKSTAB); + BackStab_Timer = 6000; + }else BackStab_Timer -= diff; + + //Gouge_Timer + if (Gouge_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_GOUGE); + Gouge_Timer = 8000; + }else Gouge_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_doperel(Creature *_Creature) +{ + return new boss_doperelAI (_Creature); +} + +#define SPELL_SHADOWBOLT 17483 //Not sure if right ID +#define SPELL_MANABURN 10876 +#define SPELL_SHADOWSHIELD 22417 + +struct TRINITY_DLL_DECL boss_haterelAI : public ScriptedAI +{ + boss_haterelAI(Creature *c) : ScriptedAI(c) {Reset();} + + uint32 ShadowBolt_Timer; + uint32 ManaBurn_Timer; + uint32 ShadowShield_Timer; + uint32 Strike_Timer; + + void Reset() + { + ShadowBolt_Timer = 15000; + ManaBurn_Timer = 3000; + ShadowShield_Timer = 8000; + Strike_Timer = 12000; + } + + void Aggro(Unit *who) + { + } + + void UpdateAI(const uint32 diff) + { + if (!m_creature->SelectHostilTarget() || !m_creature->getVictim()) + return; + + //ShadowBolt_Timer + if (ShadowBolt_Timer < diff) + { + Unit* target = NULL; + target = SelectUnit(SELECT_TARGET_RANDOM,0); + if (target) DoCast(target,SPELL_SHADOWBOLT); + ShadowBolt_Timer = 7000; + }else ShadowBolt_Timer -= diff; + + //ManaBurn_Timer + if (ManaBurn_Timer < diff) + { + if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(target,SPELL_MANABURN); + + ManaBurn_Timer = 13000; + }else ManaBurn_Timer -= diff; + + //ShadowShield_Timer + if (ShadowShield_Timer < diff) + { + DoCast(m_creature,SPELL_SHADOWSHIELD); + ShadowShield_Timer = 25000; + }else ShadowShield_Timer -= diff; + + //Strike_Timer + if (Strike_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_STRIKE); + Strike_Timer = 10000; + }else Strike_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_haterel(Creature *_Creature) +{ + return new boss_haterelAI (_Creature); +} + +#define SPELL_MINDBLAST 15587 +#define SPELL_HEAL 15586 +#define SPELL_PRAYEROFHEALING 15585 +#define SPELL_SHIELD 10901 + +struct TRINITY_DLL_DECL boss_vilerelAI : public ScriptedAI +{ + boss_vilerelAI(Creature *c) : ScriptedAI(c) {Reset();} + + uint32 MindBlast_Timer; + uint32 Heal_Timer; + uint32 PrayerOfHealing_Timer; + uint32 Shield_Timer; + + void Reset() + { + MindBlast_Timer = 10000; + Heal_Timer = 35000; + PrayerOfHealing_Timer = 25000; + Shield_Timer = 3000; + } + + void Aggro(Unit *who) + { + } + + void UpdateAI(const uint32 diff) + { + if (!m_creature->SelectHostilTarget() || !m_creature->getVictim()) + return; + + //MindBlast_Timer + if (MindBlast_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_MINDBLAST); + MindBlast_Timer = 7000; + }else MindBlast_Timer -= diff; + + //Heal_Timer + if (Heal_Timer < diff) + { + DoCast(m_creature,SPELL_HEAL); + Heal_Timer = 20000; + }else Heal_Timer -= diff; + + //PrayerOfHealing_Timer + if (PrayerOfHealing_Timer < diff) + { + DoCast(m_creature,SPELL_PRAYEROFHEALING); + PrayerOfHealing_Timer = 30000; + }else PrayerOfHealing_Timer -= diff; + + //Shield_Timer + if (Shield_Timer < diff) + { + DoCast(m_creature,SPELL_SHIELD); + Shield_Timer = 30000; + }else Shield_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_vilerel(Creature *_Creature) +{ + return new boss_vilerelAI (_Creature); +} + +#define SPELL_FROSTBOLT 16799 +#define SPELL_FROSTARMOR 15784 //This is actually a buff he gives himself +#define SPELL_BLIZZARD 19099 +#define SPELL_FROSTNOVA 15063 +#define SPELL_FROSTWARD 15004 + +struct TRINITY_DLL_DECL boss_seethrelAI : public ScriptedAI +{ + boss_seethrelAI(Creature *c) : ScriptedAI(c) {Reset();} + + uint32 FrostArmor_Timer; + uint32 Frostbolt_Timer; + uint32 Blizzard_Timer; + uint32 FrostNova_Timer; + uint32 FrostWard_Timer; + + void Reset() + { + FrostArmor_Timer = 2000; + Frostbolt_Timer = 6000; + Blizzard_Timer = 18000; + FrostNova_Timer = 12000; + FrostWard_Timer = 25000; + + m_creature->CastSpell(m_creature,SPELL_FROSTARMOR,true); + } + + void Aggro(Unit *who) + { + } + + void UpdateAI(const uint32 diff) + { + if (!m_creature->SelectHostilTarget() || !m_creature->getVictim()) + return; + + //FrostArmor_Timer + if (FrostArmor_Timer < diff) + { + DoCast(m_creature, SPELL_FROSTARMOR); + FrostArmor_Timer = 180000; + }else FrostArmor_Timer -= diff; + + //Frostbolt_Timer + if (Frostbolt_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_FROSTBOLT); + Frostbolt_Timer = 15000; + }else Frostbolt_Timer -= diff; + + //Blizzard_Timer + if (Blizzard_Timer < diff) + { + if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(target,SPELL_BLIZZARD); + + Blizzard_Timer = 22000; + }else Blizzard_Timer -= diff; + + //FrostNova_Timer + if (FrostNova_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_FROSTNOVA); + FrostNova_Timer = 14000; + }else FrostNova_Timer -= diff; + + //FrostWard_Timer + if (FrostWard_Timer < diff) + { + DoCast(m_creature,SPELL_FROSTWARD); + FrostWard_Timer = 68000; + }else FrostWard_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_seethrel(Creature *_Creature) +{ + return new boss_seethrelAI (_Creature); +} + +#define SPELL_HAMSTRING 9080 +#define SPELL_CLEAVE 15579 +#define SPELL_MORTALSTRIKE 15708 + +struct TRINITY_DLL_DECL boss_gloomrelAI : public ScriptedAI +{ + boss_gloomrelAI(Creature *c) : ScriptedAI(c) {Reset();} + + uint32 Hamstring_Timer; + uint32 Cleave_Timer; + uint32 MortalStrike_Timer; + + void Reset() + { + Hamstring_Timer = 19000; + Cleave_Timer = 6000; + MortalStrike_Timer = 10000; + + m_creature->setFaction(FACTION_NEUTRAL); + } + + void Aggro(Unit *who) + { + } + + void UpdateAI(const uint32 diff) + { + if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() ) + return; + + //Hamstring_Timer + if (Hamstring_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_HAMSTRING); + Hamstring_Timer = 14000; + }else Hamstring_Timer -= diff; + + //Cleave_Timer + if (Cleave_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_CLEAVE); + Cleave_Timer = 8000; + }else Cleave_Timer -= diff; + + //MortalStrike_Timer + if (MortalStrike_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_MORTALSTRIKE); + MortalStrike_Timer = 12000; + }else MortalStrike_Timer -= diff; + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_gloomrel(Creature *_Creature) +{ + return new boss_gloomrelAI (_Creature); +} + +#define GOSSIP_ITEM_TEACH_1 "Teach me the art of smelting dark iron" +#define GOSSIP_ITEM_TEACH_2 "Continue..." +#define GOSSIP_ITEM_TRIBUTE "I want to pay tribute" + +bool GossipHello_boss_gloomrel(Player *player, Creature *_Creature) +{ + if (player->GetQuestRewardStatus(4083) == 1 && player->GetSkillValue(SKILL_MINING) >= 230 && !player->HasSpell(14891) ) + player->ADD_GOSSIP_ITEM(0, GOSSIP_ITEM_TEACH_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + + if (player->GetQuestRewardStatus(4083) == 0 && player->GetSkillValue(SKILL_MINING) >= 230) + player->ADD_GOSSIP_ITEM(0, GOSSIP_ITEM_TRIBUTE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + + return true; +} + +bool GossipSelect_boss_gloomrel(Player *player, Creature *_Creature, uint32 sender, uint32 action ) +{ + switch (action) + { + case GOSSIP_ACTION_INFO_DEF+1: + player->ADD_GOSSIP_ITEM(0, GOSSIP_ITEM_TEACH_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11); + player->SEND_GOSSIP_MENU(2606, _Creature->GetGUID()); + break; + case GOSSIP_ACTION_INFO_DEF+11: + player->CLOSE_GOSSIP_MENU(); + _Creature->CastSpell(player, 14894, false); + break; + case GOSSIP_ACTION_INFO_DEF+2: + player->ADD_GOSSIP_ITEM(0, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 22); + player->SEND_GOSSIP_MENU(2604, _Creature->GetGUID()); + break; + case GOSSIP_ACTION_INFO_DEF+22: + player->CLOSE_GOSSIP_MENU(); + //re-spawn object here + break; + } + return true; +} + +#define SPELL_SHADOWBOLTVOLLEY 17228 +#define SPELL_IMMOLATE 15505 +#define SPELL_CURSEOFWEAKNESS 17227 +#define SPELL_DEMONARMOR 11735 + +struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI +{ + boss_doomrelAI(Creature *c) : ScriptedAI(c) {Reset();} + + uint32 ShadowVolley_Timer; + uint32 Immolate_Timer; + uint32 CurseOfWeakness_Timer; + uint32 DemonArmor_Timer; + bool Voidwalkers; + int Rand; + int RandX; + int RandY; + Creature* Summoned; + + void Reset() + { + ShadowVolley_Timer = 10000; + Immolate_Timer = 18000; + CurseOfWeakness_Timer = 5000; + DemonArmor_Timer = 16000; + Voidwalkers = false; + + m_creature->setFaction(FACTION_NEUTRAL); + } + + void Aggro(Unit *who) + { + } + + void SummonVoidwalkers(Unit* victim) + { + Rand = rand()%5; + switch (rand()%2) + { + case 0: RandX = 0 - Rand; break; + case 1: RandX = 0 + Rand; break; + } + Rand = 0; + Rand = rand()%5; + switch (rand()%2) + { + case 0: RandY = 0 - Rand; break; + case 1: RandY = 0 + Rand; break; + } + Rand = 0; + Summoned = DoSpawnCreature(16119, RandX, RandY, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000); + if(Summoned) + ((CreatureAI*)Summoned->AI())->AttackStart(victim); + } + + void UpdateAI(const uint32 diff) + { + if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() ) + return; + + //ShadowVolley_Timer + if (ShadowVolley_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_SHADOWBOLTVOLLEY); + ShadowVolley_Timer = 12000; + }else ShadowVolley_Timer -= diff; + + //Immolate_Timer + if (Immolate_Timer < diff) + { + if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0)) + DoCast(target,SPELL_IMMOLATE); + + Immolate_Timer = 25000; + }else Immolate_Timer -= diff; + + //CurseOfWeakness_Timer + if (CurseOfWeakness_Timer < diff) + { + DoCast(m_creature->getVictim(),SPELL_CURSEOFWEAKNESS); + CurseOfWeakness_Timer = 45000; + }else CurseOfWeakness_Timer -= diff; + + //DemonArmor_Timer + if (DemonArmor_Timer < diff) + { + DoCast(m_creature,SPELL_DEMONARMOR); + DemonArmor_Timer = 300000; + }else DemonArmor_Timer -= diff; + + //Summon Voidwalkers + if (!Voidwalkers && m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 51 ) + { + SummonVoidwalkers(m_creature->getVictim()); + SummonVoidwalkers(m_creature->getVictim()); + SummonVoidwalkers(m_creature->getVictim()); + Voidwalkers = true; + } + + DoMeleeAttackIfReady(); + } +}; + +CreatureAI* GetAI_boss_doomrel(Creature *_Creature) +{ + return new boss_doomrelAI (_Creature); +} + +#define GOSSIP_ITEM_CHALLENGE "Your bondage is at an end, Doom'rel. I challenge you!" + +bool GossipHello_boss_doomrel(Player *player, Creature *_Creature) +{ + player->ADD_GOSSIP_ITEM(0, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->SEND_GOSSIP_MENU(2601, _Creature->GetGUID()); + + return true; +} + +bool GossipSelect_boss_doomrel(Player *player, Creature *_Creature, uint32 sender, uint32 action ) +{ + switch (action) + { + case GOSSIP_ACTION_INFO_DEF+1: + player->ADD_GOSSIP_ITEM( 0, "[PH] Continue...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + player->SEND_GOSSIP_MENU(2605, _Creature->GetGUID()); + break; + case GOSSIP_ACTION_INFO_DEF+2: + player->CLOSE_GOSSIP_MENU(); + //start event here, below code just temporary + _Creature->setFaction(FACTION_HOSTILE); + break; + } + return true; +} + +void AddSC_boss_tomb_of_seven() +{ + Script *newscript; + + newscript = new Script; + newscript->Name = "boss_angerrel"; + newscript->GetAI = &GetAI_boss_angerrel; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_doperel"; + newscript->GetAI = &GetAI_boss_doperel; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_haterel"; + newscript->GetAI = &GetAI_boss_haterel; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_vilerel"; + newscript->GetAI = &GetAI_boss_vilerel; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_seethrel"; + newscript->GetAI = &GetAI_boss_seethrel; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_gloomrel"; + newscript->GetAI = &GetAI_boss_gloomrel; + newscript->pGossipHello = &GossipHello_boss_gloomrel; + newscript->pGossipSelect = &GossipSelect_boss_gloomrel; + newscript->RegisterSelf(); + + newscript = new Script; + newscript->Name = "boss_doomrel"; + newscript->GetAI = &GetAI_boss_doomrel; + newscript->pGossipHello = &GossipHello_boss_doomrel; + newscript->pGossipSelect = &GossipSelect_boss_doomrel; + newscript->RegisterSelf(); +} diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp index dda2ceda354..933b4c0361f 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp @@ -59,13 +59,13 @@ EndScriptData */ #define SPELL_POISON_CLEANSING_EFFECT 8167 #define SPELL_EARTHBIND_TOTEM 38304 #define SPELL_EARTHBIND_TOTEM_EFFECT 6474 -#define SPELL_WINDFURY_WEAPON 32911 +#define SPELL_WINDFURY_WEAPON 38184 //Caribdis Spells #define SPELL_WATER_BOLT_VOLLEY 38335 #define SPELL_TIDAL_SURGE 38358 #define SPELL_TIDAL_SURGE_FREEZE 38357 -#define SPELL_HEAL 41386 +#define SPELL_HEAL 38330 #define SPELL_SUMMON_CYCLONE 38337 #define SPELL_CYCLONE_CYCLONE 29538 diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp index e3a6f226dcd..af702cf22dc 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp @@ -65,7 +65,7 @@ EndScriptData */ #define SPELL_SUMMON_WATER_GLOBULE_3 37860 #define SPELL_SUMMON_WATER_GLOBULE_4 37861 -#define SPELL_SUMMON_MURLOC_A6 39813 +/*#define SPELL_SUMMON_MURLOC_A6 39813 #define SPELL_SUMMON_MURLOC_A7 39814 #define SPELL_SUMMON_MURLOC_A8 39815 #define SPELL_SUMMON_MURLOC_A9 39816 @@ -75,7 +75,21 @@ EndScriptData */ #define SPELL_SUMMON_MURLOC_B7 39819 #define SPELL_SUMMON_MURLOC_B8 39820 #define SPELL_SUMMON_MURLOC_B9 39821 -#define SPELL_SUMMON_MURLOC_B10 39822 +#define SPELL_SUMMON_MURLOC_B10 39822*/ + +float MurlocCords[10][5] = +{ + {21920, 424.36, -715.4, -7.14, 0.124}, + {21920, 425.13, -719.3, -7.14, 0.124}, + {21920, 425.05, -724.23, -7.14, 0.124}, + {21920, 424.91, -728.68, -7.14, 0.124}, + {21920, 424.84, -732.18, -7.14, 0.124}, + {21920, 321.05, -734.2, -13.15, 0.124}, + {21920, 321.05, -729.4, -13.15, 0.124}, + {21920, 321.05, -724.03, -13.15, 0.124}, + {21920, 321.05, -718.73, -13.15, 0.124}, + {21920, 321.05, -714.24, -13.15, 0.124} +}; //Creatures #define WATER_GLOBULE 21913 @@ -97,7 +111,6 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI uint32 WateryGrave_Timer; uint32 Earthquake_Timer; uint32 WateryGlobules_Timer; - uint32 SummonSpell; uint32 globulespell[4]; int8 Playercount; int8 counter; @@ -190,41 +203,16 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI case 1: DoScriptText(SAY_SUMMON2, m_creature); break; } - Unit* target; - using std::set; - set<int> SummonList; - set<int>::iterator itr; - - target = SelectUnit(SELECT_TARGET_RANDOM, 0, 50, true); - m_creature->CastSpell(target, SummonSpell, false); - SummonSpell++; - - for (int8 i = 0; i < 9; i++) //bad hack - { //instead of casting 9 spell in one update - counter = 0; // selecet 9 players which cast our spells - do{target = SelectUnit(SELECT_TARGET_RANDOM, 0, 50, true); //check if player is already selected - if(counter > Playercount) - break; - if(target) itr = SummonList.find(target->GetGUID()); - counter++; - } while (itr != SummonList.end()); - - if(target){ - SummonList.insert(target->GetGUID()); - target->CastSpell(target, SummonSpell, false); //player cast on himself (this works) - } - SummonSpell++; - - if(SummonSpell > SPELL_SUMMON_MURLOC_B10) //reset all variables for earthquake - { - SummonSpell = SPELL_SUMMON_MURLOC_A6; - SummonList.clear(); - DoScriptText(EMOTE_EARTHQUAKE, m_creature); - Earthquake = false; - Earthquake_Timer = 40000+rand()%5000; - } + for(uint8 i = 0; i < 10; i++) + { + Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0); + Creature* Murloc = m_creature->SummonCreature(MurlocCords[i][0],MurlocCords[i][1],MurlocCords[i][2],MurlocCords[i][3],MurlocCords[i][4], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); + Murloc->AI()->AttackStart(target); } - } + DoScriptText(EMOTE_EARTHQUAKE, m_creature); + Earthquake = false; + Earthquake_Timer = 40000+rand()%5000; + } }else Earthquake_Timer -= diff; //TidalWave_Timer @@ -303,7 +291,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI }; //Water Globule AI -#define SPELL_GLOBULE_EXPLOSION 37852 +#define SPELL_GLOBULE_EXPLOSION 37871 struct TRINITY_DLL_DECL mob_water_globuleAI : public ScriptedAI { diff --git a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp index 34fb3d3b507..9237f9f4b3a 100644 --- a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp +++ b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp @@ -789,10 +789,10 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI { mob_phase_hunterAI(Creature *c) : ScriptedAI(c) {Reset();} - + bool Weak; - bool Materialize; - bool Drained; + bool Materialize; + bool Drained; int WeakPercent; uint64 PlayerGUID; @@ -804,8 +804,8 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI void Reset() { Weak = false; - Materialize = false; - Drained = false; + Materialize = false; + Drained = false; WeakPercent = 25 + (rand()%16); // 25-40 PlayerGUID = 0; @@ -814,42 +814,44 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI void Aggro(Unit *who) { - PlayerGUID = who->GetGUID(); + if(Player *player = who->GetCharmerOrOwnerPlayerOrPlayerItself()) + PlayerGUID = player->GetGUID(); } - void SpellHit(Unit *caster, const SpellEntry *spell) - { - DoCast(m_creature, SPELL_DE_MATERIALIZE); - } + void SpellHit(Unit *caster, const SpellEntry *spell) + { + DoCast(m_creature, SPELL_DE_MATERIALIZE); + } void UpdateAI(const uint32 diff) { - if(!Materialize) - { - DoCast(m_creature, SPELL_MATERIALIZE); - Materialize = true; - } + if(!Materialize) + { + DoCast(m_creature, SPELL_MATERIALIZE); + Materialize = true; + } + + if(m_creature->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED) || m_creature->hasUnitState(UNIT_STAT_ROOT)) // if the mob is rooted/slowed by spells eg.: Entangling Roots, Frost Nova, Hamstring, Crippling Poison, etc. => remove it + DoCast(m_creature, SPELL_PHASE_SLIP); - if(m_creature->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED) || m_creature->hasUnitState(UNIT_STAT_ROOT)) // if the mob is rooted/slowed by spells eg.: Entangling Roots, Frost Nova, Hamstring, Crippling Poison, etc. => remove it - DoCast(m_creature, SPELL_PHASE_SLIP); - if (!m_creature->SelectHostilTarget() || !m_creature->getVictim()) return; - - if(ManaBurnTimer < diff) // cast Mana Burn - { + + if(ManaBurnTimer < diff) // cast Mana Burn + { if(m_creature->getVictim()->GetCreateMana() > 0) - { + { DoCast(m_creature->getVictim(), SPELL_MANA_BURN); - ManaBurnTimer = 8000 + (rand()%10 * 1000); // 8-18 sec cd - } - }else ManaBurnTimer -= diff; - + ManaBurnTimer = 8000 + (rand()%10 * 1000); // 8-18 sec cd + } + }else ManaBurnTimer -= diff; + if(PlayerGUID) // start: support for quest 10190 - { + { Unit* target = Unit::GetUnit((*m_creature), PlayerGUID); - - if(target && !Weak && m_creature->GetHealth() < (m_creature->GetMaxHealth() / 100 * WeakPercent) && ((Player*)target)->GetQuestStatus(10190) == QUEST_STATUS_INCOMPLETE) + + if(target && !Weak && m_creature->GetHealth() < (m_creature->GetMaxHealth() / 100 * WeakPercent) + && ((Player*)target)->GetQuestStatus(10190) == QUEST_STATUS_INCOMPLETE) { DoTextEmote(EMOTE_WEAK, 0); Weak = true; @@ -857,30 +859,30 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI if(Weak && !Drained && m_creature->HasAura(34219, 0)) { Drained = true; - + Health = m_creature->GetHealth(); // get the normal mob's data Level = m_creature->getLevel(); - - m_creature->AttackStop(); // delete the normal mob - m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); - m_creature->RemoveCorpse(); - - Creature* DrainedPhaseHunter = NULL; - - if(!DrainedPhaseHunter) - DrainedPhaseHunter = m_creature->SummonCreature(SUMMONED_MOB, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), m_creature->GetOrientation(), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); // summon the mob - - if(DrainedPhaseHunter) - { - DrainedPhaseHunter->SetLevel(Level); // set the summoned mob's data - DrainedPhaseHunter->SetHealth(Health); - DrainedPhaseHunter->AddThreat(target, 10000.0f); - DrainedPhaseHunter->AI()->AttackStart(target); - } - } - }// end: support for quest 10190 - DoMeleeAttackIfReady(); + m_creature->AttackStop(); // delete the normal mob + m_creature->DealDamage(m_creature, m_creature->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); + m_creature->RemoveCorpse(); + + Creature* DrainedPhaseHunter = NULL; + + if(!DrainedPhaseHunter) + DrainedPhaseHunter = m_creature->SummonCreature(SUMMONED_MOB, m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(), m_creature->GetOrientation(), TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); // summon the mob + + if(DrainedPhaseHunter) + { + DrainedPhaseHunter->SetLevel(Level); // set the summoned mob's data + DrainedPhaseHunter->SetHealth(Health); + DrainedPhaseHunter->AddThreat(target, 10000.0f); + DrainedPhaseHunter->AI()->AttackStart(target); + } + } + }// end: support for quest 10190 + + DoMeleeAttackIfReady(); } }; diff --git a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp index 935aeea6c4c..d2685d31b9f 100644 --- a/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp +++ b/src/bindings/scripts/scripts/zone/tirisfal_glades/tirisfal_glades.cpp @@ -44,6 +44,7 @@ struct TRINITY_DLL_DECL npc_calvin_montagueAI : public ScriptedAI void Reset() { m_creature->setFaction(FACTION_FRIENDLY); + m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2); } void Aggro(Unit* who) { } @@ -73,6 +74,7 @@ bool QuestAccept_npc_calvin_montague(Player* player, Creature* creature, Quest c if( quest->GetQuestId() == QUEST_590 ) { creature->setFaction(FACTION_HOSTILE); + creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2); ((npc_calvin_montagueAI*)creature->AI())->AttackStart(player); } return true; diff --git a/src/game/Unit.h b/src/game/Unit.h index 6ee3a6dc85c..4798c179ebd 100644 --- a/src/game/Unit.h +++ b/src/game/Unit.h @@ -371,7 +371,7 @@ enum UnitState UNIT_STAT_STUNNED = 0x00000008, UNIT_STAT_ROAMING = 0x00000010, UNIT_STAT_CHASE = 0x00000020, - UNIT_STAT_SEARCHING = 0x00000040, + //UNIT_STAT_SEARCHING = 0x00000040, UNIT_STAT_FLEEING = 0x00000080, UNIT_STAT_IN_FLIGHT = 0x00000100, // player is in flight mode UNIT_STAT_FOLLOW = 0x00000200, @@ -383,9 +383,9 @@ enum UnitState UNIT_STAT_CASTING = 0x00008000, UNIT_STAT_POSSESSED = 0x00010000, UNIT_STAT_CHARGING = 0x00020000, - UNIT_STAT_MOVING = (UNIT_STAT_ROAMING | UNIT_STAT_CHASE | UNIT_STAT_SEARCHING | UNIT_STAT_FOLLOW), + UNIT_STAT_MOVING = (UNIT_STAT_ROAMING | UNIT_STAT_CHASE), UNIT_STAT_LOST_CONTROL = (UNIT_STAT_CONFUSED | UNIT_STAT_STUNNED | UNIT_STAT_FLEEING | UNIT_STAT_CHARGING), - UNIT_STAT_SIGHTLESS = (UNIT_STAT_LOST_CONTROL | UNIT_STAT_CHASE | UNIT_STAT_SEARCHING), + UNIT_STAT_SIGHTLESS = (UNIT_STAT_LOST_CONTROL | UNIT_STAT_CHASE), UNIT_STAT_CANNOT_AUTOATTACK = (UNIT_STAT_LOST_CONTROL | UNIT_STAT_CASTING), UNIT_STAT_ALL_STATE = 0xffffffff //(UNIT_STAT_STOPPED | UNIT_STAT_MOVING | UNIT_STAT_IN_COMBAT | UNIT_STAT_IN_FLIGHT) }; @@ -1480,8 +1480,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject AuraMap m_Auras; - std::list<Aura *> m_scAuras; // casted singlecast auras - typedef std::list<uint64> DynObjectGUIDs; DynObjectGUIDs m_dynObjGUIDs; @@ -1491,9 +1489,11 @@ class TRINITY_DLL_SPEC Unit : public WorldObject uint32 m_removedAuras; AuraList m_modAuras[TOTAL_AURAS]; - uint32 m_interruptMask; + AuraList m_scAuras; // casted singlecast auras AuraList m_interruptableAuras; AuraList m_ccAuras; + uint32 m_interruptMask; + float m_auraModifiersGroup[UNIT_MOD_END][MODIFIER_TYPE_END]; float m_weaponDamage[MAX_ATTACK][2]; bool m_canModifyStats; diff --git a/src/game/World.cpp b/src/game/World.cpp index 1e1ca227d1b..b07be31b66a 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -3059,7 +3059,7 @@ void World::UpdateMaxSessionCounters() void World::LoadDBVersion() { - QueryResult* result = WorldDatabase.Query("SELECT version FROM db_version LIMIT 1"); + QueryResult* result = WorldDatabase.Query("SELECT db_version FROM version LIMIT 1"); if(result) { Field* fields = result->Fetch(); diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp index ed526f497c3..938f1753c0b 100644 --- a/src/trinitycore/Master.cpp +++ b/src/trinitycore/Master.cpp @@ -458,6 +458,9 @@ bool Master::_StartDB() ///- Clean the database before starting clearOnlineAccounts(); + ///- Insert version info into DB + WorldDatabase.PExecute("UPDATE `version` SET `core_version` = '%s', `core_rev` = '%s'", _FULLVERSION, _REVISION); + sWorld.LoadDBVersion(); sLog.outString("Using %s", sWorld.GetDBVersion()); diff --git a/win/TrinityCore&Script VC71.sln b/win/TrinityCore&Script VC71.sln index b13757a7688..8c4432075b4 100644 --- a/win/TrinityCore&Script VC71.sln +++ b/win/TrinityCore&Script VC71.sln @@ -53,7 +53,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityScript", "..\src\bin {D1EA3EE9-4DCF-4CB9-BA6E-B9321E0D552A} = {D1EA3EE9-4DCF-4CB9-BA6E-B9321E0D552A} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACEWrappers", "VC71\ACE_vc71.vcproj", "{7C74F49E-FECA-1BAD-6757-8A6348EA12C8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "VC71\ACE_vc71.vcproj", "{7C74F49E-FECA-1BAD-6757-8A6348EA12C8}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject diff --git a/win/TrinityCore&Script VC80.sln b/win/TrinityCore&Script VC80.sln index b1a328153f7..7727cc9db42 100644 --- a/win/TrinityCore&Script VC80.sln +++ b/win/TrinityCore&Script VC80.sln @@ -44,7 +44,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityScript", "..\src\bin {A3A04E47-43A2-4C08-90B3-029CEF558594} = {A3A04E47-43A2-4C08-90B3-029CEF558594} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACEWrappers", "VC80\ACE_vc8.vcproj", "{AD537C9A-FECA-1BAD-6757-8A6348EA12C8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "VC80\ACE_vc8.vcproj", "{AD537C9A-FECA-1BAD-6757-8A6348EA12C8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC80\genrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" EndProject diff --git a/win/TrinityCore&Script VC90.sln b/win/TrinityCore&Script VC90.sln index a1af8156446..0353ef3c8f6 100644 --- a/win/TrinityCore&Script VC90.sln +++ b/win/TrinityCore&Script VC90.sln @@ -44,7 +44,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrinityScript", "..\src\bin {A3A04E47-43A2-4C08-90B3-029CEF558594} = {A3A04E47-43A2-4C08-90B3-029CEF558594} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACEWrappers", "VC90\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE_Wrappers", "VC90\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrevision", "VC90\genrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" EndProject diff --git a/win/VC71/ScriptsInterfaces.vcproj b/win/VC71/ScriptsInterfaces.vcproj index f2fbb5a446a..5d229de138a 100644 --- a/win/VC71/ScriptsInterfaces.vcproj +++ b/win/VC71/ScriptsInterfaces.vcproj @@ -21,7 +21,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC71/TrinityCore.vcproj b/win/VC71/TrinityCore.vcproj new file mode 100644 index 00000000000..1da3ad630dd --- /dev/null +++ b/win/VC71/TrinityCore.vcproj @@ -0,0 +1,231 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="TrinityCore" + ProjectGUID="{D1EA3EE9-4DCF-4CB9-BA6E-B9321E0D552A}" + RootNamespace="mangosd" + SccProjectName="" + SccLocalPath=""> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI" + StringPooling="TRUE" + RuntimeLibrary="2" + EnableFunctionLevelLinking="TRUE" + EnableEnhancedInstructionSet="1" + RuntimeTypeInfo="TRUE" + PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch" + AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/MACHINE:I386" + AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb" + GenerateMapFile="TRUE" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map" + SubSystem="1" + LargeAddressAware="2" + ImportLibrary="$(OutDir)\trinitycore.lib"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName) +copy ..\..\src\trinitycore\trinitycore.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.conf.dist +"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI" + IgnoreStandardIncludePath="FALSE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + RuntimeTypeInfo="TRUE" + PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch" + AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/MACHINE:I386" + AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" + Version="" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb" + GenerateMapFile="TRUE" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map" + SubSystem="1" + LargeAddressAware="2" + LinkTimeCodeGeneration="FALSE" + ImportLibrary="$(OutDir)\trinitycore.lib" + FixedBaseAddress="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName) +copy ..\..\src\trinitycore\trinitycore.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.conf.dist +"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="doc"> + <File + RelativePath="..\..\Authors"> + </File> + <File + RelativePath="..\..\ChangeLog"> + </File> + <File + RelativePath="..\..\Copying"> + </File> + <File + RelativePath="..\..\Install"> + </File> + <File + RelativePath="..\..\News"> + </File> + <File + RelativePath="..\..\Readme"> + </File> + <File + RelativePath="..\..\Thanks"> + </File> + </Filter> + <File + RelativePath="..\..\src\trinitycore\CliRunnable.cpp"> + </File> + <File + RelativePath="..\..\src\trinitycore\CliRunnable.h"> + </File> + <File + RelativePath="..\..\src\trinitycore\Main.cpp"> + </File> + <File + RelativePath="..\..\src\trinitycore\Master.cpp"> + </File> + <File + RelativePath="..\..\src\trinitycore\Master.h"> + </File> + <File + RelativePath="..\..\src\trinitycore\RASocket.cpp"> + </File> + <File + RelativePath="..\..\src\trinitycore\RASocket.h"> + </File> + <File + RelativePath="..\..\src\trinitycore\resource.h"> + </File> + <File + RelativePath="..\..\src\trinitycore\TrinityCore.rc"> + </File> + <File + RelativePath="..\..\src\shared\WheatyExceptionReport.cpp" + > + </File> + <File + RelativePath="..\..\src\shared\WheatyExceptionReport.h" + > + </File> + <File + RelativePath="..\..\src\trinitycore\WorldRunnable.cpp"> + </File> + <File + RelativePath="..\..\src\trinitycore\WorldRunnable.h"> + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/win/VC71/TrinityRealm.vcproj b/win/VC71/TrinityRealm.vcproj new file mode 100644 index 00000000000..472b893197d --- /dev/null +++ b/win/VC71/TrinityRealm.vcproj @@ -0,0 +1,190 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="7.10" + Name="TrinityRealm" + ProjectGUID="{563E9905-3657-460C-AE63-0AC39D162E23}" + RootNamespace="realmd" + SccProjectName="" + SccLocalPath=""> + <Platforms> + <Platform + Name="Win32"/> + </Platforms> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\realmd__$(PlatformName)_$(ConfigurationName)\" + ConfigurationType="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE" + StringPooling="TRUE" + RuntimeLibrary="2" + EnableFunctionLevelLinking="TRUE" + EnableEnhancedInstructionSet="1" + RuntimeTypeInfo="TRUE" + PrecompiledHeaderFile=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.pch" + AssemblerListingLocation=".\realmd__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\realmd__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\realmd__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/MACHINE:I386" + AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" + LinkIncremental="1" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" + GenerateMapFile="TRUE" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" + SubSystem="1" + LargeAddressAware="2"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\realmd__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="FALSE" + CharacterSet="2"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE" + IgnoreStandardIncludePath="FALSE" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + RuntimeTypeInfo="TRUE" + PrecompiledHeaderFile=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.pch" + AssemblerListingLocation=".\realmd__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\realmd__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\realmd__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="TRUE" + Detect64BitPortabilityProblems="TRUE" + DebugInformationFormat="3" + CompileAs="0"/> + <Tool + Name="VCCustomBuildTool"/> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/MACHINE:I386" + AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" + LinkIncremental="2" + SuppressStartupBanner="TRUE" + AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" + GenerateMapFile="TRUE" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" + SubSystem="1" + LargeAddressAware="2" + FixedBaseAddress="1"/> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb"/> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist"/> + <Tool + Name="VCPreBuildEventTool"/> + <Tool + Name="VCPreLinkEventTool"/> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033"/> + <Tool + Name="VCWebServiceProxyGeneratorTool"/> + <Tool + Name="VCXMLDataGeneratorTool"/> + <Tool + Name="VCWebDeploymentTool"/> + <Tool + Name="VCManagedWrapperGeneratorTool"/> + <Tool + Name="VCAuxiliaryManagedWrapperGeneratorTool"/> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="..\..\src\trinityrealm\AuthCodes.h"> + </File> + <File + RelativePath="..\..\src\trinityrealm\AuthSocket.cpp"> + </File> + <File + RelativePath="..\..\src\trinityrealm\AuthSocket.h"> + </File> + <File + RelativePath="..\..\src\trinityrealm\Main.cpp"> + </File> + <File + RelativePath="..\..\src\trinityrealm\RealmList.cpp"> + </File> + <File + RelativePath="..\..\src\trinityrealm\RealmList.h"> + </File> + <File + RelativePath="..\..\src\trinityrealm\resource.h"> + </File> + <File + RelativePath="..\..\src\trinityrealm\TrinityRealm.rc"> + </File> + <File + RelativePath="..\..\src\shared\WheatyExceptionReport.cpp" + > + </File> + <File + RelativePath="..\..\src\shared\WheatyExceptionReport.h" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/win/VC71/framework.vcproj b/win/VC71/framework.vcproj index 519c8f48168..642e7a861a0 100644 --- a/win/VC71/framework.vcproj +++ b/win/VC71/framework.vcproj @@ -23,7 +23,7 @@ AdditionalOptions="/Zl" Optimization="0" AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" MinimalRebuild="FALSE" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC71/game.vcproj b/win/VC71/game.vcproj index dd3bf00427d..32af826123b 100644 --- a/win/VC71/game.vcproj +++ b/win/VC71/game.vcproj @@ -23,7 +23,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;" StringPooling="FALSE" MinimalRebuild="FALSE" BasicRuntimeChecks="3" diff --git a/win/VC71/genrevision.vcproj b/win/VC71/genrevision.vcproj index cc5fbdeaba6..9bf4919fe42 100644 --- a/win/VC71/genrevision.vcproj +++ b/win/VC71/genrevision.vcproj @@ -18,8 +18,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" + OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" > diff --git a/win/VC71/shared.vcproj b/win/VC71/shared.vcproj index 384aa9f552a..1d9f80dcc3e 100644 --- a/win/VC71/shared.vcproj +++ b/win/VC71/shared.vcproj @@ -78,7 +78,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="TRUE" diff --git a/win/VC71/sockets.vcproj b/win/VC71/sockets.vcproj index 76c891d50e1..cdcd9489e5f 100644 --- a/win/VC71/sockets.vcproj +++ b/win/VC71/sockets.vcproj @@ -121,7 +121,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include\sockets" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="true" diff --git a/win/VC80/ACE_vc8.vcproj b/win/VC80/ACE_vc8.vcproj index ca445c5ce4e..9ac893792b0 100644 --- a/win/VC80/ACE_vc8.vcproj +++ b/win/VC80/ACE_vc8.vcproj @@ -2,7 +2,7 @@ <VisualStudioProject ProjectType="Visual C++" Version="8,00" - Name="ACEWrappers" + Name="ACE_Wrappers" ProjectGUID="{AD537C9A-FECA-1BAD-6757-8A6348EA12C8}" RootNamespace="ACE" Keyword="Win32Proj" diff --git a/win/VC80/ScriptsInterfaces.vcproj b/win/VC80/ScriptsInterfaces.vcproj index 58f36101158..1e0de8f3f3a 100644 --- a/win/VC80/ScriptsInterfaces.vcproj +++ b/win/VC80/ScriptsInterfaces.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -128,7 +128,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="1" diff --git a/win/VC80/TrinityCore.vcproj b/win/VC80/TrinityCore.vcproj index 6209bd3f9aa..6f2ba33d4fe 100644 --- a/win/VC80/TrinityCore.vcproj +++ b/win/VC80/TrinityCore.vcproj @@ -250,7 +250,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI" IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -352,7 +352,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE;ENABLE_CLI" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI" IgnoreStandardIncludePath="false" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC80/TrinityRealm.vcproj b/win/VC80/TrinityRealm.vcproj new file mode 100644 index 00000000000..011d25f3fad --- /dev/null +++ b/win/VC80/TrinityRealm.vcproj @@ -0,0 +1,463 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8,00" + Name="TrinityRealm" + ProjectGUID="{563E9905-3657-460C-AE63-0AC39D162E23}" + RootNamespace="realmd" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="1" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\realmd.pch" + AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/MACHINE:I386" + AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" + SubSystem="1" + LargeAddressAware="2" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\realmd.pch" + AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" + SubSystem="1" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE" + IgnoreStandardIncludePath="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\realmd.pch" + AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/MACHINE:I386" + AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" + LinkIncremental="2" + SuppressStartupBanner="true" + AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" + SubSystem="1" + LargeAddressAware="2" + FixedBaseAddress="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE" + IgnoreStandardIncludePath="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\realmd.pch" + AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" + LinkIncremental="2" + SuppressStartupBanner="true" + AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" + SubSystem="1" + TargetMachine="17" + FixedBaseAddress="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="..\..\src\trinityrealm\AuthCodes.h" + > + </File> + <File + RelativePath="..\..\src\trinityrealm\AuthSocket.cpp" + > + </File> + <File + RelativePath="..\..\src\trinityrealm\AuthSocket.h" + > + </File> + <File + RelativePath="..\..\src\trinityrealm\Main.cpp" + > + </File> + <File + RelativePath="..\..\src\trinityrealm\RealmList.cpp" + > + </File> + <File + RelativePath="..\..\src\trinityrealm\RealmList.h" + > + </File> + <File + RelativePath="..\..\src\trinityrealm\resource.h" + > + </File> + <File + RelativePath="..\..\src\trinityrealm\TrinityRealm.rc" + > + </File> + <File + RelativePath="..\..\src\shared\WheatyExceptionReport.cpp" + > + </File> + <File + RelativePath="..\..\src\shared\WheatyExceptionReport.h" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/win/VC80/framework.vcproj b/win/VC80/framework.vcproj index b9cda2773d9..402bb75c077 100644 --- a/win/VC80/framework.vcproj +++ b/win/VC80/framework.vcproj @@ -47,7 +47,7 @@ AdditionalOptions="/Zl /MP" Optimization="0" AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -122,7 +122,7 @@ AdditionalOptions="/Zl /MP" Optimization="0" AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj index b4a4efa6e6c..457987b9035 100644 --- a/win/VC80/game.vcproj +++ b/win/VC80/game.vcproj @@ -47,7 +47,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;" StringPooling="false" MinimalRebuild="false" BasicRuntimeChecks="3" @@ -128,7 +128,7 @@ AdditionalOptions="/MP /bigobj" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;" StringPooling="false" MinimalRebuild="false" BasicRuntimeChecks="3" diff --git a/win/VC80/genrevision.vcproj b/win/VC80/genrevision.vcproj index 4725000e016..6083bcab1fb 100644 --- a/win/VC80/genrevision.vcproj +++ b/win/VC80/genrevision.vcproj @@ -21,8 +21,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" + OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" > @@ -168,8 +168,8 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" + OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" > @@ -241,8 +241,8 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" + OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" WholeProgramOptimization="1" diff --git a/win/VC80/shared.vcproj b/win/VC80/shared.vcproj index f7eec9c4300..3824e5ae494 100644 --- a/win/VC80/shared.vcproj +++ b/win/VC80/shared.vcproj @@ -211,7 +211,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" FloatingPointModel="2" @@ -292,7 +292,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" FloatingPointModel="2" diff --git a/win/VC80/sockets.vcproj b/win/VC80/sockets.vcproj index 9ec30b4b11f..fc2a855f74f 100644 --- a/win/VC80/sockets.vcproj +++ b/win/VC80/sockets.vcproj @@ -205,7 +205,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include\sockets" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="true" @@ -283,7 +283,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include\sockets" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" RuntimeTypeInfo="true" diff --git a/win/VC90/ACE_vc9.vcproj b/win/VC90/ACE_vc9.vcproj index 1ea1dac5eac..a2dedea085b 100644 --- a/win/VC90/ACE_vc9.vcproj +++ b/win/VC90/ACE_vc9.vcproj @@ -2,7 +2,7 @@ <VisualStudioProject ProjectType="Visual C++" Version="9,00" - Name="ACEWrappers" + Name="ACE_Wrappers" ProjectGUID="{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}" RootNamespace="ACE" Keyword="Win32Proj" diff --git a/win/VC90/ScriptsInterfaces.vcproj b/win/VC90/ScriptsInterfaces.vcproj index d31894cef70..b6f5b588d06 100644 --- a/win/VC90/ScriptsInterfaces.vcproj +++ b/win/VC90/ScriptsInterfaces.vcproj @@ -46,7 +46,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -130,7 +130,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\shared;..\..\src\framework;..\..\dep\include" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_WINDOWS;_USRDLL;SCRIPT" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_WINDOWS;_USRDLL;SCRIPT" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC90/TrinityCore.vcproj b/win/VC90/TrinityCore.vcproj new file mode 100644 index 00000000000..cd5fb8e19d2 --- /dev/null +++ b/win/VC90/TrinityCore.vcproj @@ -0,0 +1,508 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9,00" + Name="TrinityCore" + ProjectGUID="{A3A04E47-43A2-4C08-90B3-029CEF558594}" + RootNamespace="mangosd" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\..\..\bin\Release\mangosd.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="1" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch" + AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/MACHINE:I386" + AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map" + SubSystem="1" + LargeAddressAware="2" + LinkTimeCodeGeneration="0" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(OutDir)\TrinityCore.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\trinitycore\trinitycore.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.conf.dist
" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName=".\..\..\bin\Release\mangosd.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;NDEBUG;_CONSOLE;ENABLE_CLI" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch" + AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map" + SubSystem="1" + LinkTimeCodeGeneration="0" + ImportLibrary="$(OutDir)\TrinityCore.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\trinitycore\trinitycore.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.conf.dist
" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI" + IgnoreStandardIncludePath="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch" + AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/MACHINE:I386" + AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" + Version="" + LinkIncremental="2" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map" + SubSystem="1" + LargeAddressAware="2" + RandomizedBaseAddress="1" + FixedBaseAddress="1" + DataExecutionPrevention="0" + ImportLibrary="$(OutDir)\TrinityCore.lib" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\trinitycore\trinitycore.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.conf.dist
" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinitycore__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName=".\mangosd__$(PlatformName)_$(ConfigurationName)\mangosd.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include,..\..\src\framework,..\..\src\shared,..\..\src\game,..\..\src\trinitycore;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE;ENABLE_CLI" + IgnoreStandardIncludePath="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\trinitycore.pch" + AssemblerListingLocation=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinitycore__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.exe" + Version="" + LinkIncremental="2" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="..\..\dep\lib\$(PlatformName)_$(ConfigurationName)" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.map" + SubSystem="1" + FixedBaseAddress="1" + ImportLibrary="$(OutDir)\TrinityCore.lib" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\dep\lib\$(PlatformName)_$(ConfigurationName)\*.dll ..\..\bin\$(PlatformName)_$(ConfigurationName)
copy ..\..\src\trinitycore\trinitycore.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityCore.conf.dist
" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <Filter + Name="doc" + > + <File + RelativePath="..\..\Authors" + > + </File> + <File + RelativePath="..\..\ChangeLog" + > + </File> + <File + RelativePath="..\..\Copying" + > + </File> + <File + RelativePath="..\..\Install" + > + </File> + <File + RelativePath="..\..\News" + > + </File> + <File + RelativePath="..\..\Readme" + > + </File> + <File + RelativePath="..\..\Thanks" + > + </File> + </Filter> + <File + RelativePath="..\..\src\trinitycore\CliRunnable.cpp" + > + </File> + <File + RelativePath="..\..\src\trinitycore\CliRunnable.h" + > + </File> + <File + RelativePath="..\..\src\trinitycore\Main.cpp" + > + </File> + <File + RelativePath="..\..\src\trinitycore\Master.cpp" + > + </File> + <File + RelativePath="..\..\src\trinitycore\Master.h" + > + </File> + <File + RelativePath="..\..\src\trinitycore\RASocket.cpp" + > + </File> + <File + RelativePath="..\..\src\trinitycore\RASocket.h" + > + </File> + <File + RelativePath="..\..\src\trinitycore\resource.h" + > + </File> + <File + RelativePath="..\..\src\trinitycore\TrinityCore.rc" + > + </File> + <File + RelativePath="..\..\src\shared\WheatyExceptionReport.cpp" + > + </File> + <File + RelativePath="..\..\src\shared\WheatyExceptionReport.h" + > + </File> + <File + RelativePath="..\..\src\trinitycore\WorldRunnable.cpp" + > + </File> + <File + RelativePath="..\..\src\trinitycore\WorldRunnable.h" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/win/VC90/TrinityRealm.vcproj b/win/VC90/TrinityRealm.vcproj new file mode 100644 index 00000000000..85659d11540 --- /dev/null +++ b/win/VC90/TrinityRealm.vcproj @@ -0,0 +1,452 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9,00" + Name="TrinityRealm" + ProjectGUID="{563E9905-3657-460C-AE63-0AC39D162E23}" + RootNamespace="realmd" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + <Platform + Name="x64" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Release|Win32" + OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="1" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\realmd.pch" + AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/MACHINE:I386" + AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" + SubSystem="1" + LargeAddressAware="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist" + /> + </Configuration> + <Configuration + Name="Release|x64" + OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + InlineFunctionExpansion="1" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE" + StringPooling="true" + RuntimeLibrary="2" + EnableFunctionLevelLinking="true" + EnableEnhancedInstructionSet="0" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\realmd.pch" + AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="NDEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRT.LIB msvcrt.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" + LinkIncremental="1" + SuppressStartupBanner="true" + AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" + SubSystem="1" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist" + /> + </Configuration> + <Configuration + Name="Debug|Win32" + OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE" + IgnoreStandardIncludePath="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\realmd.pch" + AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalOptions="/MACHINE:I386" + AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" + LinkIncremental="2" + SuppressStartupBanner="true" + AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" + SubSystem="1" + LargeAddressAware="2" + RandomizedBaseAddress="1" + FixedBaseAddress="1" + DataExecutionPrevention="0" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist" + /> + </Configuration> + <Configuration + Name="Debug|x64" + OutputDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\trinityrealm__$(PlatformName)_$(ConfigurationName)" + ConfigurationType="1" + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + UseOfMFC="0" + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + TargetEnvironment="3" + TypeLibraryName=".\realmd__$(PlatformName)_$(ConfigurationName)\realmd.tlb" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalOptions="/MP" + Optimization="0" + AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" + PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;TRINITY_DEBUG;_CONSOLE" + IgnoreStandardIncludePath="false" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + RuntimeTypeInfo="true" + PrecompiledHeaderFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\realmd.pch" + AssemblerListingLocation=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ObjectFile=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + ProgramDataBaseFileName=".\trinityrealm__$(PlatformName)_$(ConfigurationName)\" + WarningLevel="3" + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + CompileAs="0" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + PreprocessorDefinitions="_DEBUG" + Culture="1033" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" + OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" + LinkIncremental="2" + SuppressStartupBanner="true" + AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" + GenerateDebugInformation="true" + ProgramDatabaseFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.pdb" + GenerateMapFile="true" + MapFileName="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.map" + SubSystem="1" + FixedBaseAddress="1" + TargetMachine="17" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCPostBuildEventTool" + CommandLine="copy ..\..\src\trinityrealm\trinityrealm.conf.dist ..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.conf.dist" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="..\..\src\trinityrealm\AuthCodes.h" + > + </File> + <File + RelativePath="..\..\src\trinityrealm\AuthSocket.cpp" + > + </File> + <File + RelativePath="..\..\src\trinityrealm\AuthSocket.h" + > + </File> + <File + RelativePath="..\..\src\trinityrealm\Main.cpp" + > + </File> + <File + RelativePath="..\..\src\trinityrealm\RealmList.cpp" + > + </File> + <File + RelativePath="..\..\src\trinityrealm\RealmList.h" + > + </File> + <File + RelativePath="..\..\src\trinityrealm\TrinityRealm.rc" + > + </File> + <File + RelativePath="..\..\src\shared\WheatyExceptionReport.cpp" + > + </File> + <File + RelativePath="..\..\src\shared\WheatyExceptionReport.h" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/win/VC90/framework.vcproj b/win/VC90/framework.vcproj index 4935e7e84d5..3794c4b93a4 100644 --- a/win/VC90/framework.vcproj +++ b/win/VC90/framework.vcproj @@ -48,7 +48,7 @@ AdditionalOptions="/Zl /MP" Optimization="0" AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -201,7 +201,7 @@ AdditionalOptions="/Zl /MP" Optimization="0" AdditionalIncludeDirectories="..\..\src\framework;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB" MinimalRebuild="false" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj index 0dc30f88c02..3ca87d57c1f 100644 --- a/win/VC90/game.vcproj +++ b/win/VC90/game.vcproj @@ -48,7 +48,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;" StringPooling="false" MinimalRebuild="false" BasicRuntimeChecks="3" @@ -129,7 +129,7 @@ AdditionalOptions="/MP /bigobj" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\shared\vmap;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;" StringPooling="false" MinimalRebuild="false" BasicRuntimeChecks="3" diff --git a/win/VC90/genrevision.vcproj b/win/VC90/genrevision.vcproj index 2b36151003e..94148f3fa26 100644 --- a/win/VC90/genrevision.vcproj +++ b/win/VC90/genrevision.vcproj @@ -21,8 +21,8 @@ <Configurations> <Configuration Name="Debug|Win32" - OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" + OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" > @@ -168,8 +168,8 @@ </Configuration> <Configuration Name="Debug|x64" - OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" + OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" > @@ -241,8 +241,8 @@ </Configuration> <Configuration Name="Release|x64" - OutputDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" - IntermediateDirectory=".\gensvnrevision__$(PlatformName)_$(ConfigurationName)" + OutputDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" + IntermediateDirectory=".\genrevision__$(PlatformName)_$(ConfigurationName)" ConfigurationType="1" CharacterSet="1" WholeProgramOptimization="1" diff --git a/win/VC90/shared.vcproj b/win/VC90/shared.vcproj index b10a9781dfc..02452340e8b 100644 --- a/win/VC90/shared.vcproj +++ b/win/VC90/shared.vcproj @@ -216,7 +216,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" EnableFunctionLevelLinking="true" @@ -298,7 +298,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\dep\include\g3dlite;..\..\src\framework;..\..\src\shared;..\..\dep\ACE_wrappers" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" EnableFunctionLevelLinking="true" diff --git a/win/VC90/sockets.vcproj b/win/VC90/sockets.vcproj index 873f48c2bc0..50f86dbd3c1 100644 --- a/win/VC90/sockets.vcproj +++ b/win/VC90/sockets.vcproj @@ -127,7 +127,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include\sockets" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" EnableFunctionLevelLinking="true" @@ -288,7 +288,7 @@ AdditionalOptions="/MP" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include\sockets" - PreprocessorDefinitions="WIN32;_DEBUG;MANGOS_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" + PreprocessorDefinitions="WIN32;_DEBUG;TRINITY_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" RuntimeLibrary="3" EnableFunctionLevelLinking="true" |