mirror of
https://github.com/AquariaOSE/Aquaria.git
synced 2025-01-24 17:26:41 +00:00
fix harmless typo added in 70b8dcdc3a91c9; kill unused variable
This commit is contained in:
parent
e00940b2ae
commit
e5fad1e72e
2 changed files with 1 additions and 5 deletions
|
@ -210,7 +210,6 @@ Game::Game() : StateObject()
|
||||||
controlHint_text = 0;
|
controlHint_text = 0;
|
||||||
|
|
||||||
avatar = 0;
|
avatar = 0;
|
||||||
fromVel = Vector(0,-1);
|
|
||||||
deathTimer = 0;
|
deathTimer = 0;
|
||||||
|
|
||||||
game = this;
|
game = this;
|
||||||
|
@ -261,8 +260,6 @@ void Game::spawnManaBall(Vector pos, float a)
|
||||||
void Game::warpPrep()
|
void Game::warpPrep()
|
||||||
{
|
{
|
||||||
avatar->onWarp();
|
avatar->onWarp();
|
||||||
fromVel = avatar->vel;
|
|
||||||
fromVel.setLength2D(10);
|
|
||||||
fromPosition = avatar->position;
|
fromPosition = avatar->position;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2934,7 +2931,7 @@ void Game::applyState()
|
||||||
bindInput();
|
bindInput();
|
||||||
|
|
||||||
if (verbose) debugLog("Loading Scene");
|
if (verbose) debugLog("Loading Scene");
|
||||||
loadScene(sceneToLoad);
|
if(!loadScene(sceneToLoad))
|
||||||
{
|
{
|
||||||
debugLog("Failed to load scene [" + sceneToLoad + "]");
|
debugLog("Failed to load scene [" + sceneToLoad + "]");
|
||||||
}
|
}
|
||||||
|
|
|
@ -309,7 +309,6 @@ public:
|
||||||
std::string fromScene, toNode;
|
std::string fromScene, toNode;
|
||||||
int toFlip;
|
int toFlip;
|
||||||
char fromWarpType;
|
char fromWarpType;
|
||||||
Vector fromVel;
|
|
||||||
void warpToSceneFromNode(Path *p);
|
void warpToSceneFromNode(Path *p);
|
||||||
Vector fromPosition;
|
Vector fromPosition;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue