Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 12, 2014, 2:27:50 PM (10 years ago)
Author:
sriedel
Message:

Bullshit

Location:
code/branches/surfaceraceHS14/src/modules/dodgerace2
Files:
2 added
8 edited

Legend:

Unmodified
Added
Removed
  • code/branches/surfaceraceHS14/src/modules/dodgerace2/CMakeLists.txt

    r10114 r10117  
    33DodgeRaceCenterPoint.cc
    44DodgeRaceHUDinfo.cc
     5DodgeRaceShip.cc
    56)
    67
  • code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc

    r10116 r10117  
    4545#include "infos/PlayerInfo.h"
    4646
    47 #include "DodgeRaceCenterPoint.h"
    48 /*#include "DodgeRaceShip.h"
     47/*#include "DodgeRaceCenterPoint.h"
     48#include "DodgeRaceShip.h"
    4949#include "DodgeRaceEnemy.h"
    5050#include "DodgeRaceEnemyShooter.h"
     
    6161        RegisterObject(DodgeRace);
    6262        this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
    63         this->center_ = 0;
     63        this->center_ = NULL;
    6464        init();
    6565        this->setHUDTemplate("DodgeRaceHUD"); // !!!!!!!!!!!!!!!        change later
     
    8282    void DodgeRace::levelUp()
    8383    {
    84         level++;/*
     84        level++;
    8585        if (getPlayer() != NULL)
    8686        {
     
    9696        multiplier *= 2;
    9797        toggleShowLevel();
    98         showLevelTimer.setTimer(1.0f, false, createExecutor(createFunctor(&DodgeRace::toggleShowLevel, this)));*/
     98        showLevelTimer.setTimer(1.0f, false, createExecutor(createFunctor(&DodgeRace::toggleShowLevel, this)));
    9999    }
    100100
    101     /*WeakPtr<DodgeRaceShip> DodgeRace::getPlayer()
     101    WeakPtr<DodgeRaceShip> DodgeRace::getPlayer()
    102102    {
    103103        if (player == NULL)
    104104        {
    105             //for (ObjectList<DodgeRaceShip>::iterator it = ObjectList<DodgeRaceShip>::begin(); it != ObjectList<DodgeRaceShip>::end(); ++it)
    106               //  player = *it;
     105            for (ObjectList<DodgeRaceShip>::iterator it = ObjectList<DodgeRaceShip>::begin(); it != ObjectList<DodgeRaceShip>::end(); ++it)
     106            {
     107                player = *it;
     108            }
    107109        }
    108110        return player;
    109111    }
    110112
    111     void DodgeRace::spawnEnemy()
     113    /*void DodgeRace::spawnEnemy()
    112114    {
    113115        if (getPlayer() == NULL)
  • code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h

    r10114 r10117  
    3636#define _DodgeRace_H__
    3737
    38 //#include "dodgerace2/DodgeRacePrereqs.h"
     38#include "dodgerace2/DodgeRacePrereqs.h"
    3939
    40 #include "DodgeRaceCenterPoint.h"
    41 #include "DodgeRaceHUDinfo.h"
     40//#include "DodgeRaceCenterPoint.h"
     41//#include "DodgeRaceHUDinfo.h"
     42//#include "DodgeRaceShip.h"
    4243
    4344#include "gametypes/Deathmatch.h"
    44 
    45 #include "DodgeRaceCenterPoint.h"
    46 
    4745#include "tools/Timer.h"
    4846
     
    8280        private:
    8381            void toggleShowLevel(){bShowLevel = !bShowLevel;}
    84             //WeakPtr<DodgeRaceShip> getPlayer();
     82            WeakPtr<DodgeRaceShip> getPlayer();
    8583            WeakPtr<DodgeRaceCenterPoint> center_;
    86             //WeakPtr<DodgeRaceShip> player;
     84            WeakPtr<DodgeRaceShip> player;
    8785
    8886            Timer enemySpawnTimer;
  • code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.cc

    r10114 r10117  
    3636#include "core/CoreIncludes.h"
    3737
    38 //#include "DodgeRace.h"
     38#include "DodgeRace.h"
    3939
    4040namespace orxonox
  • code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.h

    r10114 r10117  
    3636#define _DodgeRaceCenterPoint_H__
    3737
    38 //#include "dodgerace2/DodgeRacePrereqs.h"
    39 #include "DodgeRace.h"
    40 #include "DodgeRaceHUDinfo.h"
     38#include "dodgerace2/DodgeRacePrereqs.h"
     39
     40//#include "DodgeRace.h"
     41//#include "DodgeRaceHUDinfo.h"
    4142
    4243#include "worldentities/StaticEntity.h"
  • code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc

    r10114 r10117  
    3030#include "core/XMLPort.h"
    3131#include "util/Convert.h"
    32 #include "DodgeRace.h"
     32//#include "DodgeRace.h"
    3333
    3434namespace orxonox
  • code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h

    r10114 r10117  
    2828#define _DodgeRaceHUDinfo_H__
    2929
    30 //#include "DodgeRacePrereqs.h"
     30//#include "DodgeRaceShip.h"
    3131#include "DodgeRace.h"
    32 #include "DodgeRaceCenterPoint.h"
     32//#include "DodgeRaceCenterPoint.h"
     33
     34#include "dodgerace2/DodgeRacePrereqs.h"
    3335
    3436#include "tools/interfaces/Tickable.h"
  • code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRacePrereqs.h

    r10114 r10117  
    4343//-----------------------------------------------------------------------
    4444
    45 #if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(INVADER_STATIC_BUILD)
    46 #  ifdef INVADER_SHARED_BUILD
     45#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(DODGERACE_STATIC_BUILD)
     46#  ifdef DODGERACE_SHARED_BUILD
    4747#    define _DodgeRaceExport __declspec(dllexport)
    4848#  else
     
    6868namespace orxonox
    6969{
    70     //class DodgeRace;
    71     class DodgeRaceCenterPoint;/*
     70    class DodgeRace;
     71    class DodgeRaceCenterPoint;
    7272    class DodgeRaceShip;
    73     class DodgeRaceEnemy;
    74     class DodgeRaceEnemyShooter;
    75     class DodgeRaceWeapon;
    76     class DodgeRaceWeaponEnemy;*/
     73    //class DodgeRaceEnemy;
     74    //class DodgeRaceEnemyShooter;
     75    //class DodgeRaceWeapon;
     76    //class DodgeRaceWeaponEnemy;
    7777    class DodgeRaceHUDinfo;
    7878}
    7979
    80 #endif /* _DodgeRacePrereqs_H__ */
     80#endif /* _DodgeRacePrereqs_H__*/
Note: See TracChangeset for help on using the changeset viewer.