Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 18, 2005, 11:52:15 AM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit :)

Conflits in world.cc are a MESS: fix it

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/branches/levelloader/src/world_entities/environment.cc

    r3557 r3605  
    100100Environment::~Environment ()
    101101{
    102   delete this->model;
     102
    103103}
    104104
    105105void Environment::tick (float time) {}
    106106
    107 void Environment::hit (WorldEntity* weapon, Vector loc) {}
     107void Environment::hit (WorldEntity* weapon, Vector* loc) {}
    108108
    109109void Environment::destroy () {}
     
    114114{
    115115  glMatrixMode(GL_MODELVIEW);
    116   glLoadIdentity();
     116  glPushMatrix();
    117117  float matrix[4][4];
    118118 
     
    123123 
    124124  this->model->draw();
     125
     126  glPopMatrix();
    125127}
    126128
Note: See TracChangeset for help on using the changeset viewer.