Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6981 in orxonox.OLD


Ignore:
Timestamp:
Feb 2, 2006, 2:45:07 PM (18 years ago)
Author:
bensch
Message:

trunk: some virtuals

Location:
trunk/src
Files:
47 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/graphics/effects/graphics_effect.cc

    r6979 r6981  
    2020#include "graphics_effect.h"
    2121
    22 #include "graphics_engine.h"
    2322#include "load_param.h"
    2423

  • trunk/src/lib/graphics/importer/height_map.h

    r6956 r6981  
    2828class HeightMap;
    2929
    30 class Tile 
     30class Tile
    3131{
    3232public:
    … …  
    4040float x;
    4141float z;
    42 ~Tile();
     42virtual ~Tile();
    4343
    4444
    … …  
    4747HeightMap* hmref;
    4848VertexArrayModel* highResModel;
    49 VertexArrayModel* lowResModel; 
     49VertexArrayModel* lowResModel;
    5050int highRes;
    5151int lowRes;
    … …  
    6060void load(int Mode);
    6161void load(const char*, int Mode);
    62 void scale( Vector V); 
     62void scale( Vector V);
    6363void setAbsCoor(Vector V);
    64 float getHeight(float x, float y); 
     64float getHeight(float x, float y);
    6565float getNormal(float x, float y);
    6666HeightMap();
    6767HeightMap(const char*);
    6868HeightMap(const char*, const char*);
    69 ~HeightMap();
     69virtual ~HeightMap();
    7070
    7171friend class Tile;
    … …  
    7474SDL_Surface* heightMap;
    7575SDL_Surface* colourMap;
    76 unsigned char* heights; 
     76unsigned char* heights;
    7777unsigned char* colours;
    7878
    … …  
    8080void drawRect(int xBottomLeft, int yBottomLeft, int xTopRight, int yTopRight );
    8181void fixBoarder(int xBottomLeft, int yBottomLeft, int xTopRight, int yTopRight);
    82 Vector  **  normalVectorField ; 
     82Vector  **  normalVectorField ;
    8383Tile    ***  tiles;
    8484Vector    camCoords;
    85 Vector offsetCoords; 
     85Vector offsetCoords;
    8686Material * tmp_mat;
    8787Material* red_mat;

  • trunk/src/lib/graphics/importer/media_container.h

    r6731 r6981  
    4545
    4646  MediaContainer(const char* filename = NULL);
    47   ~MediaContainer();
     47  virtual ~MediaContainer();
    4848
    4949  bool loadMedia(const char* filename);
    … …  
    5353
    5454private:
    55  
     55
    5656  GLuint getNextFrame();
    5757  void unloadMedia();

  • trunk/src/lib/graphics/importer/movie_player.h

    r6731 r6981  
    5959
    6060  MoviePlayer(const char* filename = NULL);
    61   ~MoviePlayer();
     61  virtual ~MoviePlayer();
    6262
    6363  bool loadMovie(const char* filename);

  • trunk/src/lib/graphics/importer/texture.h

    r6465 r6981  
    2020      Texture(const char* imageName = NULL, GLenum target = GL_TEXTURE_2D);
    2121  //  Texture(TEXTURE_TYPE type, int resolution);
    22       ~Texture();
     22      virtual ~Texture();
    2323
    2424      bool loadImage(const char* imageName, GLenum target = GL_TEXTURE_2D);

  • trunk/src/lib/graphics/importer/texture_sequence.h

    r6532 r6981  
    2323    TextureSequence(unsigned int count = 0, ...);
    2424  //  Texture(TEXTURE_TYPE type, int resolution);
    25     ~TextureSequence();
     25    virtual ~TextureSequence();
    2626
    2727    bool loadImageSeries(unsigned int count, ...);

  • trunk/src/lib/graphics/text_engine/text.h

    r5768 r6981  
    4040  public:
    4141    Text(const char* fontFile = NULL, unsigned int fontSize = TEXT_DEFAULT_SIZE);
    42     ~Text();
     42    virtual ~Text();
    4343    void init();
    4444

  • trunk/src/lib/gui/gtk_gui/gui.h

    r4836 r6981  
    2424 public:
    2525  Gui(int argc, char *argv[]);
    26   ~Gui();
     26  virtual ~Gui();
    2727
    2828  void startGui();

  • trunk/src/lib/gui/gtk_gui/gui_audio.h

    r4746 r6981  
    1414 public:
    1515  GuiAudio();
    16   ~GuiAudio();
     16  virtual ~GuiAudio();
    1717};
    1818#endif /* _GUI_AUDIO_H */

  • trunk/src/lib/gui/gtk_gui/gui_banner.h

    r4746 r6981  
    1616 public:
    1717  GuiBanner();
    18   ~GuiBanner();
     18  virtual ~GuiBanner();
    1919};
    2020

  • trunk/src/lib/gui/gtk_gui/gui_exec.h

    r5319 r6981  
    3434 public:
    3535  GuiExec();
    36   ~GuiExec();
     36  virtual ~GuiExec();
    3737
    3838  void setConfDir(const char* confDir);

  • trunk/src/lib/gui/gtk_gui/gui_flags.h

    r4836 r6981  
    2222 public:
    2323  GuiFlags();
    24   ~GuiFlags();
     24  virtual ~GuiFlags();
    2525
    2626  void setTextFromFlags(Widget* widget);
    2727  static void flagsText(Widget* widget, void* flagInfo);
    28  
     28
    2929  //! Struct that handles flag information.
    3030  struct FlagInfo

  • trunk/src/lib/gui/gtk_gui/gui_keys.h

    r4746 r6981  
    2828 public:
    2929  GuiKeys();
    30   ~GuiKeys();
     30  virtual ~GuiKeys();
    3131
    3232  static Window* inputWindow; //!< A Window that gets keyboard clicks. Static, because only one needed.
    … …  
    5555  MiscKeys();
    5656
    57   Button* getOpenButton(); 
     57  Button* getOpenButton();
    5858};
    5959

  • trunk/src/lib/gui/gtk_gui/gui_update.h

    r4944 r6981  
    100100 public:
    101101  GuiUpdate();
    102   ~GuiUpdate();
     102  virtual ~GuiUpdate();
    103103
    104104#ifdef HAVE_CURL

  • trunk/src/lib/gui/gtk_gui/gui_video.h

    r4746 r6981  
    1818 private:
    1919  //  Button* advancedWindowGetButton();
    20  
     20
    2121 public:
    2222  GuiVideo();
    23   ~GuiVideo();
     23  virtual ~GuiVideo();
    2424
    2525 private:

  • trunk/src/lib/network/connection_monitor.h

    r5822 r6981  
    1414  public:
    1515    ConnectionMonitor();
    16     ~ConnectionMonitor();
     16    virtual ~ConnectionMonitor();
    1717
    1818    void                processPacket(byte* packet, unsigned int packetLength);

  • trunk/src/lib/network/converter.h

    r6959 r6981  
    3030    static int intToByteArray(int x, byte* a, int length);
    3131    static int byteArrayToInt(const byte* a, int* x);
    32    
     32
    3333    static int _intToByteArray(int x, byte* a, int length);
    3434    static int _byteArrayToInt(const byte* a, int* x);
    … …  
    6060  private:
    6161    Converter();
    62     ~Converter();
     62    virtual ~Converter();
    6363};
    6464

  • trunk/src/lib/network/data_stream.h

    r6341 r6981  
    2020      DataStream();
    2121      DataStream(DataStream& inStream, DataStream& outStream);
    22       ~DataStream();
     22      virtual ~DataStream();
    2323
    2424

  • trunk/src/lib/network/network_game_manager.h

    r6737 r6981  
    7676{
    7777  public:
    78     ~NetworkGameManager();
     78    virtual ~NetworkGameManager();
    7979
    8080    static NetworkGameManager* NetworkGameManager::getInstance()

  • trunk/src/lib/network/network_manager.h

    r6695 r6981  
    3131    inline static NetworkManager* getInstance() { if (!NetworkManager::singletonRef) NetworkManager::singletonRef = new NetworkManager();
    3232      return NetworkManager::singletonRef; }
    33     ~NetworkManager();
     33    virtual ~NetworkManager();
    3434
    3535    void initialize();

  • trunk/src/lib/network/network_protocol.h

    r6341 r6981  
    2727  public:
    2828    NetworkProtocol();
    29     ~NetworkProtocol();
     29    virtual ~NetworkProtocol();
    3030
    3131    int createHeader(byte* data, int length, int bufferLength, const Synchronizeable& source);

  • trunk/src/lib/network/network_socket.h

    r6959 r6981  
    8787
    8888  NetworkSocket();
    89   ~NetworkSocket();
     89  virtual ~NetworkSocket();
    9090  NetworkSocket(IPaddress ip);
    9191  NetworkSocket(TCPsocket sock);

  • trunk/src/lib/network/network_stream.h

    r6695 r6981  
    3535    NetworkStream(unsigned int port);
    3636
    37     ~NetworkStream();
     37    virtual ~NetworkStream();
    3838    void init();
    3939

  • trunk/src/lib/network/server_socket.h

    r6139 r6981  
    3737    ServerSocket();
    3838    ServerSocket( unsigned int port );
    39     ~ServerSocket();
     39    virtual ~ServerSocket();
    4040    bool listen( unsigned int port );
    4141    NetworkSocket* getNewSocket( void );

  • trunk/src/lib/parser/ini_parser/ini_parser.h

    r5952 r6981  
    4343  public:
    4444    IniParser (const char* filename = NULL);
    45     ~IniParser ();
     45    virtual ~IniParser ();
    4646
    4747    /** @returns true if the file is opened, false otherwise*/

  • trunk/src/lib/shell/shell_command_class.h

    r5781 r6981  
    3737  private:
    3838    ShellCommandClass(const char* className);
    39     ~ShellCommandClass();
     39    virtual ~ShellCommandClass();
    4040
    4141    static const ShellCommandClass* isRegistered(const char* className);

  • trunk/src/lib/sound/ogg_player.h

    r6872 r6981  
    2828public:
    2929  OggPlayer(const char* fileName = NULL);
    30   ~OggPlayer();
     30  virtual ~OggPlayer();
    3131
    3232  bool open(const char* fileName);

  • trunk/src/lib/sound/sound_buffer.h

    r6836 r6981  
    1818  public:
    1919    SoundBuffer(const char* fileName);
    20     ~SoundBuffer();
     20    virtual ~SoundBuffer();
    2121
    2222    bool loadWAV(const char* fileName);

  • trunk/src/lib/sound/sound_source.h

    r6634 r6981  
    1919  public:
    2020    SoundSource(const PNode* sourceNode = NULL, const SoundBuffer* buffer = NULL);
    21     ~SoundSource();
     21    virtual ~SoundSource();
    2222
    2323  // user interaction

  • trunk/src/story_entities/game_world.cc

    r6878 r6981  
    190190  PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
    191191
     192  this->dataTank->unloadData();
     193
    192194  if (this->dataXML)
    193195    delete this->dataXML;
    194196
    195   this->dataTank->unloadData();
    196197}
    197198

  • trunk/src/story_entities/game_world_data.cc

    r6863 r6981  
    247247  // erease everything that is left.
    248248  // delete PNode::getNullParent(); // not needed as this is also done in the next step (and also much cleaner)
    249 
     249  const std::list<BaseObject*>* nodeList;
    250250  //secondary cleanup of PNodes;
    251   const std::list<BaseObject*>* nodeList = ClassList::getList(CL_PARENT_NODE);
     251  nodeList = ClassList::getList(CL_PARENT_NODE);
    252252  if (nodeList != NULL)
    253253    while (!nodeList->empty())
    254254      delete nodeList->front();
    255 
    256255  /* remove the player object */
    257256  if( this->localPlayer)
    258257    delete this->localPlayer;
     258
     259//   nodeList = ClassList::getList(CL_GRAPHICS_EFFECT);
     260//   if (nodeList != NULL)
     261//     while (!nodeList->empty())
     262//       delete nodeList->front();
     263//
     264//   nodeList = ClassList::getList(CL_ELEMENT_2D);
     265//   if (nodeList != NULL)
     266//     while (!nodeList->empty())
     267//       delete nodeList->front();
     268
     269
     270
    259271
    260272  // unload the resources !!

  • trunk/src/story_entities/simple_game_menu.h

    r6874 r6981  
    2525  public:
    2626    MenuLayer() {}
    27     ~MenuLayer() {}
     27    virtual ~MenuLayer() {}
    2828
    2929

  • trunk/src/subprojects/framework.h

    r4662 r6981  
    1717class Framework {
    1818  public:
    19     ~Framework();
     19    virtual ~Framework();
    2020
    2121    /** \returns a Pointer to the only object of this Class */

  • trunk/src/subprojects/network/network_unit_test.h

    r5822 r6981  
    1515  public:
    1616    NetworkUnitTest();
    17     ~NetworkUnitTest();
     17    virtual ~NetworkUnitTest();
    1818
    1919    void start();

  • trunk/src/subprojects/network/read_sync.h

    r6341 r6981  
    1414  public:
    1515    ReadSync(const char* name);
    16     ~ReadSync();
     16    virtual ~ReadSync();
    1717
    1818    virtual int writeBytes(const byte* data, int length, int sender);

  • trunk/src/subprojects/network/simple_sync.h

    r6341 r6981  
    1414  public:
    1515    SimpleSync(const char* name);
    16     ~SimpleSync();
     16    virtual ~SimpleSync();
    1717
    1818    virtual int writeBytes(const byte* data, int length, int sender);

  • trunk/src/subprojects/network/write_sync.h

    r6341 r6981  
    1414  public:
    1515    WriteSync(const char* name);
    16     ~WriteSync();
     16    virtual ~WriteSync();
    1717
    1818    virtual int writeBytes(const byte* data, int length, int sender);

  • trunk/src/util/loading/game_loader.h

    r6862 r6981  
    4040{
    4141 public:
    42   ~GameLoader ();
     42  virtual ~GameLoader ();
    4343  /**  this class is a singleton class @returns an instance of itself  */
    4444  static GameLoader* getInstance() { if(singletonRef == NULL) singletonRef = new GameLoader(); return singletonRef; }

  • trunk/src/util/loading/load_param.h

    r6613 r6981  
    8989  public:
    9090    CLoadParam(const TiXmlElement* root, const char* paramName, BaseObject* object, const Executor& executor, bool inLoadCycle = false);
    91     ~CLoadParam();
     91    virtual ~CLoadParam();
    9292
    9393    CLoadParam& describe(const char* descriptionText);

  • trunk/src/util/track/track_manager.h

    r6512 r6981  
    4444 public:
    4545  TrackElement();
    46   ~TrackElement();
     46  virtual ~TrackElement();
    4747
    4848  TrackElement* findByID(unsigned int trackID);

  • trunk/src/world_entities/environments/water.h

    r6766 r6981  
    2323 public:
    2424   Water(const TiXmlElement* root = NULL);
    25    ~Water();
     25   virtual ~Water();
    2626
    2727   void loadParams(const TiXmlElement* root);

  • trunk/src/world_entities/movie_entity.h

    r6731 r6981  
    3030  public:
    3131    MovieEntity (const TiXmlElement* root = NULL);
    32     ~MovieEntity ();
     32    virtual ~MovieEntity ();
    3333
    3434    virtual void draw () const;

  • trunk/src/world_entities/npcs/npc.h

    r6341 r6981  
    1212 public:
    1313  NPC ();
    14   ~NPC ();
     14  virtual ~NPC ();
    1515
    1616

  • trunk/src/world_entities/npcs/npc_test.h

    r6054 r6981  
    1212 public:
    1313  NPC2 ();
    14   ~NPC2 ();
     14  virtual ~NPC2 ();
    1515
    1616

  • trunk/src/world_entities/npcs/npc_test1.h

    r6054 r6981  
    1111 public:
    1212  NPCTest1 ();
    13   ~NPCTest1 ();
     13  virtual ~NPCTest1 ();
    1414
    1515

  • trunk/src/world_entities/recorder.h

    r6775 r6981  
    11/*!
    22 * @file recorder.h
    3  * 
     3 *
    44 */
    55
    … …  
    3333    AVPacket packet;
    3434    double video_pts;
    35    
     35
    3636    uint8_t *picture_buf;
    3737    int size;
    … …  
    4848  public:
    4949    Recorder (const TiXmlElement* root = NULL);
    50     ~Recorder ();
     50    virtual ~Recorder ();
    5151
    5252    virtual void draw () const;

  • trunk/src/world_entities/weapons/weapon_manager.h

    r6972 r6981  
    5353    WeaponManager(WorldEntity* parent);
    5454    WeaponManager(const TiXmlElement* root);
    55     ~WeaponManager();
     55    virtual ~WeaponManager();
    5656
    5757    void init();
Note: See TracChangeset for help on using the changeset viewer.