Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9406 in orxonox.OLD for trunk/src/world_entities/projectiles


Ignore:
Timestamp:
Jul 24, 2006, 11:09:47 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:
trunk/src/world_entities/projectiles
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/projectiles/laser.cc

    r9235 r9406  
    2828#include "debug.h"
    2929
    30 using namespace std;
     30
    3131
    3232CREATE_FAST_FACTORY_STATIC(Laser, CL_LASER);
  • trunk/src/world_entities/projectiles/projectile.cc

    r9235 r9406  
    7575    if (this->explosionBuffer != NULL)
    7676    {
    77       PRINTF(4)("Loaded sound %s to Pickup: %s.\n", explosionSound.c_str(), this->getName());
     77      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", explosionSound.c_str(), this->getCName());
    7878    }
    7979    else
    8080    {
    81       PRINTF(2)("Failed to load sound %s to explosion %s.\n.", explosionSound.c_str(), this->getName());
     81      PRINTF(2)("Failed to load sound %s to explosion %s.\n.", explosionSound.c_str(), this->getCName());
    8282    }
    8383  }
     
    9797    if (this->engineBuffer != NULL)
    9898    {
    99       PRINTF(4)("Loaded sound %s to Pickup: %s.\n", engineSound.c_str(), this->getName());
     99      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", engineSound.c_str(), this->getCName());
    100100    }
    101101    else
    102102    {
    103       PRINTF(2)("Failed to load sound %s to engine %s.\n.", engineSound.c_str(), this->getName());
     103      PRINTF(2)("Failed to load sound %s to engine %s.\n.", engineSound.c_str(), this->getCName());
    104104    }
    105105  }
  • trunk/src/world_entities/projectiles/rail_projectile.cc

    r9235 r9406  
    2828#include "debug.h"
    2929
    30 using namespace std;
     30
    3131
    3232CREATE_FAST_FACTORY_STATIC(RailProjectile, CL_RAIL_PROJECTILE);
Note: See TracChangeset for help on using the changeset viewer.