cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGr.h/c Fixed logic bug in cmGrPExtIsNotNullOrEmpty()

Browse Source
This commit is contained in:
kevin 2013-01-13 16:36:00 -08:00
parent 2b6a272d55
commit 6602a6277a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmGr.c
View File

@ -27,13 +27,13 @@ enum
typedef struct cmGrObj_str typedef struct cmGrObj_str
{ {
unsigned id; // unsigned id; //
unsigned cfgFlags; // unsigned cfgFlags; //
unsigned stateFlags; // unsigned stateFlags; //
cmGrObjFunc_t f; // cmGrObjFunc_t f; //
cmGrVExt_t wext; // world coord's contained within this object (children of this object are contained by these extents) cmGrVExt_t wext; // world coord's contained within this object (children of this object are contained by these extents)
unsigned wlimitFlags; // kLeftGrFl | kRightGrFl | kTopGrFl | kBottomGrFl unsigned wlimitFlags; // kLeftGrFl | kRightGrFl | kTopGrFl | kBottomGrFl
cmGrVExt_t wlimitExt; // limit extents for wext (ext's with set flags always define the associated wext value) cmGrVExt_t wlimitExt; // limit extents for wext (ext's with set flags always define the associated wext value)
struct cmGrObj_str* parent; struct cmGrObj_str* parent;
struct cmGrObj_str* children; struct cmGrObj_str* children;

2
cmGr.h
View File

@ -445,7 +445,7 @@ extern "C" {
#define cmGrPExtIsNullOrEmpty(e) (cmGrPExtIsNull(e)||cmGrPExtIsEmpty(e)) #define cmGrPExtIsNullOrEmpty(e) (cmGrPExtIsNull(e)||cmGrPExtIsEmpty(e))
#define cmGrPExtIsNotEmpty(e) (!cmGrPExtIsEmpty(e)) #define cmGrPExtIsNotEmpty(e) (!cmGrPExtIsEmpty(e))
#define cmGrPExtIsNotNull(e) (!cmGrPExtIsNull(e)) #define cmGrPExtIsNotNull(e) (!cmGrPExtIsNull(e))
#define cmGrPExtIsNotNullOrEmpty(e) (cmGrPExtIsNotNull(e)||cmGrPExtIsNoEmpty(e)) #define cmGrPExtIsNotNullOrEmpty(e) (cmGrPExtIsNotNull(e)&&cmGrPExtIsNotEmpty(e))
#define cmGrPExtIsEqual( e0, e1 ) (cmGrPPtIsEqual(&(e0)->loc,&(e1)->loc) && cmGrPSzIsEqual(&(e0)->sz, &(e1)->sz)) #define cmGrPExtIsEqual( e0, e1 ) (cmGrPPtIsEqual(&(e0)->loc,&(e1)->loc) && cmGrPSzIsEqual(&(e0)->sz, &(e1)->sz))