terencehill's resizecheck algoritihm. This makes resizing a lot smoother. Fix resizin...

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 3ef20f6cfb960a90afc18c40552f611007deb48f..e4226e69121f3c6c23f22b6f31e5810e39c47e04 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1058,13 +1058,13 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin, float
                if (resizeCorner == 1)
                {
                        // check if this panel is on our way
                if (resizeCorner == 1)
                {
                        // check if this panel is on our way

-                       if (resizeorigin_x < targPos_x)
+                       if (resizeorigin_x <= targPos_x)

                                continue;
                                continue;

-                       if (resizeorigin_y < targPos_y)
+                       if (resizeorigin_y <= targPos_y)

                                continue;
                                continue;

-                       if (targEndPos_x < resizeorigin_x - mySize_x)
+                       if (targEndPos_x <= resizeorigin_x - mySize_x)

                                continue;
                                continue;

-                       if (targEndPos_y < resizeorigin_y - mySize_y)
+                       if (targEndPos_y <= resizeorigin_y - mySize_y)

                                continue;
 
                        // there is a collision:
                                continue;
 
                        // there is a collision:


@@ -1082,13 +1082,13 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin, float
                }
                else if (resizeCorner == 2)
                {
                }
                else if (resizeCorner == 2)
                {

-                       if (resizeorigin_x > targEndPos_x)
+                       if (resizeorigin_x >= targEndPos_x)

                                continue;
                                continue;

-                       if (resizeorigin_y < targPos_y)
+                       if (resizeorigin_y <= targPos_y)

                                continue;
                                continue;

-                       if (targPos_x > resizeorigin_x + mySize_x)
+                       if (targPos_x >= resizeorigin_x + mySize_x)

                                continue;
                                continue;

-                       if (targEndPos_y < resizeorigin_y - mySize_y)
+                       if (targEndPos_y <= resizeorigin_y - mySize_y)

                                continue;
 
                        dist_x = targPos_x - resizeorigin_x;
                                continue;
 
                        dist_x = targPos_x - resizeorigin_x;


@@ -1100,13 +1100,13 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin, float
                }
                else if (resizeCorner == 3)
                {
                }
                else if (resizeCorner == 3)
                {

-                       if (resizeorigin_x < targPos_x)
+                       if (resizeorigin_x <= targPos_x)

                                continue;
                                continue;

-                       if (resizeorigin_y > targEndPos_y)
+                       if (resizeorigin_y >= targEndPos_y)

                                continue;
                                continue;

-                       if (targEndPos_x < resizeorigin_x - mySize_x)
+                       if (targEndPos_x <= resizeorigin_x - mySize_x)

                                continue;
                                continue;

-                       if (targPos_y > resizeorigin_y + mySize_y)
+                       if (targPos_y >= resizeorigin_y + mySize_y)

                                continue;
 
                        dist_x = resizeorigin_x - targEndPos_x;
                                continue;
 
                        dist_x = resizeorigin_x - targEndPos_x;


@@ -1118,13 +1118,13 @@ vector HUD_Panel_CheckResize(float id, vector mySize, vector resizeorigin, float
                }
                else if (resizeCorner == 4)
                {
                }
                else if (resizeCorner == 4)
                {

-                       if (resizeorigin_x > targEndPos_x)
+                       if (resizeorigin_x >= targEndPos_x)

                                continue;
                                continue;

-                       if (resizeorigin_y > targEndPos_y)
+                       if (resizeorigin_y >= targEndPos_y)

                                continue;
                                continue;

-                       if (targPos_x > resizeorigin_x + mySize_x)
+                       if (targPos_x >= resizeorigin_x + mySize_x)

                                continue;
                                continue;

-                       if (targPos_y > resizeorigin_y + mySize_y)
+                       if (targPos_y >= resizeorigin_y + mySize_y)

                                continue;
 
                        dist_x = targPos_x - resizeorigin_x;
                                continue;
 
                        dist_x = targPos_x - resizeorigin_x;