}
}
-float MENU_ASPECT = 1.25; // 1280x1024
-float MENU_MINHEIGHT = 600;
-float conwidth_s, conheight_s, realconwidth, realconheight, screenconwidth, screenconheight;
+const float MENU_ASPECT = 1.25; // 1280x1024
+const float MENU_MINHEIGHT = 600;
+float conwidth_s, conheight_s, vidwidth_s, vidheight_s, realconwidth,
+ realconheight, screenconwidth, screenconheight;
void draw_reset_cropped()
{
draw_reset(screenconwidth, screenconheight, 0.5 * (realconwidth - screenconwidth), 0.5 * (realconheight - screenconheight));
{
draw_reset(realconwidth, realconheight, 0, 0);
}
-void UpdateConWidthHeight()
+
+void UpdateConWidthHeight(float w, float h)
{
+ if (w != vidwidth_s || h != vidheight_s)
+ {
+ initConwidths(w, h);
+ updateConwidths();
+ vidwidth_s = w;
+ vidheight_s = h;
+ }
conwidth_s = conwidth;
conheight_s = conheight;
realconwidth = cvar("vid_conwidth");
string s;
conwidth = conheight = -1;
- UpdateConWidthHeight();
+ UpdateConWidthHeight(cvar("vid_width"), cvar("vid_height"));
draw_reset_cropped();
menuInitialized = 0;
return;
if(!Menu_Active)
return;
+
+ if(menuMouseMode)
+ if(key >= K_MOUSE1 && key <= K_MOUSE3)
+ {
+ // detect a click outside of the game window
+ vector p = getmousepos();
+ if(p_x < 0 || p_x > realconwidth || p_y < 0 || p_y > realconheight)
+ {
+ ++mouseButtonsPressed;
+ return;
+ }
+ }
+
if(keyGrabber)
{
entity e;
if(key == K_SHIFT) menuShiftState |= S_SHIFT;
}
-float SCALEMODE_CROP = 0;
-float SCALEMODE_LETTERBOX = 1;
-float SCALEMODE_WIDTH = 2;
-float SCALEMODE_HEIGHT = 3;
-float SCALEMODE_STRETCH = 4;
+const float SCALEMODE_CROP = 0;
+const float SCALEMODE_LETTERBOX = 1;
+const float SCALEMODE_WIDTH = 2;
+const float SCALEMODE_HEIGHT = 3;
+const float SCALEMODE_STRETCH = 4;
void draw_Picture_Aligned(vector algn, float scalemode, string img, float a)
{
vector sz, org, isz, isz_w, isz_h;
}
}
-void m_draw()
+void m_draw(float width, float height)
{
float t;
float realFrametime;
anim.tickAll(anim);
if(main)
- UpdateConWidthHeight();
+ {
+#ifdef COMPAT_XON070_OLD_M_DRAW
+ UpdateConWidthHeight(width ? width : cvar("vid_width"), height ? height : cvar("vid_height"));
+#else
+ UpdateConWidthHeight(width, height);
+#endif
+ }
if(!menuInitialized)
{
draw_alpha *= menuAlpha;
- if(menuMouseMode)
+ if(!Menu_Active)
+ {
+ // do not update mouse position
+ // it prevents mouse jumping to '0 0 0' when menu is fading out
+ }
+ else if(menuMouseMode)
{
vector newMouse;
newMouse = globalToBox(getmousepos(), draw_shift, draw_scale);
for(e = NULL; (e = find(e, name, itemname)); )
if(e.classname != "vtbl")
break;
- if(e)
+
+ if((e) && (!e.requiresConnection || (gamestatus & (GAME_ISSERVER | GAME_CONNECTED))))
{
m_hide();
m_activate_window(e);