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

9
source/fma/fma.cpp
View file

@ -82,6 +82,10 @@ FX
#include "game\game.h" #include "game\game.h"
#endif #endif
#ifndef __SAVE_SAVE_H__
#include "save\save.h"
#endif
/* Std Lib /* Std Lib
@ -185,6 +189,7 @@ enum
FMA_NEXT_SCENE_GAME, FMA_NEXT_SCENE_GAME,
FMA_NEXT_SCENE_CREDITS, FMA_NEXT_SCENE_CREDITS,
FMA_NEXT_SCENE_FMA, FMA_NEXT_SCENE_FMA,
FMA_NEXT_SCENE_SAVE,
FMA_NUM_NEXT_SCENES FMA_NUM_NEXT_SCENES
}; };
@ -332,6 +337,7 @@ static CScene *s_nextGameSceneTable[FMA_NUM_NEXT_SCENES]=
&GameScene, // FMA_NEXT_SCENE_GAME &GameScene, // FMA_NEXT_SCENE_GAME
&CreditsScene, // FMA_NEXT_SCENE_CREDITS &CreditsScene, // FMA_NEXT_SCENE_CREDITS
&FmaScene, // FMA_NEXT_SCENE_FMA &FmaScene, // FMA_NEXT_SCENE_FMA
&SaveScene, // FMA_NEXT_SCENE_SAVE
}; };
@ -946,8 +952,7 @@ static const int s_FMAC5EndScript[]=
SC_REGISTER_CONVERSATION, SCRIPTS_FMA_CH6_02_DAT, SC_REGISTER_CONVERSATION, SCRIPTS_FMA_CH6_02_DAT,
SC_REGISTER_CONVERSATION, SCRIPTS_FMA_CH6_03_DAT, SC_REGISTER_CONVERSATION, SCRIPTS_FMA_CH6_03_DAT,
SC_USE_LEVEL, 25, SC_USE_LEVEL, 25,
SC_SET_NEXT_SCENE, FMA_NEXT_SCENE_FMA, SC_SET_NEXT_SCENE, FMA_NEXT_SCENE_SAVE,
SC_SET_NEXT_FMA_NUMBER, CFmaScene::FMA_SCRIPT__PARTY,
SC_START, SC_START,
// Scene 1 - Shade Shoals // Scene 1 - Shade Shoals

10
source/game/game.cpp
View file

@ -103,6 +103,9 @@
#include "locale\textdbase.h" #include "locale\textdbase.h"
#endif #endif
#ifndef __SAVE_SAVE_H__
#include "save\save.h"
#endif
#include "gfx\actor.h" #include "gfx\actor.h"
@ -597,13 +600,12 @@ void CGameScene::think_playing(int _frames)
{ {
FmaScene.selectFma(fma); FmaScene.selectFma(fma);
GameState::setNextScene(&FmaScene); GameState::setNextScene(&FmaScene);
// After the last FMA it goes to save. We then need to make it go to PARTY
SaveScene.setNextScene(CSaveScene::NEXTSCENE_PARTY);
} }
else if(level==5) else if(level==5)
{ {
if(chapter==5)
{
ShopScene.setGotoPartyScreen();
}
GameState::setNextScene(&ShopScene); GameState::setNextScene(&ShopScene);
} }
else else

29
source/shop/shop.cpp
View file

@ -78,10 +78,6 @@
#include "gui\pointer.h" #include "gui\pointer.h"
#endif #endif
#ifndef __SAVE_SAVE_H__
#include "save\save.h"
#endif
/* Std Lib /* Std Lib
------- */ ------- */
@ -135,8 +131,6 @@ xmPlayingId s_playId;
CShopScene ShopScene; CShopScene ShopScene;
static int s_gotoPartyScreen=false;
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
Function: Function:
@ -408,18 +402,8 @@ void CShopScene::think(int _frames)
{ {
m_readyToExit=true; m_readyToExit=true;
CFader::setFadingOut(); 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); 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: Function:
Purpose: Ugh... I *really* hope this works ok with all languages, otherwise Purpose: Ugh... I *really* hope this works ok with all languages, otherwise

2
source/shop/shop.h
View file

@ -48,8 +48,6 @@ public:
int readyToShutdown(); int readyToShutdown();
char *getSceneName() {return"Shop";} char *getSceneName() {return"Shop";}
static void setGotoPartyScreen();
typedef enum typedef enum
{ {
SHOPITEM_TEDDY, SHOPITEM_TEDDY,