Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5117 in orxonox.OLD


Ignore:
Timestamp:
Aug 24, 2005, 2:03:23 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: cleanup is almost perfect now

Location:
trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/defs/class_id.h

    r5068 r5117  
    108108  CL_STATE                      =    0x00000f13,
    109109  CL_FRAMEWORK                  =    0x00000f14,
    110   CL_RENDER_2D                  =    0x00000f15,
     110  CL_RENDER_2D                  =    0x00000f21,
     111  CL_NULL_ELEMENT_2D            =    0x00000f22,
    111112
    112113

  • trunk/src/lib/graphics/render2D/element_2d.cc

    r5115 r5117  
    825825NullElement2D::NullElement2D () : Element2D(NULL)
    826826{
    827   this->setClassID(CL_NULL_PARENT, "NullElement2D");
     827  this->setClassID(CL_NULL_ELEMENT_2D, "NullElement2D");
    828828  this->setName("NullElement2D");
    829829

  • trunk/src/lib/graphics/render2D/render_2d.cc

    r5115 r5117  
    5454    delete this->element2DList[i];
    5555
     56  delete NullElement2D::getInstance();
    5657  Render2D::singletonRef = NULL;
    5758}

  • trunk/src/story_entities/world.cc

    r5115 r5117  
    140140
    141141  // unload the resources !!
    142 //  ResourceManager::getInstance()->unload(this->music);
     142  ResourceManager::getInstance()->unload(this->music);
    143143  ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
    144144}
Note: See TracChangeset for help on using the changeset viewer.