UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added MenuAction_DrawItem for changing how an item gets drawn

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401012
This commit is contained in:
David Anderson 2007-06-22 22:37:22 +00:00
parent 38f95fc63d
commit 368432baf5
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/MenuManager.cpp
View File

@ -594,7 +594,6 @@ skip_search:
for (unsigned int i=0; i<foundItems; i++) for (unsigned int i=0; i<foundItems; i++)
{ {
ItemDrawInfo &dr = drawItems[i].draw; ItemDrawInfo &dr = drawItems[i].draw;
menu->GetItemInfo(drawItems[i].position, &dr);
mh->OnMenuDisplayItem(menu, client, drawItems[i].position, &(dr.display)); mh->OnMenuDisplayItem(menu, client, drawItems[i].position, &(dr.display));
if ((position = display->DrawItem(dr)) != 0) if ((position = display->DrawItem(dr)) != 0)
{ {
@ -610,7 +609,6 @@ skip_search:
while (i--) while (i--)
{ {
ItemDrawInfo &dr = drawItems[i].draw; ItemDrawInfo &dr = drawItems[i].draw;
menu->GetItemInfo(drawItems[i].position, &dr);
mh->OnMenuDisplayItem(menu, client, drawItems[i].position, &(dr.display)); mh->OnMenuDisplayItem(menu, client, drawItems[i].position, &(dr.display));
if ((position = display->DrawItem(dr)) != 0) if ((position = display->DrawItem(dr)) != 0)
{ {

19
core/smn_menus.cpp
View File

@ -43,6 +43,7 @@ enum MenuAction
MenuAction_VoteEnd = (1<<5), /**< (VOTE ONLY): A vote sequence has ended (param1=chosen item) */ MenuAction_VoteEnd = (1<<5), /**< (VOTE ONLY): A vote sequence has ended (param1=chosen item) */
MenuAction_VoteStart = (1<<6), /**< (VOTE ONLY): A vote sequence has started */ MenuAction_VoteStart = (1<<6), /**< (VOTE ONLY): A vote sequence has started */
MenuAction_VoteCancel = (1<<7), /**< (VOTE ONLY): A vote sequence has been cancelled (nothing passed) */ MenuAction_VoteCancel = (1<<7), /**< (VOTE ONLY): A vote sequence has been cancelled (nothing passed) */
MenuAction_DrawItem = (1<<8), /**< A style is being drawn; return the new style (param1=client, param2=item) */
}; };
class CPanelHandler : public IMenuHandler class CPanelHandler : public IMenuHandler
@ -77,12 +78,13 @@ public:
unsigned int winningVotes, unsigned int winningVotes,
unsigned int totalVotes); unsigned int totalVotes);
void OnMenuVoteCancel(IBaseMenu *menu); void OnMenuVoteCancel(IBaseMenu *menu);
void OnMenuDrawItem(IBaseMenu *menu, int client, unsigned int item, unsigned int &style);
#if 0 #if 0
void OnMenuDrawItem(IBaseMenu *menu, int client, unsigned int item, unsigned int &style); void OnMenuDrawItem(IBaseMenu *menu, int client, unsigned int item, unsigned int &style);
void OnMenuDisplayItem(IBaseMenu *menu, int client, unsigned int item, const char **display); void OnMenuDisplayItem(IBaseMenu *menu, int client, unsigned int item, const char **display);
#endif #endif
private: private:
void DoAction(IBaseMenu *menu, MenuAction action, cell_t param1, cell_t param2); cell_t DoAction(IBaseMenu *menu, MenuAction action, cell_t param1, cell_t param2, cell_t def_res=0);
private: private:
IPluginFunction *m_pBasic; IPluginFunction *m_pBasic;
int m_Flags; int m_Flags;
@ -307,7 +309,16 @@ void CMenuHandler::OnMenuVoteCancel(IBaseMenu *menu)
DoAction(menu, MenuAction_VoteCancel, 0, 0); DoAction(menu, MenuAction_VoteCancel, 0, 0);
} }
void CMenuHandler::DoAction(IBaseMenu *menu, MenuAction action, cell_t param1, cell_t param2) void CMenuHandler::OnMenuDrawItem(IBaseMenu *menu, int client, unsigned int item, unsigned int &style)
{
if ((m_Flags & (int)MenuAction_DrawItem) == (int)MenuAction_DrawItem)
{
cell_t result = DoAction(menu, MenuAction_DrawItem, client, item, style);
style = (unsigned int)result;
}
}
cell_t CMenuHandler::DoAction(IBaseMenu *menu, MenuAction action, cell_t param1, cell_t param2, cell_t def_res)
{ {
#if defined MENU_DEBUG #if defined MENU_DEBUG
g_Logger.LogMessage("[SM_MENU] CMenuHandler::DoAction() (menu %p/%08x) (action %d) (param1 %d) (param2 %d)", g_Logger.LogMessage("[SM_MENU] CMenuHandler::DoAction() (menu %p/%08x) (action %d) (param1 %d) (param2 %d)",
@ -317,11 +328,13 @@ void CMenuHandler::DoAction(IBaseMenu *menu, MenuAction action, cell_t param1, c
param1, param1,
param2); param2);
#endif #endif
cell_t res = def_res;
m_pBasic->PushCell(menu->GetHandle()); m_pBasic->PushCell(menu->GetHandle());
m_pBasic->PushCell((cell_t)action); m_pBasic->PushCell((cell_t)action);
m_pBasic->PushCell(param1); m_pBasic->PushCell(param1);
m_pBasic->PushCell(param2); m_pBasic->PushCell(param2);
m_pBasic->Execute(NULL); m_pBasic->Execute(&res);
return res;
} }
/** /**

1
plugins/include/menus.inc
View File

@ -41,6 +41,7 @@ enum MenuAction
MenuAction_VoteEnd = (1<<5), /**< (VOTE ONLY): A vote sequence has succeeded (param1=chosen item) */ MenuAction_VoteEnd = (1<<5), /**< (VOTE ONLY): A vote sequence has succeeded (param1=chosen item) */
MenuAction_VoteStart = (1<<6), /**< (VOTE ONLY): A vote sequence has started (nothing passed) */ MenuAction_VoteStart = (1<<6), /**< (VOTE ONLY): A vote sequence has started (nothing passed) */
MenuAction_VoteCancel = (1<<7), /**< (VOTE ONLY): A vote sequence has been cancelled (nothing passed) */ MenuAction_VoteCancel = (1<<7), /**< (VOTE ONLY): A vote sequence has been cancelled (nothing passed) */
MenuAction_DrawItem = (1<<8), /**< A style is being drawn; return the new style (param1=client, param2=item) */
}; };
/** Default menu actions */ /** Default menu actions */