From 68a1a29db8641348937548fea1cb32dab2317a0c Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Sun, 13 Feb 2011 08:47:51 +0200 Subject: Reverted 1 Letter Refactoring or Edited it to a full name. --- src/game/editor/ed_popups.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 e43c6c91..3ab4ab49 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 *pID, 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 Width, float Height, 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; + if(x + Width > UI()->Screen()->w) + x -= Width; + if(y + Height > UI()->Screen()->h) + y -= Height; 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 = Width; + s_UiPopups[g_UiNumPopups].m_Rect.h = Height; s_UiPopups[g_UiNumPopups].m_pfnFunc = pfnFunc; s_UiPopups[g_UiNumPopups].m_pExtra = pExtra; g_UiNumPopups++; -- cgit 1.4.1