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

[9544] Implement CONDITION_NOITEM.

Browse source 
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
timmit 2010-03-07 16:44:21 +03:00 • committed by VladimirMangos
parent b47520a500
commit a30af12772
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/game/ObjectMgr.cpp
View file

@ -7469,6 +7469,8 @@ bool PlayerCondition::Meets(Player const * player) const
} }
return false; return false;
} }
case CONDITION_NOITEM:
return !player->HasItemCount(value1, value2);
default: default:
return false; return false;
} }
@ -7500,6 +7502,7 @@ bool PlayerCondition::IsValid(ConditionType condition, uint32 value1, uint32 val
break; break;
} }
case CONDITION_ITEM: case CONDITION_ITEM:
case CONDITION_NOITEM:
{ {
ItemPrototype const *proto = ObjectMgr::GetItemPrototype(value1); ItemPrototype const *proto = ObjectMgr::GetItemPrototype(value1);
if(!proto) if(!proto)
@ -7507,6 +7510,12 @@ bool PlayerCondition::IsValid(ConditionType condition, uint32 value1, uint32 val
sLog.outErrorDb("Item condition requires to have non existing item (%u), skipped", value1); sLog.outErrorDb("Item condition requires to have non existing item (%u), skipped", value1);
return false; return false;
} }
if(value2 < 1)
{
sLog.outErrorDb("Item condition useless with count < 1, skipped");
return false;
}
break; break;
} }
case CONDITION_ITEM_EQUIPPED: case CONDITION_ITEM_EQUIPPED:

3
src/game/ObjectMgr.h
View file

@ -313,9 +313,10 @@ enum ConditionType
CONDITION_AREA_FLAG = 13, // area_flag area_flag_not CONDITION_AREA_FLAG = 13, // area_flag area_flag_not
CONDITION_RACE_CLASS = 14, // race_mask class_mask CONDITION_RACE_CLASS = 14, // race_mask class_mask
CONDITION_LEVEL = 15, // player_level 0, 1 or 2 (0: equal to, 1: equal or higher than, 2: equal or less than) CONDITION_LEVEL = 15, // player_level 0, 1 or 2 (0: equal to, 1: equal or higher than, 2: equal or less than)
CONDITION_NOITEM = 16, // item_id count
}; };
#define MAX_CONDITION 16 // maximum value in ConditionType enum #define MAX_CONDITION 17 // maximum value in ConditionType enum
struct PlayerCondition struct PlayerCondition
{ {

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9543" #define REVISION_NR "9544"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__