Changeset 11889 for code/branches/Masterserver_FS18/src

Timestamp:

Apr 19, 2018, 3:20:41 PM (7 years ago)

Author:

varyo

Message:

Commented out two asserts and one registerVariable, fixing client side texture issues

Location:

code/branches/Masterserver_FS18/src

Files:

• libraries/network/packet/Gamestate.cc (modified) (1 diff)
• orxonox/graphics/Model.cc (modified) (1 diff)

code/branches/Masterserver_FS18/src/libraries/network/packet/Gamestate.cc

@@ -222 +222 @@
           orxout(user_error, context::packets) << "Possible reason for this error: Client created a synchronized object without the Server's approval." << endl;
           orxout(user_error, context::packets) << "Objects class: " << synchronisable->getIdentifier()->getName() << endl;
-          assert(false);
+          //assert(false);
         }
       }

code/branches/Masterserver_FS18/src/orxonox/graphics/Model.cc

@@ -104 +104 @@
         registerVariable(this->meshSrc_,    VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedMesh));
         registerVariable(this->renderQueueGroup_,    VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedRenderQueueGroup));
-        registerVariable(this->materialName_,    VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedMaterial));
+        //Commented out, since this causes texture load failures on client side
+        //registerVariable(this->materialName_,    VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedMaterial));
         registerVariable(this->bCastShadows_, VariableDirection::ToClient, new NetworkCallback<Model>(this, &Model::changedShadows));
     }