Merge branch 'master' of git://github.com/matricks/teeworlds

This commit is contained in:
Fujnky 2010-06-03 22:33:38 +02:00
commit 4ffab2af80

View file

@ -714,6 +714,9 @@ void CMenus::OnInit()
void CMenus::PopupMessage(const char *pTopic, const char *pBody, const char *pButton)
{
// reset active item
UI()->SetActiveItem(0);
str_copy(m_aMessageTopic, pTopic, sizeof(m_aMessageTopic));
str_copy(m_aMessageBody, pBody, sizeof(m_aMessageBody));
str_copy(m_aMessageButton, pButton, sizeof(m_aMessageButton));