zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-08-02 15:46:19 +00:00
parent 66cc625aba
commit 61ce128d67
4 changed files with 14 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

31
source/shop/shop.cpp
View file

@ -78,10 +78,6 @@
#include "gui\pointer.h"
#endif
#ifndef __SAVE_SAVE_H__
#include "save\save.h"
#endif
/* Std Lib
------- */
@ -135,8 +131,6 @@ xmPlayingId s_playId;
CShopScene ShopScene;
static int s_gotoPartyScreen=false;
/*----------------------------------------------------------------------
Function:
@ -408,17 +402,7 @@ void CShopScene::think(int _frames)
{
m_readyToExit=true;
CFader::setFadingOut();
if(s_gotoPartyScreen)
{
// Go to save screen, followed by party screen
s_gotoPartyScreen=false;
CSaveScene::setNextScene(CSaveScene::NEXTSCENE_PARTY);
GameState::setNextScene(&SaveScene);
}
else
{
GameState::setNextScene(&MapScene);
}
GameState::setNextScene(&MapScene);
}
m_guiFrame->think(_frames);
@ -486,19 +470,6 @@ int CShopScene::readyToShutdown()
}
/*----------------------------------------------------------------------
Function:
Purpose: Makes the game go to the party scene rather than the map
scene after the shop has been exited
Params:
Returns:
---------------------------------------------------------------------- */
void CShopScene::setGotoPartyScreen()
{
s_gotoPartyScreen=true;
}
/*----------------------------------------------------------------------
Function:
Purpose: Ugh... I *really* hope this works ok with all languages, otherwise