Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 25, 2007, 12:48:13 PM (17 years ago)
Author:
patrick
Message:

merged the playability branche. working

Location:
branches/playability.merge
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/playability.merge

    • Property svn:ignore

      •  

        old new  
        1010autom4te.cache
        1111aclocal.m4
         12tags
         13test.bmp
         14config.sub
         15config.guess
         16OrxonoxPlayability.kdevses
         17OrxonoxPlayability.kdevelop.pcs

  • branches/playability.merge/src/world_entities/weapons/swarm_launcher.cc

    r10365 r10366  
    3434#include "util/loading/factory.h"
    3535
    36 #include "class_id_DEPRECATED.h"
     36
    3737
    3838using namespace std;
    3939
    40 ObjectListDefinitionID(SwarmLauncher, CL_SWARM_LAUNCHER);
     40ObjectListDefinition(SwarmLauncher);
    4141CREATE_FACTORY(SwarmLauncher);
    4242
    … …  
    155155      if (pj == NULL)
    156156        return;
    157      
     157
    158158      fired = true;
    159159      pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*115.0 + VECTOR_RAND(10)));
Note: See TracChangeset for help on using the changeset viewer.