Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8478 in orxonox.OLD for branches/atmospheric_engine/src


Ignore:
Timestamp:
Jun 15, 2006, 4:24:48 PM (18 years ago)
Author:
amaechler
Message:

at: soundloops broken, counter push

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/atmospheric_engine/src/lib/collision_reaction/collision_handle.cc

    r8474 r8478  
    11/*
    2    orxonox - the future of 3D-vertical-scrollers
     2   orxonox - the future of 3D-vertical-scrollersf
    33
    44   Copyright (C) 2004 orx
     
    9292      return;
    9393
     94<<<<<<< .mine
     95   // add element
     96   //PRINTF(0)("addTarget: %i \n", target);
     97=======
    9498  // add element
    9599   //PRINTF(0)("addTarget: %i \n", target);
     100>>>>>>> .r8477
    96101   this->targetList.push_back(target);
    97102}
Note: See TracChangeset for help on using the changeset viewer.