mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-03 06:24:32 +00:00
Code Issues Releases Wiki Activity

forgot console in prev commit

Browse source
This commit is contained in:
fgenesis 2017-06-25 15:13:06 +02:00
parent 081c6bd58d
commit 1af3b0f220
2 changed files with 5 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Aquaria/DSQ.cpp
View file

@ -1067,14 +1067,9 @@ This build is not yet final, and as such there are a couple things lacking. They
#ifdef AQUARIA_BUILD_CONSOLE #ifdef AQUARIA_BUILD_CONSOLE
debugLog("Creating console"); debugLog("Creating console");
console = new DebugFont; console = new DebugFont;
{ {
console->position = Vector(10 - virtualOffX,400);
console->followCamera = 1; console->followCamera = 1;
console->alpha = 0; console->alpha = 0;
console->setFontSize(6); console->setFontSize(6);
} }
addRenderObject(console, LR_DEBUG_TEXT); addRenderObject(console, LR_DEBUG_TEXT);
@ -4005,6 +4000,11 @@ void DSQ::onUpdate(float dt)
fpsText->setText(os.str()); fpsText->setText(os.str());
} }
#ifdef AQUARIA_BUILD_CONSOLE
if(console && console->alpha == 1)
console->position = Vector(10 - virtualOffX,400);
#endif
if (shakeCameraTimer > 0) if (shakeCameraTimer > 0)
{ {
shakeCameraTimer -= dt; shakeCameraTimer -= dt;
@ -4045,18 +4045,6 @@ bool DSQ::isShakingCamera()
return (shakeCameraTimer > 0); return (shakeCameraTimer > 0);
} }
bool DSQ::isScriptRunning()
{
if (nestedMains>1)
{
return true;
}
else
{
return false;
}
}
void DSQ::delay(float dt) void DSQ::delay(float dt)
{ {
core->run(dt); core->run(dt);

1
Aquaria/DSQ.h
View file

@ -214,7 +214,6 @@ public:
void cutsceneEffects(bool on); void cutsceneEffects(bool on);
bool isScriptRunning();
void delay(float dt); // active delay - game continues to run void delay(float dt); // active delay - game continues to run
void newGame(); void newGame();