Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7676 in orxonox.OLD for trunk/src/lib


Ignore:
Timestamp:
May 18, 2006, 11:46:23 AM (19 years ago)
Author:
bensch
Message:

some POD's

Location:
trunk/src/lib
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/graphics/importer/material.cc

    r7221 r7676  
    291291void Material::setDiffuseMap(const std::string& dMap, GLenum target)
    292292{
    293   PRINTF(5)("setting Diffuse Map %s\n", dMap);
     293  PRINTF(5)("setting Diffuse Map %s\n", dMap.c_str());
    294294  if (this->diffuseTexture != NULL)
    295295    ResourceManager::getInstance()->unload(this->diffuseTexture);
  • trunk/src/lib/graphics/importer/objModel.cc

    r7221 r7676  
    7575      this->objPath.erase(len, this->objPath.size());
    7676      this->objPath[len] = '\0';
    77       PRINTF(4)("Resolved file %s to Path %s.\n", fileName, this->objPath);
     77      PRINTF(4)("Resolved file %s to Path %s.\n", fileName.c_str()), this->objPath.c_str());
    7878    }
    7979  else
  • trunk/src/lib/graphics/importer/static_model.cc

    r7221 r7676  
    226226  while (tmpGroup != NULL)
    227227  {
    228     PRINTF(5)("Drawing model %s\n", tmpGroup->name);
     228    PRINTF(5)("Drawing model %s\n", tmpGroup->name.c_str());
    229229    glCallList (tmpGroup->listNumber);
    230230    tmpGroup = tmpGroup->next;
     
    253253    if (counter == groupNumber)
    254254    {
    255       PRINTF(4)("Drawing model number %i named %s\n", counter, tmpGroup->name);
     255      PRINTF(4)("Drawing model number %i named %s\n", counter, tmpGroup->name.c_str());
    256256      glCallList (tmpGroup->listNumber);
    257257      return;
     
    368368bool StaticModel::addGroup(const std::string& groupString)
    369369{
    370   PRINTF(5)("Read Group: %s.\n", groupString);
     370  PRINTF(5)("Read Group: %s.\n", groupString.c_str());
    371371  if (this->groupCount != 0 && this->currentGroup->faceCount > 0)
    372372  {
  • trunk/src/lib/graphics/importer/texture.cc

    r7221 r7676  
    9090      if(tmpSurf != NULL)
    9191      {
    92         PRINTF(4)("loading Image %s\n", imageName);
     92        PRINTF(4)("loading Image %s\n", imageName.c_str());
    9393        bool hasAlpha;
    9494        SDL_Surface* newSurf = this->prepareSurface(tmpSurf, hasAlpha);
  • trunk/src/lib/gui/qt_gui/Makefile.am

    r7670 r7676  
    4747
    4848clean-local:
    49         rm *_moc.cc
     49        rm -f *_moc.cc
  • trunk/src/lib/parser/ini_parser/ini_parser.cc

    r7661 r7676  
    445445              (*section).entries.back().name.c_str(),
    446446              (*section).entries.back().value.c_str(),
    447               (*section).name);
     447              (*section).name.c_str());
    448448    this->currentEntry = --(*section).entries.end();
    449449    return true;
  • trunk/src/lib/shell/shell_input.cc

    r7474 r7676  
    293293    if (event.bPressed)
    294294    {
    295       PRINTF(5)("Shell received command %s\n", SDLKToKeyname(event.type));
     295      PRINTF(5)("Shell received command %s\n", SDLKToKeyname(event.type).c_str());
    296296      if (event.type == SDLK_F1)
    297297        this->help();
  • trunk/src/lib/util/loading/factory.cc

    r7462 r7676  
    150150  else
    151151  {
    152     PRINTF(2)("Could not Fabricate an Object of Class '%s'\n", className);
     152    PRINTF(2)("Could not Fabricate an Object of Class '%s'\n", className.c_str());
    153153    return NULL;
    154154  }
  • trunk/src/lib/util/loading/resource_manager.cc

    r7661 r7676  
    436436      if(File(fullName).isFile())
    437437      {
    438         PRINTF(4)("Image %s resides to %s\n", fileName, fullName);
     438        PRINTF(4)("Image %s resides to %s\n", fileName.c_str(), fullName.c_str());
    439439        tmpResource->pointer = new Texture(fullName, tmpResource->param[0].getInt());
    440440      }
     
    447447          if(File(imgName).isFile())
    448448          {
    449             PRINTF(4)("Image %s resides to %s\n", fileName, imgName);
     449            PRINTF(4)("Image %s resides to %s\n", fileName.c_str(), imgName.c_str());
    450450            tmpResource->pointer = new Texture(imgName, tmpResource->param[0].getInt());
    451451            break;
Note: See TracChangeset for help on using the changeset viewer.