Merge branch 'master' into 303

Conflicts:
	src/game/Player.cpp
	src/shared/revision_nr.h
This commit is contained in:
tomrus88 2008-12-09 00:32:47 +03:00
commit ef69f6b80c
21 changed files with 110 additions and 46 deletions

View file

@ -326,7 +326,7 @@ void QuestMenu::AddMenuItem( uint32 QuestId, uint8 Icon)
bool QuestMenu::HasItem( uint32 questid )
{
for (QuestMenuItemList::iterator i = m_qItems.begin(); i != m_qItems.end(); i++)
for (QuestMenuItemList::iterator i = m_qItems.begin(); i != m_qItems.end(); ++i)
{
if(i->m_qId==questid)
{