Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4504 in orxonox.OLD for orxonox/trunk/src/util


Ignore:
Timestamp:
Jun 4, 2005, 12:38:30 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the SoundEngine into the Trunk.
merged file by file, but merged all the files in favor of the new trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/util/resource_manager.cc

    r4468 r4504  
    2424#include "texture.h"
    2525#include "text_engine.h"
     26#include "sound_engine.h"
    2627
    2728#include "list.h"
     
    312313          else
    313314            PRINTF(2)("Sorry, %s does not exist. Not loading Font\n", fullName);
     315          break;
     316        case WAV:
     317          if(isFile(fullName))
     318            tmpResource->pointer = new SoundBuffer(fullName);
    314319          break;
    315320        case IMAGE:
     
    407412              delete (Texture*)resource->pointer;
    408413              break;
     414            case WAV:
     415              delete (SoundBuffer*)resource->pointer;
     416              break;
    409417            case TTF:
    410418              delete (Font*)resource->pointer;
Note: See TracChangeset for help on using the changeset viewer.