This commit is contained in:
Paul 2001-06-11 23:30:23 +00:00
parent 7a35e6eebd
commit 41e16d27a1
11 changed files with 69 additions and 33 deletions

View file

@ -74,6 +74,10 @@
#include "map\map.h"
#endif
#ifndef __BACKEND_PARTY_H__
#include "backend\party.h"
#endif
/* Std Lib
------- */
@ -127,6 +131,8 @@ xmPlayingId s_playId;
CShopScene ShopScene;
static int s_gotoPartyScreen=false;
/*----------------------------------------------------------------------
Function:
@ -355,7 +361,15 @@ void CShopScene::think(int _frames)
{
m_readyToExit=true;
CFader::setFadingOut();
GameState::setNextScene(&MapScene);
if(s_gotoPartyScreen)
{
s_gotoPartyScreen=false;
GameState::setNextScene(&PartyScene);
}
else
{
GameState::setNextScene(&MapScene);
}
}
m_guiFrame->think(_frames);
@ -423,6 +437,19 @@ 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