Przeglądaj źródła

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

master
kevin 11 lat temu
rodzic
commit
6602a6277a
2 zmienionych plików z 7 dodań i 7 usunięć
  1. 6
    6
      cmGr.c
  2. 1
    1
      cmGr.h

+ 6
- 6
cmGr.c Wyświetl plik

27
 
27
 
28
 typedef struct cmGrObj_str
28
 typedef struct cmGrObj_str
29
 {
29
 {
30
-  unsigned      id;         //
31
-  unsigned      cfgFlags;   // 
32
-  unsigned      stateFlags; // 
33
-  cmGrObjFunc_t f;          // 
34
-  cmGrVExt_t    wext;       // world coord's contained within this object (children of this object are contained by these extents)
30
+  unsigned      id;          //
31
+  unsigned      cfgFlags;    // 
32
+  unsigned      stateFlags;  // 
33
+  cmGrObjFunc_t f;           // 
34
+  cmGrVExt_t    wext;        // world coord's contained within this object (children of this object are contained by these extents)
35
   unsigned      wlimitFlags; // kLeftGrFl | kRightGrFl | kTopGrFl | kBottomGrFl
35
   unsigned      wlimitFlags; // kLeftGrFl | kRightGrFl | kTopGrFl | kBottomGrFl
36
-  cmGrVExt_t    wlimitExt;  // limit extents for wext (ext's with set flags always define the associated wext value)
36
+  cmGrVExt_t    wlimitExt;   // limit extents for wext (ext's with set flags always define the associated wext value)
37
 
37
 
38
   struct cmGrObj_str* parent;
38
   struct cmGrObj_str* parent;
39
   struct cmGrObj_str* children;
39
   struct cmGrObj_str* children;

+ 1
- 1
cmGr.h Wyświetl plik

445
 #define   cmGrPExtIsNullOrEmpty(e) (cmGrPExtIsNull(e)||cmGrPExtIsEmpty(e))
445
 #define   cmGrPExtIsNullOrEmpty(e) (cmGrPExtIsNull(e)||cmGrPExtIsEmpty(e))
446
 #define   cmGrPExtIsNotEmpty(e) (!cmGrPExtIsEmpty(e))
446
 #define   cmGrPExtIsNotEmpty(e) (!cmGrPExtIsEmpty(e))
447
 #define   cmGrPExtIsNotNull(e)  (!cmGrPExtIsNull(e))
447
 #define   cmGrPExtIsNotNull(e)  (!cmGrPExtIsNull(e))
448
-#define   cmGrPExtIsNotNullOrEmpty(e) (cmGrPExtIsNotNull(e)||cmGrPExtIsNoEmpty(e))
448
+#define   cmGrPExtIsNotNullOrEmpty(e) (cmGrPExtIsNotNull(e)&&cmGrPExtIsNotEmpty(e))
449
 
449
 
450
 #define   cmGrPExtIsEqual( e0, e1 ) (cmGrPPtIsEqual(&(e0)->loc,&(e1)->loc) && cmGrPSzIsEqual(&(e0)->sz, &(e1)->sz))
450
 #define   cmGrPExtIsEqual( e0, e1 ) (cmGrPPtIsEqual(&(e0)->loc,&(e1)->loc) && cmGrPSzIsEqual(&(e0)->sz, &(e1)->sz))
451
 
451
 

Ładowanie…
Anuluj
Zapisz