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-07-10 14:43:20 +00:00
parent 95b3458811
commit 7de947bfc2
6 changed files with 46 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
data/translations/text.dat
View file

@ -769,16 +769,10 @@ eng=Carolina Beroza
eng=Michael Rubinelli
[STR__CREDITS__JEREMY_BARNES]
eng=Jeremy Barnes
[STR__CREDITS__TBD]
eng=TBD
[STR__CREDITS__TBD]
eng=TBD
[STR__CREDITS__TBD]
eng=TBD
[STR__CREDITS__TBD]
eng=TBD
[STR__CREDITS__TBD]
eng=TBD
[STR__CREDITS__IAN_SEDENSKY]
eng=Ian Sedensky
[STR__CREDITS__CHUCK_SHEFFIELD]
eng=Chuck Sheffield
[STR__CREDITS__TBD]
eng=TBD
[STR__CREDITS__THQ_AND_THE_THQ_LOGO_ARE_TRADEMARKS_AND_OR_REGISTERED_TRADEMARKS_OF_THQ_INC]

3
source/backend/credits.cpp
View file

@ -203,7 +203,8 @@ static u16 s_creditData[]=
CC_NAME, STR__CREDITS__TBD,
CC_BLANK_LINE,
CC_TITLE, STR__CREDITS__TESTERS,
CC_NAME, STR__CREDITS__TBD,
CC_NAME, STR__CREDITS__IAN_SEDENSKY,
CC_NAME, STR__CREDITS__CHUCK_SHEFFIELD,
CC_END_OF_PAGE,
CC_TITLE, STR__CREDITS__PRODUCT_MANAGER,

1
source/map/map.cpp
View file

@ -469,6 +469,7 @@ void CMapScene::think(int _frames)
CSoundMediator::playSfx(CSoundMediator::SFX_FRONT_END__OK);
m_readyToExit=true;
CFader::setFadingOut();
CSaveScene::setNextScene(CSaveScene::NEXTSCENE_MAP);
GameState::setNextScene(&SaveScene);
}
}

16
source/save/save.cpp
View file

@ -54,6 +54,10 @@
#include "map\map.h"
#endif
#ifndef __BACKEND_PARTY_H__
#include "backend\party.h"
#endif
/* Std Lib
------- */
@ -84,6 +88,7 @@
CSaveScene SaveScene;
CSaveScene::NEXTSCENE CSaveScene::s_nextScene=CSaveScene::NEXTSCENE_MAP;
static const int NORMAL__FRAME_W=416;
static const int NORMAL__FRAME_H=160;
@ -547,8 +552,17 @@ void CSaveScene::setMode(MODE _newMode)
break;
case MODE__READYTOEXIT:
switch(s_nextScene)
{
case NEXTSCENE_MAP:
GameState::setNextScene(&MapScene);
break;
case NEXTSCENE_PARTY:
GameState::setNextScene(&FmaScene);
CFmaScene::selectFma(CFmaScene::FMA_SCRIPT__PARTY);
break;
}
break;
}
@ -558,6 +572,7 @@ void CSaveScene::setMode(MODE _newMode)
//////////
#ifdef __USER_paul__
static const char *text[]=
{
"MODE__CONFIRMSAVE",
@ -576,6 +591,7 @@ static const char *text[]=
"MODE__READYTOEXIT",
};
PAUL_DBGMSG("newmode: %s",text[m_mode]);
#endif
//////////
}

11
source/save/save.h
View file

@ -37,6 +37,13 @@
class CSaveScene: public CScene
{
public:
typedef enum
{
NEXTSCENE_MAP,
NEXTSCENE_PARTY,
}NEXTSCENE;
void init();
void shutdown();
void render();
@ -44,6 +51,8 @@ public:
int readyToShutdown();
char *getSceneName() {return"Save";}
static void setNextScene(NEXTSCENE _next) {s_nextScene=_next;}
private:
typedef enum
@ -87,6 +96,8 @@ private:
int m_timeInMode;
int m_userResponse;
static NEXTSCENE s_nextScene;
};

9
source/shop/shop.cpp
View file

@ -78,8 +78,8 @@
#include "gui\pointer.h"
#endif
#ifndef __FMA_FMA_H__
#include "fma\fma.h"
#ifndef __SAVE_SAVE_H__
#include "save\save.h"
#endif
@ -410,9 +410,10 @@ void CShopScene::think(int _frames)
CFader::setFadingOut();
if(s_gotoPartyScreen)
{
// Go to save screen, followed by party screen
s_gotoPartyScreen=false;
CFmaScene::selectFma(CFmaScene::FMA_SCRIPT__PARTY);
GameState::setNextScene(&FmaScene);
CSaveScene::setNextScene(CSaveScene::NEXTSCENE_PARTY);
GameState::setNextScene(&SaveScene);
}
else
{