Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10579 in orxonox.OLD


Ignore:
Timestamp:
Feb 7, 2007, 9:49:40 PM (17 years ago)
Author:
nicolasc
Message:

fixed some headers
commeted none existing sounds, to remove warnings

Location:
branches/cleanup/src/world_entities
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • branches/cleanup/src/world_entities/projectiles/swarm_projectile.cc

    r10547 r10579  
    3939SwarmProjectile::SwarmProjectile () : Projectile()
    4040{
    41 
    42 /*  this->loadModel("models/projectiles/orx-rocket.obj", 0.5);*/
    43   this->loadModel("models/projectiles/swarm_projectile.obj", .25); // no double rescale (see draw())
     41  this->loadModel("models/projectiles/swarm_projectile.obj", .333); // no double rescale (see draw())
    4442  this->loadExplosionSound("sounds/explosions/explosion_4.wav");
    4543

  • branches/cleanup/src/world_entities/space_ships/space_ship.cc

    r10552 r10579  
    616616  {
    617617    this->bRight = event.bPressed;
    618     printf("ShipCoors: %f , %f, %f \n", this->getAbsCoor().x, this->getAbsCoor().y, this->getAbsCoor().z);
     618//     printf("ShipCoors: %f , %f, %f \n", this->getAbsCoor().x, this->getAbsCoor().y, this->getAbsCoor().z);
    619619  }
    620620  else if( event.type == KeyMapper::PEV_FORWARD)

  • branches/cleanup/src/world_entities/weapons/acid_launcher.cc

    r10572 r10579  
    103103  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_1.wav");
    104104  this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
    105   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
     105//   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
    106106
    107107}

  • branches/cleanup/src/world_entities/weapons/aiming_turret.cc

    r10419 r10579  
    100100  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
    101101  this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
    102   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
     102//   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
    103103
    104104}

  • branches/cleanup/src/world_entities/weapons/boomerang_gun.cc

    r10419 r10579  
    9696  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
    9797  this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
    98   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
     98//   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
    9999
    100100}

  • branches/cleanup/src/world_entities/weapons/heavy_blaster.cc

    r10548 r10579  
     1/*
     2   orxonox - the future of 3D-vertical-scrollers
     3
     4   Copyright (C) 2004-2006 orx
     5
     6   This program is free software; you can redistribute it and/or modify
     7   it under the terms of the GNU General Public License as published by
     8   the Free Software Foundation; either version 2, or (at your option)
     9   any later version.
     10
     11   ### File Specific
     12   main-programmer: Marc Schaerrer, Nicolas Schlumberger
     13   co-programmer:
     14
     15*/
     16
    117#include "heavy_blaster.h"
    218#include "world_entities/projectiles/projectile.h"

  • branches/cleanup/src/world_entities/weapons/light_blaster.cc

    r10539 r10579  
     1/*
     2   orxonox - the future of 3D-vertical-scrollers
     3
     4   Copyright (C) 2004-2006 orx
     5
     6   This program is free software; you can redistribute it and/or modify
     7   it under the terms of the GNU General Public License as published by
     8   the Free Software Foundation; either version 2, or (at your option)
     9   any later version.
     10
     11   ### File Specific
     12   main-programmer: Marc Schaerrer, Nicolas Schlumberger
     13   co-programmer:
     14
     15*/
     16
    117#include "light_blaster.h"
    218#include "world_entities/projectiles/projectile.h"

  • branches/cleanup/src/world_entities/weapons/medium_blaster.cc

    r10548 r10579  
     1/*
     2   orxonox - the future of 3D-vertical-scrollers
     3
     4   Copyright (C) 2004-2006 orx
     5
     6   This program is free software; you can redistribute it and/or modify
     7   it under the terms of the GNU General Public License as published by
     8   the Free Software Foundation; either version 2, or (at your option)
     9   any later version.
     10
     11   ### File Specific
     12   main-programmer: Marc Schaerrer, Nicolas Schlumberger
     13   co-programmer:
     14
     15*/
     16
    117#include "medium_blaster.h"
    218#include "world_entities/projectiles/projectile.h"

  • branches/cleanup/src/world_entities/weapons/spike_launcher.cc

    r10572 r10579  
    1010
    1111   ### File Specific
    12    main-programmer: Marc Schaerrer
     12   main-programmer: Marc Schaerrer, Nicolas Schlumberger
    1313   co-programmer:
    1414*/

  • branches/cleanup/src/world_entities/weapons/spike_thrower.cc

    r10572 r10579  
    1010
    1111   ### File Specific
    12    main-programmer: Marc Schaerrer
     12   main-programmer: Marc Schaerrer, Nicolas Schlumberger
    1313   co-programmer:
    1414*/
    … …  
    105105  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_1.wav");
    106106  this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
    107   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
     107//   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
    108108
    109109}

  • branches/cleanup/src/world_entities/weapons/swarm_launcher.cc

    r10572 r10579  
    105105  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_1.wav");
    106106  this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
    107   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
     107//   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
    108108
    109109}

  • branches/cleanup/src/world_entities/weapons/targeting_turret.cc

    r10419 r10579  
    9494  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
    9595  this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
    96   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
     96//   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
    9797}
    9898

  • branches/cleanup/src/world_entities/weapons/turret.cc

    r10419 r10579  
    9595  this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_3.wav");
    9696  this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
    97   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
     97//   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");
    9898
    9999}
Note: See TracChangeset for help on using the changeset viewer.