changes for c++20

FactoryCraft/Chunk.cpp

@@ -534,7 +534,8 @@ void Chunk::setBlock(Block* block)
     if (blocks[index])
     {
         vcs.lock();
-        for (Framework::Iterator<Block*> vi = visibleBlocks.begin(); vi; vi++)
+        for (Framework::ArrayIterator<Block*> vi = visibleBlocks.begin(); vi;
+             vi++)
         {
             if (blocks[index] == (Block*)vi)
             {
@@ -573,7 +574,8 @@ void Chunk::removeBlock(Block* zBlock)
 {
     cs.lock();
     vcs.lock();
-    for (Framework::Iterator<Block*> iterator = visibleBlocks.begin(); iterator;
+    for (Framework::ArrayIterator<Block*> iterator = visibleBlocks.begin();
+         iterator;
          iterator++)
     {
         if (zBlock == (Block*)iterator)
@@ -608,7 +610,7 @@ void Chunk::blockVisibilityChanged(Block* zB)
     }
     else
     {
-        for (Framework::Iterator<Block*> iterator = visibleBlocks.begin();
+        for (Framework::ArrayIterator<Block*> iterator = visibleBlocks.begin();
              iterator;
              iterator++)
         {

FactoryCraft/CustomUIDX11PixelShader.h

@@ -355,10 +355,10 @@ ret
 
 const BYTE CustomUIDX11PixelShader[] =
 {
-     68,  88,  66,  67, 191, 151, 
-     62, 112, 131, 225, 225,  40, 
-    177,  98,  45,  73, 216, 188, 
-     84, 100,   1,   0,   0,   0, 
+     68,  88,  66,  67, 244, 169, 
+     24, 149,  97,  67,   4,  17, 
+     33, 188,  39,  90,  96,  44, 
+     32, 253,   1,   0,   0,   0, 
     192, 137,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     252,   4,   0,   0, 188,   5, 
@@ -1625,10 +1625,10 @@ const BYTE CustomUIDX11PixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0, 148,  46,  49,   1, 
-    164, 243, 133, 101,   1,   0, 
-      0,   0,  23,  19, 158,   2, 
-    168, 228,  36,  73, 135, 217, 
-     88, 113,  83, 214, 235, 111, 
+    196, 129, 198, 101,   1,   0, 
+      0,   0, 224,  49, 184, 181, 
+     64, 159, 201,  74, 134,  57, 
+    135, 142,  53, 218,  32, 245, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   1,   0,   0,   0, 
       1,   0,   0,   0,   0,   0, 
@@ -1801,10 +1801,10 @@ const BYTE CustomUIDX11PixelShader[] =
       3,   0,  28,  19,   2,   0, 
      65,  36,   1,   0, 236, 179, 
       1,   0, 125, 226,   0,   0, 
-     21, 230,   0,   0,  40, 197, 
-      1,   0,  73,  20,   1,   0, 
-    153, 189,   3,   0,  98, 105, 
-      0,   0, 209,  10,   2,   0, 
+     21, 230,   0,   0, 136,  83, 
+      3,   0,  73,  20,   1,   0, 
+    153, 189,   3,   0, 250, 253, 
+      2,   0, 209,  10,   2,   0, 
      53, 174,   3,   0, 146, 230, 
       3,   0,  98, 163,   2,   0, 
     118,  19,   1,   0, 140, 144, 
@@ -3076,8 +3076,8 @@ const BYTE CustomUIDX11PixelShader[] =
      32,  32,  32,  32,  32,  32, 
      32,  32,  32,  32,  32,  32, 
      27, 226,  48,   1, 128,   0, 
-      0,   0, 194, 152, 195, 190, 
-     22,  53, 218,   1,   1,   0, 
+      0,   0, 183,  56,   5,  21, 
+    145,  91, 218,   1,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3163,9 +3163,9 @@ const BYTE CustomUIDX11PixelShader[] =
       0,   0,   4,   0,   0,   0, 
      66,   0,  60,  17,  16,   1, 
       0,   0,   0,   1,  10,   0, 
-      1,   0, 173,   2,  97,  74, 
-     10,   0,   1,   0, 173,   2, 
-     97,  74,  77, 105,  99, 114, 
+      1,   0, 124,   9,  93,  88, 
+     10,   0,   1,   0, 124,   9, 
+     93,  88,  77, 105,  99, 114, 
     111, 115, 111, 102, 116,  32, 
      40,  82,  41,  32,  72,  76, 
      83,  76,  32,  83, 104,  97, 
@@ -4330,13 +4330,13 @@ const BYTE CustomUIDX11PixelShader[] =
       8,  16,   0,   0,   1,   0, 
       0,   2,  14,   0,  23,  21, 
       0,  16,   0,   0,   3,   2, 
-     32, 135,   0,   0, 242, 241, 
+    160, 234,   0,   0, 242, 241, 
      10,   0,  24,  21,  10,  16, 
       0,   0,   1,   0,   1,   0, 
      10,   0,  24,  21,  11,  16, 
       0,   0,   1,   0,   0,   2, 
      14,   0,  23,  21,   0,   0, 
-      0,   0,  10,   2,  32, 135, 
+      0,   0,  10,   2, 160, 234, 
       0,   0, 242, 241,  10,   0, 
      24,  21,  13,  16,   0,   0, 
       1,   0,   1,   0,  10,   0, 
@@ -5805,62 +5805,77 @@ const BYTE CustomUIDX11PixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0, 148,  46, 
-     49,   1, 164, 243, 133, 101, 
-      1,   0,   0,   0,  23,  19, 
-    158,   2, 168, 228,  36,  73, 
-    135, 217,  88, 113,  83, 214, 
-    235, 111, 174,   0,   0,   0, 
-     47,  76, 105, 110, 107,  73, 
-    110, 102, 111,   0,  47, 110, 
-     97, 109, 101, 115,   0,  47, 
-    115, 114,  99,  47, 104, 101, 
-     97, 100, 101, 114,  98, 108, 
-    111,  99, 107,   0,  47, 115, 
-    114,  99,  47, 102, 105, 108, 
-    101, 115,  47,  99,  58,  92, 
-    117, 115, 101, 114, 115,  92, 
-    107, 111, 108, 106,  97,  92, 
-    100, 101, 115, 107, 116, 111, 
-    112,  92, 107, 111, 108, 106, 
-     97,  45, 115, 116, 114, 111, 
-    104, 109,  45, 103,  97, 109, 
-    101, 115,  92, 115, 112, 105, 
-    101, 108, 101,  32, 112, 108, 
-     97, 116, 102, 111, 114, 109, 
-     92, 115, 116,  97, 110, 100, 
-     97, 108, 111, 119, 110,  92, 
-    107, 108, 105, 101, 110, 116, 
-     92, 102,  97,  99, 116, 111, 
-    114, 121,  99, 114,  97, 102, 
-    116,  92, 102,  97,  99, 116, 
-    111, 114, 121,  99, 114,  97, 
-    102, 116,  92, 100, 120,  49, 
-     49,  99, 117, 115, 116, 111, 
-    109, 112, 105, 120, 101, 108, 
-    115, 104,  97, 100, 101, 114, 
-     46, 104, 108, 115, 108,   0, 
-      4,   0,   0,   0,   6,   0, 
-      0,   0,   1,   0,   0,   0, 
-     58,   0,   0,   0,   0,   0, 
-      0,   0,  17,   0,   0,   0, 
-      7,   0,   0,   0,  10,   0, 
-      0,   0,   6,   0,   0,   0, 
-      0,   0,   0,   0,   5,   0, 
-      0,   0,  34,   0,   0,   0, 
-      8,   0,   0,   0,   0,   0, 
-      0,   0, 220,  81,  51,   1, 
-      0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0, 255, 255, 
+    255, 255, 119,   9,  49,   1, 
+      1,   0,   0,   0,  13,   0, 
+     20, 142,  14,   0,  20, 107, 
+     15,   0,   1,   0,  88,   0, 
+      0,   0,  32,   0,   0,   0, 
+     44,   0,   0,   0, 144,   0, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,  22,   0, 
+      0,   0,  25,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      1,   0,   0,   0,   0,   0, 
+      0,   0,  36,  13,   0,   0, 
+     32,   0,   0,  96,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   2,   0, 
+      9,   0,  88,   9,   0,   0, 
+      0,   0,   0,   0, 156,  13, 
+      0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+     84, 101, 120, 116, 117, 114, 
+    101,  80, 105, 120, 101, 108, 
+     83, 104,  97, 100, 101, 114, 
+      0, 110, 111, 110, 101,   0, 
+     45, 186,  46, 241,   1,   0, 
       0,   0,   0,   0,   0,   0, 
+     36,  13,   0,   0,  32,   0, 
+      0,  96,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,   2,   0,   2,   0, 
+      7,   0,   0,   0,   0,   0, 
+      1,   0, 255, 255, 255, 255, 
+      0,   0,   0,   0,  36,  13, 
+      0,   0,   8,   2,   0,   0, 
+      0,   0,   0,   0, 255, 255, 
+    255, 255,   0,   0,   0,   0, 
+    255, 255, 255, 255,   1,   0, 
+      1,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,  67,  58, 
+     92,  85, 115, 101, 114, 115, 
+     92, 107, 111, 108, 106,  97, 
+     92,  68, 101, 115, 107, 116, 
+    111, 112,  92,  75, 111, 108, 
+    106,  97,  45,  83, 116, 114, 
+    111, 104, 109,  45,  71,  97, 
+    109, 101, 115,  92,  83, 112, 
+    105, 101, 108, 101,  32,  80, 
+    108,  97, 116, 102, 111, 114, 
+    109,  92,  83, 116,  97, 110, 
+    100,  97, 108, 111, 119, 110, 
+     92,  75, 108, 105, 101, 110, 
+    116,  92,  70,  97,  99, 116, 
+    111, 114, 121,  67, 114,  97, 
+    102, 116,  92,  70,  97,  99, 
+    116, 111, 114, 121,  67, 114, 
+     97, 102, 116,  92,  68,  88, 
+     49,  49,  67, 117, 115, 116, 
+    111, 109,  80, 105, 120, 101, 
+    108,  83, 104,  97, 100, 101, 
+    114,  46, 104, 108, 115, 108, 
+      0,   0,   0,   0, 254, 239, 
+    254, 239,   1,   0,   0,   0, 
+      1,   0,   0,   0,   0,   1, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 255, 
+    255, 255, 255, 255, 255, 255, 
+    255, 255, 255,  12,   0, 255, 
+    255, 255, 255, 255, 255, 255, 
+    255, 255, 255,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -5876,6 +5891,51 @@ const BYTE CustomUIDX11PixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+    148,  46,  49,   1, 196, 129, 
+    198, 101,   1,   0,   0,   0, 
+    224,  49, 184, 181,  64, 159, 
+    201,  74, 134,  57, 135, 142, 
+     53, 218,  32, 245, 174,   0, 
+      0,   0,  47,  76, 105, 110, 
+    107,  73, 110, 102, 111,   0, 
+     47, 110,  97, 109, 101, 115, 
+      0,  47, 115, 114,  99,  47, 
+    104, 101,  97, 100, 101, 114, 
+     98, 108, 111,  99, 107,   0, 
+     47, 115, 114,  99,  47, 102, 
+    105, 108, 101, 115,  47,  99, 
+     58,  92, 117, 115, 101, 114, 
+    115,  92, 107, 111, 108, 106, 
+     97,  92, 100, 101, 115, 107, 
+    116, 111, 112,  92, 107, 111, 
+    108, 106,  97,  45, 115, 116, 
+    114, 111, 104, 109,  45, 103, 
+     97, 109, 101, 115,  92, 115, 
+    112, 105, 101, 108, 101,  32, 
+    112, 108,  97, 116, 102, 111, 
+    114, 109,  92, 115, 116,  97, 
+    110, 100,  97, 108, 111, 119, 
+    110,  92, 107, 108, 105, 101, 
+    110, 116,  92, 102,  97,  99, 
+    116, 111, 114, 121,  99, 114, 
+     97, 102, 116,  92, 102,  97, 
+     99, 116, 111, 114, 121,  99, 
+    114,  97, 102, 116,  92, 100, 
+    120,  49,  49,  99, 117, 115, 
+    116, 111, 109, 112, 105, 120, 
+    101, 108, 115, 104,  97, 100, 
+    101, 114,  46, 104, 108, 115, 
+    108,   0,   4,   0,   0,   0, 
+      6,   0,   0,   0,   1,   0, 
+      0,   0,  58,   0,   0,   0, 
+      0,   0,   0,   0,  17,   0, 
+      0,   0,   7,   0,   0,   0, 
+     10,   0,   0,   0,   6,   0, 
+      0,   0,   0,   0,   0,   0, 
+      5,   0,   0,   0,  34,   0, 
+      0,   0,   8,   0,   0,   0, 
+      0,   0,   0,   0, 220,  81, 
+     51,   1,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -5891,76 +5951,16 @@ const BYTE CustomUIDX11PixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-    255, 255, 255, 255, 119,   9, 
-     49,   1,   1,   0,   0,   0, 
-     13,   0,   0, 142,  14,   0, 
-     63,  92,  15,   0,   0,   0, 
-     88,   0,   0,   0,  32,   0, 
-      0,   0,  44,   0,   0,   0, 
-    144,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-     22,   0,   0,   0,  25,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   0,   0,   0,  36,  13, 
-      0,   0,  32,   0,   0,  96, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      2,   0,   9,   0,  88,   9, 
       0,   0,   0,   0,   0,   0, 
-    156,  13,   0,   0,   1,   0, 
-    162, 241,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,  84, 101, 120, 116, 
-    117, 114, 101,  80, 105, 120, 
-    101, 108,  83, 104,  97, 100, 
-    101, 114,   0, 110, 111, 110, 
-    101,   0,  45, 186,  46, 241, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,  36,  13,   0,   0, 
-     32,   0,   0,  96,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   2,   0, 
-      2,   0,   7,   0,   0,   0, 
-      0,   0,   1,   0, 255, 255, 
-    255, 255,   0,   0,   0,   0, 
-     36,  13,   0,   0,   8,   2, 
       0,   0,   0,   0,   0,   0, 
-    255, 255, 255, 255,   0,   0, 
-      0,   0, 255, 255, 255, 255, 
-      1,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-     67,  58,  92,  85, 115, 101, 
-    114, 115,  92, 107, 111, 108, 
-    106,  97,  92,  68, 101, 115, 
-    107, 116, 111, 112,  92,  75, 
-    111, 108, 106,  97,  45,  83, 
-    116, 114, 111, 104, 109,  45, 
-     71,  97, 109, 101, 115,  92, 
-     83, 112, 105, 101, 108, 101, 
-     32,  80, 108,  97, 116, 102, 
-    111, 114, 109,  92,  83, 116, 
-     97, 110, 100,  97, 108, 111, 
-    119, 110,  92,  75, 108, 105, 
-    101, 110, 116,  92,  70,  97, 
-     99, 116, 111, 114, 121,  67, 
-    114,  97, 102, 116,  92,  70, 
-     97,  99, 116, 111, 114, 121, 
-     67, 114,  97, 102, 116,  92, 
-     68,  88,  49,  49,  67, 117, 
-    115, 116, 111, 109,  80, 105, 
-    120, 101, 108,  83, 104,  97, 
-    100, 101, 114,  46, 104, 108, 
-    115, 108,   0,   0,   0,   0, 
-    254, 239, 254, 239,   1,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0, 255, 255, 255, 255, 255, 
-    255, 255, 255, 255, 255,  12, 
-      0, 255, 255, 255, 255, 255, 
-    255, 255, 255, 255, 255,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -5988,9 +5988,9 @@ const BYTE CustomUIDX11PixelShader[] =
      40,   0,   0,   0, 152,   2, 
       0,   0,  44,   0,   0,   0, 
     148,   1,   0,   0,   3,   0, 
-      0,   0,  54,   0,   0,   0, 
-     36,   0,   0,   0,  35,   0, 
       0,   0,  55,   0,   0,   0, 
+     36,   0,   0,   0,  35,   0, 
+      0,   0,  54,   0,   0,   0, 
      37,   0,   0,   0,  21,   0, 
       0,   0,   6,   0,   0,   0, 
      38,   0,   0,   0,  39,   0, 

FactoryCraft/CustomUIDX11VertexShader.h

@@ -281,10 +281,10 @@ ret
 
 const BYTE CustomUIDX11VertexShader[] =
 {
-     68,  88,  66,  67, 184, 172, 
-     19,  20, 125,  13,  39, 195, 
-     78, 196,  13, 203,  75, 123, 
-     83,  69,   1,   0,   0,   0, 
+     68,  88,  66,  67, 141,  86, 
+     46,  98, 117,  98,  66,  24, 
+    112,  42, 114,  86, 171,  10, 
+    144, 176,   1,   0,   0,   0, 
     124, 103,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
      76,   4,   0,   0,   4,   5, 
@@ -1454,11 +1454,11 @@ const BYTE CustomUIDX11VertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0, 148,  46, 
-     49,   1, 164, 243, 133, 101, 
-      1,   0,   0,   0,   5, 186, 
-    129,  64,   1,  16, 240,  73, 
-    165,  91, 189,  20, 196, 211, 
-    255,  66,   0,   0,   0,   0, 
+     49,   1, 196, 129, 198, 101, 
+      1,   0,   0,   0,  21, 208, 
+    191,  88,  45, 179,  96,  75, 
+    180, 189, 160, 138, 143, 245, 
+    246, 110,   0,   0,   0,   0, 
       0,   0,   0,   0,   1,   0, 
       0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2393,8 +2393,8 @@ const BYTE CustomUIDX11VertexShader[] =
     106, 101,  99, 116, 105, 111, 
     110,  59,  13,  10, 125,  13, 
      10,  13,  27, 226,  48,   1, 
-    128,   0,   0,   0, 204, 131, 
-    225, 190,  22,  53, 218,   1, 
+    128,   0,   0,   0,  32, 146, 
+     37,  21, 145,  91, 218,   1, 
       1,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2480,9 +2480,9 @@ const BYTE CustomUIDX11VertexShader[] =
       0,   0,   0,   0,   4,   0, 
       0,   0,  66,   0,  60,  17, 
      16,   1,   0,   0,   0,   1, 
-     10,   0,   1,   0, 173,   2, 
-     97,  74,  10,   0,   1,   0, 
-    173,   2,  97,  74,  77, 105, 
+     10,   0,   1,   0, 124,   9, 
+     93,  88,  10,   0,   1,   0, 
+    124,   9,  93,  88,  77, 105, 
      99, 114, 111, 115, 111, 102, 
     116,  32,  40,  82,  41,  32, 
      72,  76,  83,  76,  32,  83, 
@@ -4355,62 +4355,77 @@ const BYTE CustomUIDX11VertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-    148,  46,  49,   1, 164, 243, 
-    133, 101,   1,   0,   0,   0, 
-      5, 186, 129,  64,   1,  16, 
-    240,  73, 165,  91, 189,  20, 
-    196, 211, 255,  66, 175,   0, 
-      0,   0,  47,  76, 105, 110, 
-    107,  73, 110, 102, 111,   0, 
-     47, 110,  97, 109, 101, 115, 
-      0,  47, 115, 114,  99,  47, 
-    104, 101,  97, 100, 101, 114, 
-     98, 108, 111,  99, 107,   0, 
-     47, 115, 114,  99,  47, 102, 
-    105, 108, 101, 115,  47,  99, 
-     58,  92, 117, 115, 101, 114, 
-    115,  92, 107, 111, 108, 106, 
-     97,  92, 100, 101, 115, 107, 
-    116, 111, 112,  92, 107, 111, 
-    108, 106,  97,  45, 115, 116, 
-    114, 111, 104, 109,  45, 103, 
-     97, 109, 101, 115,  92, 115, 
-    112, 105, 101, 108, 101,  32, 
-    112, 108,  97, 116, 102, 111, 
-    114, 109,  92, 115, 116,  97, 
-    110, 100,  97, 108, 111, 119, 
-    110,  92, 107, 108, 105, 101, 
-    110, 116,  92, 102,  97,  99, 
-    116, 111, 114, 121,  99, 114, 
-     97, 102, 116,  92, 102,  97, 
-     99, 116, 111, 114, 121,  99, 
-    114,  97, 102, 116,  92, 100, 
-    120,  49,  49,  99, 117, 115, 
-    116, 111, 109, 118, 101, 114, 
-    116, 101, 120, 115, 104,  97, 
-    100, 101, 114,  46, 104, 108, 
-    115, 108,   0,   4,   0,   0, 
-      0,   6,   0,   0,   0,   1, 
-      0,   0,   0,  30,   0,   0, 
-      0,   0,   0,   0,   0,  17, 
-      0,   0,   0,   7,   0,   0, 
-      0,  34,   0,   0,   0,   8, 
-      0,   0,   0,  10,   0,   0, 
-      0,   6,   0,   0,   0,   0, 
-      0,   0,   0,   5,   0,   0, 
-      0,   0,   0,   0,   0, 220, 
-     81,  51,   1,   0,   0,   0, 
+    255, 255, 255, 255, 119,   9, 
+     49,   1,   1,   0,   0,   0, 
+     13,   0,  20, 142,  14,   0, 
+     20, 107,  15,   0,   1,   0, 
+     92,   0,   0,   0,  32,   0, 
+      0,   0,  44,   0,   0,   0, 
+    144,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+     22,   0,   0,   0,  25,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,   1,   0,   0,   0, 
+      0,   0,   0,   0,  12,  11, 
+      0,   0,  32,   0,   0,  96, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      2,   0,   9,   0, 148,   7, 
       0,   0,   0,   0,   0,   0, 
+    220,   9,   0,   0,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,  84, 101, 120, 116, 
+    117, 114, 101,  86, 101, 114, 
+    116, 101, 120,  83, 104,  97, 
+    100, 101, 114,   0, 110, 111, 
+    110, 101,   0,   0,   0,   0, 
+     45, 186,  46, 241,   1,   0, 
       0,   0,   0,   0,   0,   0, 
+     12,  11,   0,   0,  32,   0, 
+      0,  96,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,   2,   0,   2,   0, 
+      7,   0,   0,   0,   0,   0, 
+      1,   0, 255, 255, 255, 255, 
+      0,   0,   0,   0,  12,  11, 
+      0,   0,   8,   2,   0,   0, 
+      0,   0,   0,   0, 255, 255, 
+    255, 255,   0,   0,   0,   0, 
+    255, 255, 255, 255,   1,   0, 
+      1,   0,   0,   0,   1,   0, 
+      0,   0,   0,   0,  67,  58, 
+     92,  85, 115, 101, 114, 115, 
+     92, 107, 111, 108, 106,  97, 
+     92,  68, 101, 115, 107, 116, 
+    111, 112,  92,  75, 111, 108, 
+    106,  97,  45,  83, 116, 114, 
+    111, 104, 109,  45,  71,  97, 
+    109, 101, 115,  92,  83, 112, 
+    105, 101, 108, 101,  32,  80, 
+    108,  97, 116, 102, 111, 114, 
+    109,  92,  83, 116,  97, 110, 
+    100,  97, 108, 111, 119, 110, 
+     92,  75, 108, 105, 101, 110, 
+    116,  92,  70,  97,  99, 116, 
+    111, 114, 121,  67, 114,  97, 
+    102, 116,  92,  70,  97,  99, 
+    116, 111, 114, 121,  67, 114, 
+     97, 102, 116,  92,  68,  88, 
+     49,  49,  67, 117, 115, 116, 
+    111, 109,  86, 101, 114, 116, 
+    101, 120,  83, 104,  97, 100, 
+    101, 114,  46, 104, 108, 115, 
+    108,   0,   0,   0, 254, 239, 
+    254, 239,   1,   0,   0,   0, 
+      1,   0,   0,   0,   0,   1, 
       0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0, 255, 
+    255, 255, 255, 255, 255, 255, 
+    255, 255, 255,  12,   0, 255, 
+    255, 255, 255, 255, 255, 255, 
+    255, 255, 255,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -4425,6 +4440,54 @@ const BYTE CustomUIDX11VertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
+      0,   0, 148,  46,  49,   1, 
+    196, 129, 198, 101,   1,   0, 
+      0,   0,  21, 208, 191,  88, 
+     45, 179,  96,  75, 180, 189, 
+    160, 138, 143, 245, 246, 110, 
+    175,   0,   0,   0,  47,  76, 
+    105, 110, 107,  73, 110, 102, 
+    111,   0,  47, 110,  97, 109, 
+    101, 115,   0,  47, 115, 114, 
+     99,  47, 104, 101,  97, 100, 
+    101, 114,  98, 108, 111,  99, 
+    107,   0,  47, 115, 114,  99, 
+     47, 102, 105, 108, 101, 115, 
+     47,  99,  58,  92, 117, 115, 
+    101, 114, 115,  92, 107, 111, 
+    108, 106,  97,  92, 100, 101, 
+    115, 107, 116, 111, 112,  92, 
+    107, 111, 108, 106,  97,  45, 
+    115, 116, 114, 111, 104, 109, 
+     45, 103,  97, 109, 101, 115, 
+     92, 115, 112, 105, 101, 108, 
+    101,  32, 112, 108,  97, 116, 
+    102, 111, 114, 109,  92, 115, 
+    116,  97, 110, 100,  97, 108, 
+    111, 119, 110,  92, 107, 108, 
+    105, 101, 110, 116,  92, 102, 
+     97,  99, 116, 111, 114, 121, 
+     99, 114,  97, 102, 116,  92, 
+    102,  97,  99, 116, 111, 114, 
+    121,  99, 114,  97, 102, 116, 
+     92, 100, 120,  49,  49,  99, 
+    117, 115, 116, 111, 109, 118, 
+    101, 114, 116, 101, 120, 115, 
+    104,  97, 100, 101, 114,  46, 
+    104, 108, 115, 108,   0,   4, 
+      0,   0,   0,   6,   0,   0, 
+      0,   1,   0,   0,   0,  30, 
+      0,   0,   0,   0,   0,   0, 
+      0,  17,   0,   0,   0,   7, 
+      0,   0,   0,  34,   0,   0, 
+      0,   8,   0,   0,   0,  10, 
+      0,   0,   0,   6,   0,   0, 
+      0,   0,   0,   0,   0,   5, 
+      0,   0,   0,   0,   0,   0, 
+      0, 220,  81,  51,   1,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -4440,77 +4503,14 @@ const BYTE CustomUIDX11VertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0, 255, 255, 255, 255, 
-    119,   9,  49,   1,   1,   0, 
-      0,   0,  13,   0,   0, 142, 
-     14,   0,  63,  92,  15,   0, 
-      0,   0,  92,   0,   0,   0, 
-     32,   0,   0,   0,  44,   0, 
-      0,   0, 144,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,  22,   0,   0,   0, 
-     25,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   1,   0, 
       0,   0,   0,   0,   0,   0, 
-     12,  11,   0,   0,  32,   0, 
-      0,  96,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   2,   0,   9,   0, 
-    148,   7,   0,   0,   0,   0, 
-      0,   0, 220,   9,   0,   0, 
-      1,   0,   6, 223,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,  84, 101, 
-    120, 116, 117, 114, 101,  86, 
-    101, 114, 116, 101, 120,  83, 
-    104,  97, 100, 101, 114,   0, 
-    110, 111, 110, 101,   0,   0, 
-      0,   0,  45, 186,  46, 241, 
-      1,   0,   0,   0,   0,   0, 
-      0,   0,  12,  11,   0,   0, 
-     32,   0,   0,  96,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   0,   2,   0, 
-      2,   0,   7,   0,   0,   0, 
-      0,   0,   1,   0, 255, 255, 
-    255, 255,   0,   0,   0,   0, 
-     12,  11,   0,   0,   8,   2, 
       0,   0,   0,   0,   0,   0, 
-    255, 255, 255, 255,   0,   0, 
-      0,   0, 255, 255, 255, 255, 
-      1,   0,   1,   0,   0,   0, 
-      1,   0,   0,   0,   0,   0, 
-     67,  58,  92,  85, 115, 101, 
-    114, 115,  92, 107, 111, 108, 
-    106,  97,  92,  68, 101, 115, 
-    107, 116, 111, 112,  92,  75, 
-    111, 108, 106,  97,  45,  83, 
-    116, 114, 111, 104, 109,  45, 
-     71,  97, 109, 101, 115,  92, 
-     83, 112, 105, 101, 108, 101, 
-     32,  80, 108,  97, 116, 102, 
-    111, 114, 109,  92,  83, 116, 
-     97, 110, 100,  97, 108, 111, 
-    119, 110,  92,  75, 108, 105, 
-    101, 110, 116,  92,  70,  97, 
-     99, 116, 111, 114, 121,  67, 
-    114,  97, 102, 116,  92,  70, 
-     97,  99, 116, 111, 114, 121, 
-     67, 114,  97, 102, 116,  92, 
-     68,  88,  49,  49,  67, 117, 
-    115, 116, 111, 109,  86, 101, 
-    114, 116, 101, 120,  83, 104, 
-     97, 100, 101, 114,  46, 104, 
-    108, 115, 108,   0,   0,   0, 
-    254, 239, 254, 239,   1,   0, 
-      0,   0,   1,   0,   0,   0, 
-      0,   1,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-      0, 255, 255, 255, 255, 255, 
-    255, 255, 255, 255, 255,  12, 
-      0, 255, 255, 255, 255, 255, 
-    255, 255, 255, 255, 255,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -4537,9 +4537,9 @@ const BYTE CustomUIDX11VertexShader[] =
       0,   0,  40,   0,   0,   0, 
     104,   2,   0,   0,  44,   0, 
       0,   0, 232,   0,   0,   0, 
-      3,   0,   0,   0,  39,   0, 
+      3,   0,   0,   0,  40,   0, 
       0,   0,  27,   0,   0,   0, 
-     26,   0,   0,   0,  40,   0, 
+     26,   0,   0,   0,  39,   0, 
       0,   0,  28,   0,   0,   0, 
      15,   0,   0,   0,   6,   0, 
       0,   0,  29,   0,   0,   0, 

FactoryCraft/DimensionMap.cpp

@@ -499,7 +499,7 @@ void DimensionMap::render(Framework::Bild& rObj)
         TextRenderer tm(
             dynamic_cast<Schrift*>(uiFactory.initParam.schrift->getThis()));
         tm.setSchriftSize(12);
-        for (MapPlayer& player : players)
+        for (const MapPlayer& player : players)
         {
             Punkt screenPos
                 = getSize() / 2 - scrollOffset

FactoryCraft/DragController.h

@@ -1,8 +1,10 @@
 #pragma once
 
+#include <Bild.h>
 #include <Zeichnung.h>
 
 #include "DragElement.h"
+#include "Globals.h"
 
 template<typename Source, typename Element> class DragController
     : public Framework::ReferenceCounter
@@ -34,7 +36,8 @@ public:
         std::function<void()> onDragEnd)
     {
         if (this->container) stopDrag();
-        ((BildZ*)drag)->setBildZ(dynamic_cast<Bild*>(zDragDisplay->getThis()));
+        ((Framework::BildZ*)drag)
+            ->setBildZ(dynamic_cast<Framework::Bild*>(zDragDisplay->getThis()));
         window->zBildschirm()->addMember(
             dynamic_cast<Zeichnung*>(drag->getThis()));
         this->container = container;

FactoryCraft/FactoryClient.cpp

@@ -332,7 +332,7 @@ void FactoryClient::endMessageReading(bool bg)
         fgReaderUsage--;
 }
 
-void FactoryClient::sendPlayerAction(char* data, unsigned short length)
+void FactoryClient::sendPlayerAction(const char* data, unsigned short length)
 {
     if (!foreground) return;
     cs.lock();
@@ -365,7 +365,7 @@ void FactoryClient::sendPlayerMovement(MovementFrame& frame)
 }
 
 void FactoryClient::entityAPIRequest(
-    int entityId, char* message, unsigned short length)
+    int entityId, const char* message, unsigned short length)
 {
     if (!foreground) return;
     cs.lock();
@@ -379,7 +379,7 @@ void FactoryClient::entityAPIRequest(
 }
 
 void FactoryClient::blockAPIRequest(
-    Vec3<int> pos, char* message, unsigned short length)
+    Vec3<int> pos, const char* message, unsigned short length)
 {
     if (!foreground) return;
     cs.lock();
@@ -396,7 +396,7 @@ void FactoryClient::blockAPIRequest(
 }
 
 void FactoryClient::blockAPIRequest(
-    int dimensionId, Vec3<int> pos, char* message, unsigned short length)
+    int dimensionId, Vec3<int> pos, const char* message, unsigned short length)
 {
     if (!foreground) return;
     cs.lock();
@@ -415,7 +415,7 @@ void FactoryClient::blockAPIRequest(
 }
 
 void FactoryClient::chunkAPIRequest(
-    Punkt center, char* message, unsigned short length)
+    Punkt center, const char* message, unsigned short length)
 {
     if (!foreground) return;
     length += 10;
@@ -431,7 +431,8 @@ void FactoryClient::chunkAPIRequest(
     cs.unlock();
 }
 
-void FactoryClient::dimensionAPIRequest(char* message, unsigned short length)
+void FactoryClient::dimensionAPIRequest(
+    const char* message, unsigned short length)
 {
     if (!foreground) return;
     length += 1;
@@ -445,7 +446,7 @@ void FactoryClient::dimensionAPIRequest(char* message, unsigned short length)
 
 void FactoryClient::inventoryAPIRequest(
     Framework::Either<int, Framework::VecN<int, 4>> target,
-    char* message,
+    const char* message,
     unsigned short length)
 {
     if (!foreground) return;
@@ -474,7 +475,7 @@ void FactoryClient::inventoryAPIRequest(
 }
 
 void FactoryClient::uiRequest(
-    Framework::Text dialogId, char* message, unsigned short length)
+    Framework::Text dialogId, const char* message, unsigned short length)
 {
     if (!foreground) return;
     short nameLen = (short)dialogId.getLength();
@@ -517,7 +518,7 @@ void FactoryClient::sendChatMessage(Framework::Text message)
     cs.unlock();
 }
 
-void FactoryClient::chatAPIRequest(char* data, unsigned short length)
+void FactoryClient::chatAPIRequest(const char* data, unsigned short length)
 {
     if (!background) return;
     cs.lock();

FactoryCraft/FactoryClient.h

@@ -39,23 +39,28 @@ public:
     Network::NetworkReader* getNextForegroundMessage();
     Network::NetworkReader* getNextBackgroundMessage();
     void endMessageReading(bool bg);
-    void sendPlayerAction(char* data, unsigned short length);
+    void sendPlayerAction(const char* data, unsigned short length);
     void sendPlayerMovement(MovementFrame& frame);
-    void entityAPIRequest(int entityId, char* message, unsigned short length);
-    void blockAPIRequest(Vec3<int> pos, char* message, unsigned short length);
+    void entityAPIRequest(
+        int entityId, const char* message, unsigned short length);
     void blockAPIRequest(
-        int dimensionId, Vec3<int> pos, char* message, unsigned short length);
+        Vec3<int> pos, const char* message, unsigned short length);
+    void blockAPIRequest(int dimensionId,
+        Vec3<int> pos,
+        const char* message,
+        unsigned short length);
     void chunkAPIRequest(
-        Framework::Punkt center, char* message, unsigned short length);
-    void dimensionAPIRequest(char* message, unsigned short length);
+        Framework::Punkt center, const char* message, unsigned short length);
+    void dimensionAPIRequest(const char* message, unsigned short length);
     void inventoryAPIRequest(
         Framework::Either<int, Framework::VecN<int, 4>> target,
-        char* message,
+        const char* message,
         unsigned short length);
-    void uiRequest(Framework::Text dialogId, char* message, unsigned short length);
+    void uiRequest(
+        Framework::Text dialogId, const char* message, unsigned short length);
     void craftingUIMLRequest(int itemTypeId);
     void sendChatMessage(Framework::Text message);
-    void chatAPIRequest(char* data, unsigned short length);
+    void chatAPIRequest(const char* data, unsigned short length);
     bool isConnected();
     void leaveGame();
 };

FactoryCraft/FactoryCraft.vcxproj

@@ -109,7 +109,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FANGEN_EXPORTS;annotate#//;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <PreprocessToFile>false</PreprocessToFile>
     </ClCompile>
     <Link>
@@ -156,7 +156,7 @@ copy "..\..\..\..\..\Allgemein\Network\x64\Debug\Network.dll" "network.dll"</Com
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FANGEN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <PreprocessToFile>false</PreprocessToFile>
     </ClCompile>
     <Link>

FactoryCraft/Initialisierung.cpp

@@ -43,8 +43,7 @@ KontrollKnopf* createKontrollKnopf(const Framework::UIInitParam& params)
     ret->setHintergrundFarbe(0xFF000000);
     ret->setKAFFarbe(0xFF3d3d3d);
     ret->setKAFStrength(10);
-    ret->loadData(
-        "data/images/system.ltdb");
+    ret->loadData("data/images/system.ltdb");
     return ret;
 }
 
@@ -63,14 +62,14 @@ ObjTabelle* createObjTabelle(const Framework::UIInitParam& params)
 Fenster* createFenster(const Framework::UIInitParam& params)
 {
     Fenster* ret = Framework::defaultUI(params.schrift, params.bildschirm)
-                          .createFenster(params);
+                       .createFenster(params);
     ret->setTitel("");
     ret->zTTextFeld()->setRahmenFarbe(0xFF52525E);
     ret->setRFarbe(0xFF52525E);
     return ret;
 }
 
-Knopf* initKnopf(int x, int y, int br, int hö, __int64 style, char* titel)
+Knopf* initKnopf(int x, int y, int br, int hö, __int64 style, const char* titel)
 {
     Knopf* ret = uiFactory.createKnopf(uiFactory.initParam);
     ret->addStyle(style);
@@ -81,7 +80,7 @@ Knopf* initKnopf(int x, int y, int br, int h
 }
 
 KontrollKnopf* initKontrollKnopf(
-    int x, int y, int br, int hö, __int64 style, char* txt)
+    int x, int y, int br, int hö, __int64 style, const char* txt)
 {
     KontrollKnopf* ret = uiFactory.createKontrollKnopf(uiFactory.initParam);
     ret->addStyle(style);
@@ -92,7 +91,8 @@ KontrollKnopf* initKontrollKnopf(
     return ret;
 }
 
-Fenster* initFenster(int x, int y, int br, int hö, __int64 style, char* titel)
+Fenster* initFenster(
+    int x, int y, int br, int hö, __int64 style, const char* titel)
 {
     Fenster* ret = uiFactory.createFenster(uiFactory.initParam);
     ret->addStyle(style);
@@ -105,7 +105,8 @@ Fenster* initFenster(int x, int y, int br, int h
     return ret;
 }
 
-TextFeld* initTextFeld(int x, int y, int br, int hö, __int64 style, const char* txt)
+TextFeld* initTextFeld(
+    int x, int y, int br, int hö, __int64 style, const char* txt)
 {
     TextFeld* ret = uiFactory.createTextFeld(uiFactory.initParam);
     ret->setStyle(style);
@@ -130,7 +131,7 @@ AuswahlBox* initAuswahlBox(int x,
     int br,
     int hö,
     __int64 style,
-    std::initializer_list<char*> values)
+    std::initializer_list<const char*> values)
 {
     AuswahlBox* ret = uiFactory.createAuswahlBox(uiFactory.initParam);
     ret->addStyle(style);
@@ -197,7 +198,7 @@ AuswahlListe* initAuswahlListe(int x,
     int br,
     int hö,
     __int64 style,
-    std::initializer_list<char*> values)
+    std::initializer_list<const char*> values)
 {
     AuswahlListe* ret = uiFactory.createAuswahlListe(uiFactory.initParam);
     ret->setPosition(x, y);
@@ -239,8 +240,7 @@ FBalken* initFBalken(int x, int y, int br, int h
     ret->setPosition(x, y);
     ret->setSize(br, hö);
     LTDBDatei* datei = new LTDBDatei();
-    datei->setDatei(new Text(
-        "data/images/system.ltdb"));
+    datei->setDatei(new Text("data/images/system.ltdb"));
     datei->leseDaten(0);
     Bild* fbhb = datei->laden(0, new Text("fortschrittleh"));
     ret->setHintergrundBildZ(fbhb);

FactoryCraft/Initialisierung.h

@@ -14,7 +14,7 @@ using namespace Framework;
 
 struct OBJTabelleSpalteIni
 {
-    char* name;
+    const char* name;
     int breite;
     int minBreite;
     int maxBreite;
@@ -26,17 +26,19 @@ KontrollKnopf* createKontrollKnopf(const Framework::UIInitParam& params);
 ObjTabelle* createObjTabelle(const Framework::UIInitParam& params);
 Fenster* createFenster(const Framework::UIInitParam& params);
 
-Knopf* initKnopf(int x, int y, int br, int hö, __int64 style, char* titel);
+Knopf* initKnopf(
+    int x, int y, int br, int hö, __int64 style, const char* titel);
 KontrollKnopf* initKontrollKnopf(
-    int x, int y, int br, int hö, __int64 style, char* txt);
-TextFeld* initTextFeld(int x, int y, int br, int hö, __int64 style, const char* txt);
+    int x, int y, int br, int hö, __int64 style, const char* txt);
+TextFeld* initTextFeld(
+    int x, int y, int br, int hö, __int64 style, const char* txt);
 BildZ* initBildZ(int x, int y, int br, int hö, __int64 style, Bild* b);
 AuswahlBox* initAuswahlBox(int x,
     int y,
     int br,
     int hö,
     __int64 style,
-    std::initializer_list<char*> values);
+    std::initializer_list<const char*> values);
 ObjTabelle* initObjTabelle(int x,
     int y,
     int br,

FactoryCraft/InventoryView.cpp

@@ -200,7 +200,7 @@ int InventoryView::getSlotByLocalPos(Punkt pos)
     dragStopId = -1;
     if (slots)
     {
-        for (SlotInfo& info : *slots)
+        for (const SlotInfo& info : *slots)
         {
             if (pos.x >= x && pos.x < x + 50 && pos.y >= y && pos.y < y + 50)
                 return info.id;

FactoryCraft/ItemList.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <Fenster.h>
 #include <Bild.h>
+#include <Fenster.h>
 
 class ItemList : public Framework::ZeichnungHintergrund
 {
@@ -10,8 +10,8 @@ private:
     int currentTooltipSlot;
     int* slotList;
     int slotCount;
-    
-    int ItemList::getSlotByLocalPos(Framework::Punkt pos);
+
+    int getSlotByLocalPos(Framework::Punkt pos);
     void doMausEreignis(Framework::MausEreignis& me, bool userRet) override;
 
 public:

FactoryCraft/RecipieIngredient.cpp

@@ -144,9 +144,9 @@ LogicTree* RecipieIngredientElement::parse(Framework::XML::Element* zElement)
         }
         if (!result0_0 && result0_1 && result1_0 && !result1_1)
         {
-            LogicTree* or = new LogicTree(LogicalOperator::OR, 0);
-            or->addChildren(left);
-            or->addChildren(right);
+            LogicTree* orT = new LogicTree(LogicalOperator::OR, 0);
+            orT->addChildren(left);
+            orT->addChildren(right);
             LogicTree* notLeft = left->clone();
             notLeft->negate();
             LogicTree* notRight = right->clone();
@@ -155,15 +155,15 @@ LogicTree* RecipieIngredientElement::parse(Framework::XML::Element* zElement)
             notOr->addChildren(notLeft);
             notOr->addChildren(notRight);
             LogicTree* result = new LogicTree(LogicalOperator::AND, 0);
-            result->addChildren(or);
+            result->addChildren(orT);
             result->addChildren(notOr);
             return result;
         }
         if (result0_0 && !result0_1 && !result1_0 && result1_1)
         {
-            LogicTree*and = new LogicTree(LogicalOperator::AND, 0);
-            and->addChildren(left);
-            and->addChildren(right);
+            LogicTree* andT = new LogicTree(LogicalOperator::AND, 0);
+            andT->addChildren(left);
+            andT->addChildren(right);
             LogicTree* notLeft = left->clone();
             notLeft->negate();
             LogicTree* notRight = right->clone();
@@ -172,7 +172,7 @@ LogicTree* RecipieIngredientElement::parse(Framework::XML::Element* zElement)
             notAnd->addChildren(notLeft);
             notAnd->addChildren(notRight);
             LogicTree* result = new LogicTree(LogicalOperator::OR, 0);
-            result->addChildren(and);
+            result->addChildren(andT);
             result->addChildren(notAnd);
             return result;
         }