adjust to framework changes

FactoryCraft/Block.cpp

@@ -78,7 +78,6 @@ void Block::afterRender(
 
 void Block::api(char* message)
 {
-    // TODO: implement api
     switch (message[0])
     {
     case 0: // hp change

FactoryCraft/Chunk.cpp

@@ -185,7 +185,7 @@ void Chunk::load(Framework::StreamReader* zReader)
     cs.lock();
     blocks.leeren();
     cs.unlock();
-    Trie<Block> blockCache;
+    RCTrie<Block> blockCache;
     isLoading = 1;
     Framework::Vec3<int> pos = {0, 0, 0};
     unsigned short id;

FactoryCraft/Dimension.cpp

@@ -10,7 +10,7 @@ using namespace Framework;
 
 Dimension::Dimension()
     : id(-1),
-      chunks(new Trie<Chunk>()),
+      chunks(new RCTrie<Chunk>()),
       entities(new RCArray<Entity>())
 {}
 

FactoryCraft/Dimension.h

@@ -13,7 +13,7 @@ class Dimension : public virtual Framework::ReferenceCounter
 {
 private:
     int id;
-    Framework::Trie<Chunk>* chunks;
+    Framework::RCTrie<Chunk>* chunks;
     Framework::Array<Chunk*> chunkList;
     Framework::RCArray<Entity>* entities;
     Framework::Critical cs;

FactoryCraft/DimensionMap.cpp

@@ -18,7 +18,7 @@ DimensionMap::DimensionMap(MapOptions* zOptions)
       nextPlayersRequest(-1)
 {
     setStyle(Style::Sichtbar | Style::Erlaubt);
-    chunks = new Framework::Trie<ChunkMap>();
+    chunks = new Framework::RCTrie<ChunkMap>();
     setMausEreignis(_ret1ME);
     requestNextChunk();
 

FactoryCraft/DimensionMap.h

@@ -16,7 +16,7 @@ class DimensionMap : public Framework::ZeichnungHintergrund
 {
 private:
     MapOptions* zOptions;
-    Framework::Trie<ChunkMap>* chunks;
+    Framework::RCTrie<ChunkMap>* chunks;
     Framework::Array<ChunkMap*> chunkList;
     Framework::Punkt originChunkCenter;
     Framework::Punkt scrollOffset;

FactoryCraft/ItemBar.cpp

@@ -179,8 +179,7 @@ void ItemBarView::render(Bild& rObj)
             info.render(x,
                 y,
                 rObj,
-                index == leftHandPos,
-                index == (leftHandPos + 1) % slots->getEintragAnzahl());
+                index == leftHandPos, 0);
             x += 60;
             if (++rowCount >= rowSize)
             {

FactoryCraft/PlayerKam.cpp

@@ -63,20 +63,20 @@ void PlayerKam::doTastaturEreignis(Framework::TastaturEreignis& te)
 
 void PlayerKam::doMausEreignis(Framework::MausEreignis& me)
 {
-    if (me.verarbeitet)
+    if (me.verarbeitet && me.id != ME_RLinks && me.id != ME_RRechts)
     {
         kameraControll = 0;
         setShowCursor(true);
     }
     else
     {
-        if (!kameraControll)
+        if (!kameraControll && me.id != ME_RLinks && me.id != ME_RRechts)
         {
             if (me.id == ME_PLinks) setControlEnabled(1);
         }
         else
         {
-            if (kameraControll)
+            if (kameraControll || me.id == ME_RLinks || me.id == ME_RRechts)
             {
                 if (me.id == ME_PLinks)
                 {

FactoryCraft/ServerSelection.cpp

@@ -410,7 +410,9 @@ ServerSelectionMenu::ServerSelectionMenu(Bildschirm* zScreen)
                                   ->finishObject())
                           ->finishArray())
                   ->finishObject();
-        JSON::JSONValue* validJson = validator->getValidParts(json);
+        RCArray<JSON::Validator::JSONValidationResult> removedParts;
+        JSON::JSONValue* validJson
+            = validator->getValidParts(json, &removedParts);
         json->release();
         if (validJson)
         {

FactoryCraft/World.cpp

@@ -143,7 +143,6 @@ void World::update(bool background)
                 }
             }
             delete[] data;
-            // TODO: process messages
         }
         if (type == 4) // POSITION UPDATE
         {