Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9141


Ignore:
Timestamp:
Apr 29, 2012, 3:42:22 PM (13 years ago)
Author:
mentzerf
Message:

Added readme file and reformatted some more

Location:
code/branches/newlevel2012
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • code/branches/newlevel2012/data/levels/towerDefense.oxw

    r9139 r9141  
    11<!-- TODO: Update the level's image-->
     2
     3<!-- See TowerDefenseReadme.txt for Information on this file -->
     4
    25<LevelInfo
    36 name = "Tower Defense"
    … …  
    1720  include("templates/spaceshipPirate.oxt")
    1821?>
    19 
    20 <!--  Hallo erstmal.
    21 Ich habe das Grundgerüst des Levels mal zum Laufen gebracht.
    22 Bei mir hat es das Playfield_ME.mesh allerdings nicht angezeigt; deswegen habe ich mit dem crate.mesh als testobjekt gearbeitet.
    23 Das Level macht genau das was ihr vermutlich erreichen wolltet. Wahrscheinlich wird die Funktionalität der "statischen Kamera" aber
    24 bloß in einer abgewandelten Art umgesetzt: In Pong und Tetris sind die Kameras nicht an das Spielfeld, sondern an ein ControllableEntity,
    25 das vom Spieler gesteuert wird gekoppelt.
    26 -->
    2722
    2823<!-- Specify the position of the camera -->

  • code/branches/newlevel2012/src/modules/towerdefense/Tower.cc

    r9135 r9141  
    66//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
    77//
     8
     9/* Not implemented fully */
    810
    911#include "Tower.h"

  • code/branches/newlevel2012/src/modules/towerdefense/Tower.h

    r9137 r9141  
    66//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
    77//
     8
     9/**
     10@brief
     11See TowerDefenseReadme.txt for Information.
     12   
     13@ingroup TowerDefense
     14*/
     15
    816
    917#ifndef Orxonox_Tower_h
    … …  
    2129                virtual ~Tower() {};
    2230               
    23                 virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
    24                 virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
     31                virtual void moveFrontBack(const Vector2& value);
     32                virtual void moveRightLeft(const Vector2& value);
    2533               
    2634                void setGame(TowerDefense* towerdefense)

  • code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h

    r9140 r9141  
    2626 *
    2727 */
     28         
     29 /**
     30         @brief
     31         GameType class for TowerDefense. See TowerDefenseReadme.txt for Information.
     32         
     33         @ingroup TowerDefense
     34 */
     35         
    2836
    2937#ifndef _TowerDefense_H__

  • code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc

    r9136 r9141  
    5050    {
    5151        RegisterObject(TowerDefenseCenterpoint);
    52 
    53                
    54                
    55         this->width_ = 10;
    56         this->height_ = 11;
     52 
     53                this->width_ = 15;
     54        this->height_ = 15;
    5755        this->towerTemplate_ = "";
    5856       
    59         this->checkGametype();
     57                this->checkGametype();
    6058    }
    6159
    … …  
    6866        SUPER(TowerDefenseCenterpoint, XMLPort, xmlelement, mode);
    6967
    70         XMLPortParam(TowerDefenseCenterpoint, "width", setWidth, getWidth, xmlelement, mode); // die Breite
    71         XMLPortParam(TowerDefenseCenterpoint, "height", setHeight, setWidth, xmlelement, mode); // die Grösse
     68        XMLPortParam(TowerDefenseCenterpoint, "width", setWidth, getWidth, xmlelement, mode);
     69        XMLPortParam(TowerDefenseCenterpoint, "height", setHeight, setWidth, xmlelement, mode);
    7270        XMLPortParam(TowerDefenseCenterpoint, "towerTemplate", setTowerTemplate, getTowerTemplate, xmlelement, mode);
    7371    }

  • code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h

    r9112 r9141  
    2828
    2929/**
    30     @file TowerDefenseCenterpoint.h
    31     @brief Declaration of the TowerDefenseCenterpoint class.
    32     @ingroup TowerDefense
    33 */
     30 @brief
     31 See TowerDefenseReadme.txt for Information.
     32 @ingroup TowerDefense
     33 */
     34
    3435
    3536#ifndef _TowerDefenseCenterpoint_H__
    … …  
    3940
    4041#include <string>
    41 
    4242#include <util/Math.h>
    4343
    … …  
    4646namespace orxonox
    4747{
    48    
    49     /**
    50     @brief
    51        
    52    
    53     @author
    54        
    55     @ingroup TowerDefense
    56     */
    5748    class _TowerDefenseExport TowerDefenseCenterpoint : public StaticEntity
    5849    {
    5950        public:
    60             TowerDefenseCenterpoint(BaseObject* creator); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually TowerDefense.
     51            TowerDefenseCenterpoint(BaseObject* creator);
    6152            virtual ~TowerDefenseCenterpoint() {}
    6253
    63             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a TowerDefenseCenterpoint through XML.
    64 
    65             virtual void changedGametype(); //!< Is called when the gametype has changed.
     54            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     55            virtual void changedGametype();
    6656           
    6757            /**
    68             @brief Set the width of the playing field.
    69             @param width The width in number of tiles.
     58            @brief The width and hight in number of tiles. Default is 15 for both.
    7059            */
    7160            void setWidth(unsigned int width)
    7261                { this->width_ = width; }
    73             /**
    74             @brief Get the width of the playing field.
    75             @return Returns the width in number of tiles.
    76             */
    77             unsigned int getWidth(void) const
     62           
     63                        unsigned int getWidth(void) const
    7864                { return this->width_; }
    7965               
    80             /**
    81             @brief Set the height of the playing field.
    82             @param height The height in number of tiles.
    83             */
    8466            void setHeight(unsigned int height)
    8567                { this->height_ = height; }
    86             /**
    87             @brief Get the height of the playing field.
    88             @return Returns the height in number of tiles.
    89             */
    90             unsigned int getHeight(void) const
     68           
     69                        unsigned int getHeight(void) const
    9170                { return this->height_; }
    9271               
    … …  
    9776            void setTowerTemplate(const std::string& templateName)
    9877                { this->towerTemplate_ = templateName; }
    99             /**
    100             @brief Get the template for the towers.
    101             @return Returns the template name to be applied to each tower.
    102             */
    103             const std::string& getTowerTemplate(void) const
     78           
     79                        const std::string& getTowerTemplate(void) const
    10480                { return this->towerTemplate_; }
    105            
    10681
    10782        private:
    108             void checkGametype(); //!< Checks whether the gametype is TowerDefense and if it is, sets its centerpoint.
     83            void checkGametype();
    10984           
    11085            unsigned int width_;
    11186            unsigned int height_;
    11287            std::string towerTemplate_;
    113 
    11488    };
    11589}
Note: See TracChangeset for help on using the changeset viewer.