Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5796 in orxonox.OLD


Ignore:
Timestamp:
Nov 27, 2005, 4:07:22 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: moved old world_entites branche out of the way

Location:
branches
Files:
4 edited
25 copied
1 moved

Legend:

Unmodified
Added
Removed

  • branches/collision_detection/Makefile.in

    r5674 r5796  
    4141        $(srcdir)/doc/documentation.am $(top_srcdir)/configure AUTHORS \
    4242        COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
    43         install-sh ltmain.sh missing mkinstalldirs
     43        install-sh missing mkinstalldirs
    4444subdir = .
    4545ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

  • branches/guidedmissile/aclocal.m4

    r5764 r5796  
    1 # generated automatically by aclocal 1.9.5 -*- Autoconf -*-
     1# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
    22
    33# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
    … …  
    2929# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
    3030AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
    31          [AM_AUTOMAKE_VERSION([1.9.5])])
     31         [AM_AUTOMAKE_VERSION([1.9.6])])
    3232
    3333# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

  • branches/old.we/src/world_entities/weapons/bomb.cc

    r5744 r5796  
    2121#include "vector.h"
    2222#include "fast_factory.h"
     23
     24#include "object_manager.h"
    2325
    2426
    … …  
    105107  Vector v = this->velocity * (time);
    106108  this->shiftCoor(v);
     109  /////////////////////////////////////////////////////////////////////////////////////////
     110  // TESTING THE OBJECT MANAGER  //////////////////////////////////////////////////////////
     111  /////////////////////////////////////////////////////////////////////////////////////////
     112
     113  std::list<WorldEntity*>* objList = ObjectManager::distanceFromObject(*this, 100, CL_NPC);
     114  std::list<WorldEntity*>::const_iterator detonator;
     115  for (detonator = objList->begin(); detonator != objList->end(); ++detonator)
     116  {
     117//    printf("%d\n", strlen((*detonator)->getName()));
     118    (*detonator)->collidesWith(this, Vector(0,0,0));
     119
     120  }
     121  /////////////////////////////////////////////////////////////////////////////////////////
    107122
    108123  this->lifeCycle += time/this->lifeSpan;
    … …  
    146161void Bomb::collidesWith (WorldEntity* entity, const Vector& location)
    147162{
    148         this->detonate();
     163        this->detonate();
    149164}
    150165
    … …  
    168183  while(lm != NULL)
    169184  {
    170    
     185
    171186    lm = it->nextElement();
    172187  }

  • branches/old.we/src/world_entities/weapons/bomb.h

    r5744 r5796  
    3535
    3636 private:
    37   static FastFactory*               fastFactory;
    38   static ParticleSystem*            trailParticles;
    39   static ParticleSystem*            explosionParticles;
     37   static FastFactory*               fastFactory;
     38   static ParticleSystem*            trailParticles;
     39   static ParticleSystem*            explosionParticles;
    4040
    41   ParticleEmitter*                  emitter;
     41   ParticleEmitter*                  emitter;
    4242
    4343};
Note: See TracChangeset for help on using the changeset viewer.