From: <bal...@us...> - 2004-01-01 15:41:41
|
Update of /cvsroot/gemrb/gemrb/gemrb/plugins/Core In directory sc8-pr-cvs1:/tmp/cvs-serv18122/gemrb/plugins/Core Modified Files: Region.h Region.cpp Log Message: Region.cpp / .h : - Added Normalize function Index: Region.h =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Region.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Region.h 15 Dec 2003 09:30:19 -0000 1.6 --- Region.h 1 Jan 2004 15:41:37 -0000 1.7 *************** *** 53,56 **** --- 53,57 ---- bool PointInside(unsigned short XPos, unsigned short YPos); bool InsideRegion(Region &rgn); + void Normalize(); }; Index: Region.cpp =================================================================== RCS file: /cvsroot/gemrb/gemrb/gemrb/plugins/Core/Region.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Region.cpp 15 Dec 2003 09:30:19 -0000 1.7 --- Region.cpp 1 Jan 2004 15:41:37 -0000 1.8 *************** *** 105,106 **** --- 105,124 ---- return true; } + + void Region::Normalize() + { + if(x > w) { + int tmp = x; + x = w; + w = tmp-x; + } else { + w -= x; + } + if(y > h) { + int tmp = y; + y = h; + h = tmp-y; + } else { + h -= y; + } + } |