Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: orxonox.OLD/orxonox/branches/levelloader/src/proto_class.cc @ 3715

Last change on this file since 3715 was 3605, checked in by bensch, 20 years ago

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 size: 1.1 KB
RevLine 
[1853]1
2
3/*
4   orxonox - the future of 3D-vertical-scrollers
5
6   Copyright (C) 2004 orx
7
8   This program is free software; you can redistribute it and/or modify
9   it under the terms of the GNU General Public License as published by
10   the Free Software Foundation; either version 2, or (at your option)
11   any later version.
[1855]12
13   ### File Specific:
14   main-programmer: ...
15   co-programmer: ...
[1853]16*/
17
[3605]18#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
[1853]19
20#include "proto_class.h"
21
[3605]22#include "stdincl.h" // maybe
[1853]23
[1856]24using namespace std;
[1853]25
[1856]26
[3245]27/**
28   \brief standard constructor
29   \todo this constructor is not jet implemented - do it
30*/
[3365]31ProtoClass::ProtoClass () 
32{
33   this->setClassName ("ProtoClass");
34}
[1853]35
36
[3245]37/**
38   \brief standard deconstructor
[1853]39
[3245]40*/
[3605]41ProtoClass::~ProtoClass () 
42{
43  // delete what has to be deleted here
44}
[1853]45
[3245]46/**
47   \brief nonsense - delete this method
48   \param realy nothing to give
49   \returns true or false - probably nothing?
50
[3329]51   this is just to show the doxygen abilities (this for example is an extension for a long comment)
[3245]52*/
53bool ProtoClass::doNonSense (int nothing) {}
Note: See TracBrowser for help on using the repository browser.