Port TopMenus to transitional syntax.

This commit is contained in:
David Anderson
2014-10-30 19:20:33 -07:00
committed by David Anderson
parent e5eb291b67
commit b97335ccb0
34 changed files with 334 additions and 387 deletions
+2 -2
View File
@@ -161,9 +161,9 @@ public MenuHandler_Beacon(Handle:menu, MenuAction:action, param1, param2)
}
else if (action == MenuAction_Cancel)
{
if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
if (param2 == MenuCancel_ExitBack && hTopMenu)
{
DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory);
hTopMenu.Display(param1, TopMenuPosition_LastCategory);
}
}
else if (action == MenuAction_Select)
+4 -4
View File
@@ -137,9 +137,9 @@ public MenuHandler_Blind(Handle:menu, MenuAction:action, param1, param2)
}
else if (action == MenuAction_Cancel)
{
if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
if (param2 == MenuCancel_ExitBack && hTopMenu)
{
DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory);
hTopMenu.Display(param1, TopMenuPosition_LastCategory);
}
}
else if (action == MenuAction_Select)
@@ -183,9 +183,9 @@ public MenuHandler_Amount(Handle:menu, MenuAction:action, param1, param2)
}
else if (action == MenuAction_Cancel)
{
if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
if (param2 == MenuCancel_ExitBack && hTopMenu)
{
DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory);
hTopMenu.Display(param1, TopMenuPosition_LastCategory);
}
}
else if (action == MenuAction_Select)
+2 -2
View File
@@ -241,9 +241,9 @@ public MenuHandler_Drug(Handle:menu, MenuAction:action, param1, param2)
}
else if (action == MenuAction_Cancel)
{
if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
if (param2 == MenuCancel_ExitBack && hTopMenu)
{
DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory);
hTopMenu.Display(param1, TopMenuPosition_LastCategory);
}
}
else if (action == MenuAction_Select)
+4 -4
View File
@@ -281,9 +281,9 @@ public MenuHandler_Burn(Handle:menu, MenuAction:action, param1, param2)
}
else if (action == MenuAction_Cancel)
{
if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
if (param2 == MenuCancel_ExitBack && hTopMenu)
{
DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory);
hTopMenu.Display(param1, TopMenuPosition_LastCategory);
}
}
else if (action == MenuAction_Select)
@@ -326,9 +326,9 @@ public MenuHandler_FireBomb(Handle:menu, MenuAction:action, param1, param2)
}
else if (action == MenuAction_Cancel)
{
if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
if (param2 == MenuCancel_ExitBack && hTopMenu)
{
DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory);
hTopMenu.Display(param1, TopMenuPosition_LastCategory);
}
}
else if (action == MenuAction_Select)
+4 -4
View File
@@ -96,9 +96,9 @@ public MenuHandler_Gravity(Handle:menu, MenuAction:action, param1, param2)
}
else if (action == MenuAction_Cancel)
{
if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
if (param2 == MenuCancel_ExitBack && hTopMenu)
{
DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory);
hTopMenu.Display(param1, TopMenuPosition_LastCategory);
}
}
else if (action == MenuAction_Select)
@@ -142,9 +142,9 @@ public MenuHandler_GravityAmount(Handle:menu, MenuAction:action, param1, param2)
}
else if (action == MenuAction_Cancel)
{
if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
if (param2 == MenuCancel_ExitBack && hTopMenu)
{
DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory);
hTopMenu.Display(param1, TopMenuPosition_LastCategory);
}
}
else if (action == MenuAction_Select)
+4 -4
View File
@@ -395,9 +395,9 @@ public MenuHandler_Freeze(Handle:menu, MenuAction:action, param1, param2)
}
else if (action == MenuAction_Cancel)
{
if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
if (param2 == MenuCancel_ExitBack && hTopMenu)
{
DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory);
hTopMenu.Display(param1, TopMenuPosition_LastCategory);
}
}
else if (action == MenuAction_Select)
@@ -441,9 +441,9 @@ public MenuHandler_FreezeBomb(Handle:menu, MenuAction:action, param1, param2)
}
else if (action == MenuAction_Cancel)
{
if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
if (param2 == MenuCancel_ExitBack && hTopMenu)
{
DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory);
hTopMenu.Display(param1, TopMenuPosition_LastCategory);
}
}
else if (action == MenuAction_Select)
+2 -2
View File
@@ -86,9 +86,9 @@ public MenuHandler_NoClip(Handle:menu, MenuAction:action, param1, param2)
}
else if (action == MenuAction_Cancel)
{
if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
if (param2 == MenuCancel_ExitBack && hTopMenu)
{
DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory);
hTopMenu.Display(param1, TopMenuPosition_LastCategory);
}
}
else if (action == MenuAction_Select)
+2 -2
View File
@@ -252,9 +252,9 @@ public MenuHandler_TimeBomb(Handle:menu, MenuAction:action, param1, param2)
}
else if (action == MenuAction_Cancel)
{
if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
if (param2 == MenuCancel_ExitBack && hTopMenu)
{
DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory);
hTopMenu.Display(param1, TopMenuPosition_LastCategory);
}
}
else if (action == MenuAction_Select)