From 1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251 Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Sat, 12 Feb 2011 12:40:36 +0200 Subject: Refactoring & fixed WEAPONSPEC_GUN in content.py --- src/game/editor/ed_popups.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/game/editor/ed_popups.cpp') diff --git a/src/game/editor/ed_popups.cpp b/src/game/editor/ed_popups.cpp index c0fcc5d5..e43c6c91 100644 --- a/src/game/editor/ed_popups.cpp +++ b/src/game/editor/ed_popups.cpp @@ -20,19 +20,19 @@ static struct static int g_UiNumPopups = 0; -void CEditor::UiInvokePopupMenu(void *Id, int Flags, float x, float y, float w, float h, int (*pfnFunc)(CEditor *pEditor, CUIRect Rect), void *pExtra) +void CEditor::UiInvokePopupMenu(void *pID, int Flags, float X, float Y, float W, float H, int (*pfnFunc)(CEditor *pEditor, CUIRect Rect), void *pExtra) { Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "editor", "invoked"); - if(x + w > UI()->Screen()->w) - x -= w; - if(y + h > UI()->Screen()->h) - y -= h; - s_UiPopups[g_UiNumPopups].m_pId = Id; + if(X + W > UI()->Screen()->w) + X -= W; + if(Y + H > UI()->Screen()->h) + Y -= H; + s_UiPopups[g_UiNumPopups].m_pId = pID; s_UiPopups[g_UiNumPopups].m_IsMenu = Flags; - s_UiPopups[g_UiNumPopups].m_Rect.x = x; - s_UiPopups[g_UiNumPopups].m_Rect.y = y; - s_UiPopups[g_UiNumPopups].m_Rect.w = w; - s_UiPopups[g_UiNumPopups].m_Rect.h = h; + s_UiPopups[g_UiNumPopups].m_Rect.x = X; + s_UiPopups[g_UiNumPopups].m_Rect.y = Y; + s_UiPopups[g_UiNumPopups].m_Rect.w = W; + s_UiPopups[g_UiNumPopups].m_Rect.h = H; s_UiPopups[g_UiNumPopups].m_pfnFunc = pfnFunc; s_UiPopups[g_UiNumPopups].m_pExtra = pExtra; g_UiNumPopups++; @@ -441,7 +441,7 @@ int CEditor::PopupSelectImage(CEditor *pEditor, CUIRect View) } if(ShowImage >= 0 && ShowImage < pEditor->m_Map.m_lImages.size()) - pEditor->Graphics()->TextureSet(pEditor->m_Map.m_lImages[ShowImage]->m_TexId); + pEditor->Graphics()->TextureSet(pEditor->m_Map.m_lImages[ShowImage]->m_TexID); else pEditor->Graphics()->TextureSet(-1); pEditor->Graphics()->QuadsBegin(); -- cgit 1.4.1