Changeset 1962 for code/branches/objecthierarchy

Timestamp:

Oct 20, 2008, 12:14:16 AM (16 years ago)

Author:

rgrieder

Message:

small fixes.

Location:

code/branches/objecthierarchy/src

Files:

• network/GamestateManager.cc (modified) (1 diff)
• orxonox/gamestates/GSLevel.cc (modified) (1 diff)
• orxonox/objects/Trigger.cc (modified) (1 diff)

code/branches/objecthierarchy/src/network/GamestateManager.cc

@@ -130 +130 @@
     //Server::sendGameState?
     packet::Gamestate *gs;
-    int gID = ClientInformation::findClient(clientID)->getGamestateID();
+    unsigned int gID = ClientInformation::findClient(clientID)->getGamestateID();
     if(!reference)
       return 0;

code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.cc

@@ -144 +144 @@
     void GSLevel::setTimeFactor(float factor)
     {
+/*
         float change = factor / this->timeFactor_;
+*/
         this->timeFactor_ = factor;
 /*

code/branches/objecthierarchy/src/orxonox/objects/Trigger.cc

@@ -226 +226 @@
     //XMLPortParamLoadOnlyTemplate(Trigger, "mode", setMode, xmlelement, mode, std::string);
 
-    // what are those last two parameters?
-    //XMLPortObject(Trigger, Trigger, "", addTrigger, getTrigger, xmlelement, mode, false, true);
     XMLPortObject(Trigger, Trigger, "", addTrigger, getTrigger, xmlelement, mode);