mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 310

Browse source 
Conflicts:
	src/game/Unit.cpp
This commit is contained in:
tomrus88 2009-04-03 21:21:40 +04:00
commit 3ad6044f72
11 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/mangos.sql
View file

@ -2134,7 +2134,7 @@ UNLOCK TABLES;
-- Table structure for table `locales_points_of_interest`
--
DROP TABLE IF EXISTS `locales_points_of_interest`;
DROP TABLE IF EXISTS `locales_points_of_interest`;
CREATE TABLE `locales_points_of_interest` (
`entry` mediumint(8) unsigned NOT NULL default '0',
`icon_name_loc1` text,
@ -12771,7 +12771,7 @@ UNLOCK TABLES;
-- Table structure for table `points_of_interest`
--
DROP TABLE IF EXISTS `points_of_interest`;
DROP TABLE IF EXISTS `points_of_interest`;
CREATE TABLE `points_of_interest` (
`entry` mediumint(8) unsigned NOT NULL default '0',
`x` float NOT NULL default '0',

2
sql/updates/7292_01_mangos_points_of_interest.sql
View file

@ -1,6 +1,6 @@
ALTER TABLE db_version CHANGE COLUMN required_7290_01_mangos_command required_7292_01_mangos_points_of_interest bit;
DROP TABLE IF EXISTS `points_of_interest`;
DROP TABLE IF EXISTS `points_of_interest`;
CREATE TABLE `points_of_interest` (
`entry` mediumint(8) unsigned NOT NULL default '0',
`x` float NOT NULL default '0',

2
sql/updates/7292_02_mangos_locales_points_of_interest.sql
View file

@ -1,6 +1,6 @@
ALTER TABLE db_version CHANGE COLUMN required_7292_01_mangos_points_of_interest required_7292_02_mangos_locales_points_of_interest bit;
DROP TABLE IF EXISTS `locales_points_of_interest`;
DROP TABLE IF EXISTS `locales_points_of_interest`;
CREATE TABLE `locales_points_of_interest` (
`entry` mediumint(8) unsigned NOT NULL default '0',
`icon_name_loc1` text,

6
src/game/AchievementMgr.cpp
View file

@ -1185,17 +1185,17 @@ void AchievementMgr::SetCriteriaProgress(AchievementCriteriaEntry const* entry,
{
case PROGRESS_SET:
newValue = changeValue;
break;
break;
case PROGRESS_ACCUMULATE:
{
// avoid overflow
uint32 max_value = std::numeric_limits<uint32>::max();
newValue = max_value - progress->counter > changeValue ? progress->counter + changeValue : max_value;
break;
break;
}
case PROGRESS_HIGHEST:
newValue = progress->counter < changeValue ? changeValue : progress->counter;
break;
break;
}
// not update (not mark as changed) if counter will have same value

2
src/game/Level3.cpp
View file

@ -1768,7 +1768,7 @@ bool ChatHandler::HandleLearnAllMyTalentsCommand(const char* /*args*/)
// search highest talent rank
uint32 spellid = 0;
for(int rank = MAX_TALENT_RANK-1; rank >= 0; --rank)
{
if(talentInfo->RankID[rank]!=0)

2
src/game/Map.h
View file

@ -178,7 +178,7 @@ class GridMap
bool loadLiquidData(FILE *in, uint32 offset, uint32 size);
// Get height functions and pointers
typedef float (GridMap::*pGetHeightPtr) (float x, float y) const;
typedef float (GridMap::*pGetHeightPtr) (float x, float y) const;
pGetHeightPtr m_gridGetHeight;
float getHeightFromFloat(float x, float y) const;
float getHeightFromUint16(float x, float y) const;

6
src/game/SpellAuras.cpp
View file

@ -230,7 +230,7 @@ pAuraHandler AuraHandler[TOTAL_AURAS]=
&Aura::HandleNoImmediateEffect, //178 SPELL_AURA_MOD_DEBUFF_RESISTANCE implemented in Unit::MagicSpellHitResult
&Aura::HandleNoImmediateEffect, //179 SPELL_AURA_MOD_ATTACKER_SPELL_CRIT_CHANCE implemented in Unit::SpellCriticalBonus
&Aura::HandleNoImmediateEffect, //180 SPELL_AURA_MOD_FLAT_SPELL_DAMAGE_VERSUS implemented in Unit::SpellDamageBonus
&Aura::HandleUnused, //181 unused (3.0.8a) old SPELL_AURA_MOD_FLAT_SPELL_CRIT_DAMAGE_VERSUS
&Aura::HandleUnused, //181 unused (3.0.8a) old SPELL_AURA_MOD_FLAT_SPELL_CRIT_DAMAGE_VERSUS
&Aura::HandleAuraModResistenceOfStatPercent, //182 SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT
&Aura::HandleNULL, //183 SPELL_AURA_MOD_CRITICAL_THREAT only used in 28746
&Aura::HandleNoImmediateEffect, //184 SPELL_AURA_MOD_ATTACKER_MELEE_HIT_CHANCE implemented in Unit::RollMeleeOutcomeAgainst
@ -4228,7 +4228,7 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
if (apply)
{
if(loading)
return;
return;
Unit *caster = GetCaster();
if (!caster)
@ -6165,7 +6165,7 @@ void Aura::PeriodicTick()
}
// Anger Management
// amount = 1+ 16 = 17 = 3,4*5 = 10,2*5/3
// amount = 1+ 16 = 17 = 3,4*5 = 10,2*5/3
// so 17 is rounded amount for 5 sec tick grow ~ 1 range grow in 3 sec
if(pt == POWER_RAGE)
m_target->ModifyPower(pt, m_modifier.m_amount*3/5);

2
src/game/SpellEffects.cpp
View file

@ -2400,7 +2400,7 @@ void Spell::EffectPowerBurn(uint32 i)
{
uint32 maxdamage = m_caster->GetMaxPower(powertype) * damage * 2 / 100;
damage = unitTarget->GetMaxPower(powertype) * damage / 100;
if(damage > maxdamage) damage = maxdamage;
if(damage > maxdamage) damage = maxdamage;
}
int32 curPower = int32(unitTarget->GetPower(powertype));

2
src/game/Unit.cpp
View file

@ -10641,7 +10641,7 @@ Player* Unit::GetSpellModOwner()
void Unit::SendPetCastFail(uint32 spellid, SpellCastResult msg)
{
if(msg == SPELL_CAST_OK)
return;
return;
Unit *owner = GetCharmerOrOwner();
if(!owner || owner->GetTypeId() != TYPEID_PLAYER)

2
src/mangosd/mangosd.conf.dist.in
View file

@ -25,7 +25,7 @@ ConfVersion=2008080101
# WorldDatabaseInfo
# CharacterDatabaseInfo
# Database connection settings for the world server.
# Default:
# Default:
# ---MYSQL---
# hostname;port;username;password;database
# .;somenumber;username;password;database - use named pipes at Windows

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "7608"
#define REVISION_NR "7609"
#endif // __REVISION_NR_H__