*Merge.

--HG-- branch : trunk
2009-02-24 21:14:00 -06:00
parent 65a933c6c1 8770a90bc6
commit 5fda499266
10 changed files with 244 additions and 379 deletions
@@ -96,24 +96,32 @@ struct TRINITY_DLL_DECL CoordPair
    {
        if( x_coord >= val )
            x_coord -= val;
+        else
+            x_coord = 0;
    }

    void operator>>(const uint32 val)
    {
        if( x_coord+val < LIMIT )
            x_coord += val;
+        else
+            x_coord = LIMIT - 1;
    }

    void operator-=(const uint32 val)
    {
        if( y_coord >= val )
            y_coord -= val;
+        else
+            y_coord = 0;
    }

    void operator+=(const uint32 val)
    {
        if( y_coord+val < LIMIT )
            y_coord += val;
+        else
+            y_coord = LIMIT - 1;
    }

    uint32 x_coord;