Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8490 in orxonox.OLD for trunk/src/story_entities


Ignore:
Timestamp:
Jun 15, 2006, 9:34:48 PM (18 years ago)
Author:
patrick
Message:

merged the bsp branche back to trunk

Location:
trunk/src/story_entities
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/story_entities/game_world.cc

    r8408 r8490  
    299299    /* process time */
    300300    this->tick ();
     301
    301302    /* collision detection */
    302303    this->collisionDetection ();
    303304    /* collision reaction */
    304305    this->collisionReaction ();
     306
    305307    /* update the state */
    306308    this->update ();
     309
    307310    /* check the game rules */
    308311    this->checkGameRules();
    … …  
    434437void GameWorld::collisionDetection()
    435438{
     439  // object-object collision detection
    436440  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
    437441      this->dataTank->objectManager->getObjectList(OM_GROUP_01_PROJ));
    … …  
    446450      this->dataTank->objectManager->getObjectList(OM_COMMON));
    447451
     452  // ground collision detection: BSP Model
     453  CDEngine::getInstance()->checkCollisionGround(this->dataTank->objectManager->getObjectList(OM_GROUP_00));
     454  CDEngine::getInstance()->checkCollisionGround(this->dataTank->objectManager->getObjectList(OM_GROUP_01));
    448455}
    449456

  • trunk/src/story_entities/game_world_data.cc

    r7810 r8490  
    3333#include "terrain.h"
    3434#include "skybox.h"
    35 #include "md2Model.h"
     35#include "md2/md2Model.h"
    3636#include "world_entities/projectiles/projectile.h"
    3737#include "npcs/npc_test1.h"

  • trunk/src/story_entities/multi_player_world_data.cc

    r8068 r8490  
    3434#include "test_entity.h"
    3535#include "terrain.h"
    36 #include "md2Model.h"
     36#include "md2/md2Model.h"
    3737#include "world_entities/projectiles/projectile.h"
    3838#include "npcs/npc_test1.h"
Note: See TracChangeset for help on using the changeset viewer.