Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11150


Ignore:
Timestamp:
Mar 24, 2016, 3:52:07 PM (4 years ago)
Author:
binderm
Message:

tried consoleCommand, doesn't work yet. Please have a look;)

Location:
code/branches/bindermFS16
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua

    r11149 r11150  
    172172
    173173function P.CampaignButton_clicked(e)
    174     test()
     174    P.test()
    175175    showMenuSheet("CampaignMenu", true)
    176176end
  • code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc

    r11149 r11150  
    3232#include "core/XMLPort.h"
    3333#include "core/GameMode.h"
    34 #include "command/ConsoleCommandIncludes.h"
     34#include "core/command/ConsoleCommandIncludes.h"
    3535
    3636
     
    3838namespace orxonox
    3939{
    40     SetConsoleCommand("test", &test);
     40
     41    SetConsoleCommand("CampaignMenu", "test", &CampaignMenu::test);
     42
    4143    RegisterClass(CampaignMenu);
    4244
    43     CampaignMenu::CampaignMenu(context* context)
     45    CampaignMenu::CampaignMenu(Context* context)
    4446        :BaseObject(context)
    4547
     
    4951
    5052    CampaignMenu::~CampaignMenu()
    51     {
    52     }
     53    {}
    5354
    5455    void CampaignMenu::test()
    5556    {
     57        orxout()<<"test"<< endl;
     58    }
     59
     60    //loads the new campaign menu
     61    void CampaignMenu::loadnewmenu()
     62    {
    5663       
    5764    }
    58 
    5965}
  • code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h

    r11149 r11150  
    4141        ~CampaignMenu();
    4242        void test();
     43        void loadnewmenu();
    4344    };
    4445
  • code/branches/bindermFS16/src/orxonox/overlays/GUISheet.cc

    r9667 r11150  
    3333#include "core/XMLPort.h"
    3434#include "core/GameMode.h"
     35#include "core/command/ConsoleCommandIncludes.h"
    3536
    3637namespace orxonox
    3738{
     39
     40
    3841    RegisterClass(GUISheet);
     42
    3943
    4044    GUISheet::GUISheet(Context* context)
     
    9599        // Note: This call has no effect when already showing!
    96100    }
     101
    97102}
Note: See TracChangeset for help on using the changeset viewer.