Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3159 for code


Ignore:
Timestamp:
Jun 13, 2009, 6:41:05 PM (15 years ago)
Author:
rgrieder
Message:

Several small fixes and some removed warnings

Location:
code/branches/pch
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • code/branches/pch/cmake/GenerateToluaBindings.cmake

    r2710 r3159  
    4848  )
    4949  SOURCE_GROUP("Tolua" FILES ${_tolua_cxxfile} ${_tolua_hfile})
     50  # Disable annoying GCC warnings
     51  IF(CMAKE_COMPILER_IS_GNU)
     52    SET_SOURCE_FILES_PROPERTIES(${_tolua_cxxfile} PROPERTIES COMPILE_FLAGS "-w")
     53  ENDIF()
    5054
    5155  # Create temporary package file

  • code/branches/pch/cmake/LibraryConfig.cmake

    r2925 r3159  
    172172##### Boost #####
    173173# Expand the next statement if newer boost versions than 1.36.1 are released
    174 SET(Boost_ADDITIONAL_VERSIONS 1.37 1.37.0)
     174SET(Boost_ADDITIONAL_VERSIONS 1.37 1.37.0 1.38 1.38.0 1.39 1.39.0)
    175175# MSVC seems to be the only compiler requiring date_time
    176176IF(MSVC)

  • code/branches/pch/src/core/Game.h

    r3154 r3159  
    4141#include <list>
    4242#include <map>
     43#include <string>
    4344#include <vector>
    4445#include <boost/shared_ptr.hpp>

  • code/branches/pch/src/core/IRC.h

    r3154 r3159  
    3131
    3232#include "CorePrereqs.h"
     33
     34#include <string>
    3335#include "OrxonoxClass.h"
    3436

  • code/branches/pch/src/core/Template.cc

    r3154 r3159  
    4242    Template::Template(BaseObject* creator) : BaseObject(creator)
    4343    {
     44        this->xmlelement_ = new TiXmlElement("");
     45
    4446        RegisterObject(Template);
    4547
    46         this->xmlelement_ = new TiXmlElement("");
    4748        this->bIsLink_ = false;
    4849        this->bLoadDefaults_ = true;

  • code/branches/pch/src/core/XMLPort.h

    r3156 r3159  
    5151#include "util/MultiType.h"
    5252#include "util/OrxAssert.h"
     53#include "Factory.h"
    5354#include "Identifier.h"
    5455#include "Executor.h"

  • code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc

    r3149 r3159  
    633633    void WorldEntity::lookAt(const Vector3& target, TransformSpace::Enum relativeTo, const Vector3& localDirectionVector)
    634634    {
    635         Vector3 origin;
     635        Vector3 origin(0, 0, 0);
    636636        switch (relativeTo)
    637637        {
    … …  
    660660    {
    661661        Quaternion savedOrientation(this->getOrientation());
    662         Ogre::Node::TransformSpace ogreRelativeTo;
     662        Ogre::Node::TransformSpace ogreRelativeTo = Ogre::Node::TS_LOCAL;
    663663        switch (relativeTo)
    664664        {
    … …  
    772772            break;
    773773        case Kinematic:
    774             this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() & !btCollisionObject::CF_STATIC_OBJECT | btCollisionObject::CF_KINEMATIC_OBJECT);
     774            this->physicalBody_->setCollisionFlags((this->physicalBody_->getCollisionFlags() & !btCollisionObject::CF_STATIC_OBJECT) | btCollisionObject::CF_KINEMATIC_OBJECT);
    775775            break;
    776776        case Static:
    777             this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() & !btCollisionObject::CF_KINEMATIC_OBJECT | btCollisionObject::CF_STATIC_OBJECT);
     777            this->physicalBody_->setCollisionFlags((this->physicalBody_->getCollisionFlags() & !btCollisionObject::CF_KINEMATIC_OBJECT) | btCollisionObject::CF_STATIC_OBJECT);
    778778            break;
    779779        case None:

  • code/branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.cc

    r3110 r3159  
    237237  {
    238238    if (( (this->latestState_ & 2) && this->bStayActive_ && (this->remainingActivations_ <= 0))
    239      || (!(this->latestState_ & 2))                      && (this->remainingActivations_ == 0))
     239     || (!(this->latestState_ & 2)                       && (this->remainingActivations_ == 0)))
    240240      return false;
    241241    else

  • code/branches/pch/src/util/ExprParser.cc

    r3146 r3159  
    247247            return 0;
    248248        }
    249         else if (*reading_stream > 47 && *reading_stream < 59 || *reading_stream == 46)
     249        else if ((*reading_stream > 47 && *reading_stream < 59) || *reading_stream == 46)
    250250        {  // number
    251251            value = strtod(reading_stream, const_cast<char**>(&reading_stream));
    252252        }
    253         else if (*reading_stream > 64 && *reading_stream < 91 || *reading_stream > 96 && *reading_stream < 123 || *reading_stream == 46)
     253        else if ((*reading_stream > 64 && *reading_stream < 91) || (*reading_stream > 96 && *reading_stream < 123) || *reading_stream == 46)
    254254        {  // variable or function
    255255            char* word = new char[256];
    … …  
    384384        char* word = str;
    385385        int counter = 0;
    386         while (*reading_stream > 47 && *reading_stream < 58 || *reading_stream > 64 && *reading_stream < 91 || *reading_stream > 96 && *reading_stream < 123 || *reading_stream == 46)
     386        while ((*reading_stream > 47 && *reading_stream < 58) || (*reading_stream > 64 && *reading_stream < 91) || (*reading_stream > 96 && *reading_stream < 123) || *reading_stream == 46)
    387387        {
    388388            *word++ = *reading_stream++;

  • code/branches/pch/src/util/SignalHandler.cc

    r3146 r3159  
    209209      {
    210210        if (
    211           charsFound == 0 && byte == '(' ||
    212           charsFound == 1 && byte == 'g' ||
    213           charsFound == 2 && byte == 'd' ||
    214           charsFound == 3 && byte == 'b' ||
    215           charsFound == 4 && byte == ')' ||
    216           charsFound == 5 && byte == ' '
     211          (charsFound == 0 && byte == '(') ||
     212          (charsFound == 1 && byte == 'g') ||
     213          (charsFound == 2 && byte == 'd') ||
     214          (charsFound == 3 && byte == 'b') ||
     215          (charsFound == 4 && byte == ')') ||
     216          (charsFound == 5 && byte == ' ')
    217217            )
    218218              charsFound++;
    … …  
    246246
    247247        if (
    248           charsFound == 0 && byte == '(' ||
    249           charsFound == 1 && byte == 'g' ||
    250           charsFound == 2 && byte == 'd' ||
    251           charsFound == 3 && byte == 'b' ||
    252           charsFound == 4 && byte == ')' ||
    253           charsFound == 5 && byte == ' '
     248          (charsFound == 0 && byte == '(') ||
     249          (charsFound == 1 && byte == 'g') ||
     250          (charsFound == 2 && byte == 'd') ||
     251          (charsFound == 3 && byte == 'b') ||
     252          (charsFound == 4 && byte == ')') ||
     253          (charsFound == 5 && byte == ' ')
    254254            )
    255255              charsFound++;
Note: See TracChangeset for help on using the changeset viewer.