Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 1, 2010, 3:00:19 PM (14 years ago)
Author:
dafrick
Message:

Merging menu branch to trunk.

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/src/orxonox/overlays/InGameConsole.cc

    r7401 r7689  
    4949#include "core/ConfigValueIncludes.h"
    5050#include "core/command/ConsoleCommand.h"
     51#include "core/GUIManager.h"
    5152#include "core/input/InputManager.h"
    5253#include "core/input/InputState.h"
    5354#include "core/input/InputBuffer.h"
     55#include "core/LuaState.h"
    5456
    5557namespace orxonox
     
    119121                {
    120122                    if (this->consoleOverlayTextAreas_[i])
    121                       Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->consoleOverlayTextAreas_[i]);
     123                        Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->consoleOverlayTextAreas_[i]);
    122124                    this->consoleOverlayTextAreas_[i] = 0;
    123125                }
     
    495497                }
    496498                else
    497                   this->inputWindowStart_ = 0;
     499                    this->inputWindowStart_ = 0;
    498500                this->displayedText_ = output;
    499501                this->consoleOverlayTextAreas_[index]->setCaption(multi_cast<Ogre::DisplayString>(output));
     
    532534        {
    533535            this->bActive_ = false;
     536            GUIManager::getInstance().getLuaState()->doString("inGameConsoleClosed()"); // Notify the SheetManager in lua, that the console has been closed.
    534537            InputManager::getInstance().leaveState("console");
    535538            this->shell_->unregisterListener(this);
     
    608611    /*static*/ void InGameConsole::closeConsole()
    609612    {
     613        GUIManager::getInstance().getLuaState()->doString("inGameConsoleClosed()");  // Notify the SheetManager in lua, that the console has been closed, but not by ESC.
    610614        InGameConsole::getInstance().deactivate();
    611615    }
     616
    612617}
Note: See TracChangeset for help on using the changeset viewer.