Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Paul 2001-07-13 15:42:58 +00:00
parent ff21bdcb8d
commit 43b93b2431
4 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/frontend/start.cpp
View File

@ -104,14 +104,14 @@
const int CFrontEndStart::s_itemFrames[]=
{
FRM_BLOWER, // SHOPITEM_BLOWER
FRM_CAKE, // SHOPITEM_CAKE
FRM_CUPCAKE, // SHOPITEM_CUPCAKE
FRM_JELLY2, // SHOPITEM_JELLY2
FRM_PARTYHAT, // SHOPITEM_PARTYHAT
FRM_PREZZIE, // SHOPITEM_PREZZIE
FRM_SARNIE, // SHOPITEM_SARNIE
FRM_TEDDY, // SHOPITEM_TEDDY
FRM_SARNIE, // SHOPITEM_SARNIE
FRM_CUPCAKE, // SHOPITEM_CUPCAKE
FRM_PREZZIE, // SHOPITEM_PREZZIE
FRM_JELLY2, // SHOPITEM_JELLY2
FRM_CAKE, // SHOPITEM_CAKE
FRM_BLOWER, // SHOPITEM_BLOWER
FRM_PARTYHAT, // SHOPITEM_PARTYHAT
};

16
source/shop/shop.cpp
View File

@ -121,14 +121,14 @@
// 125 tokens in total
CShopScene::SHOPITEM CShopScene::s_shopItems[NUM_SHOP_ITEM_IDS]=
{
{ 5, FRM_TEDDY },
{ 8, FRM_SARNIE },
{ 10, FRM_CUPCAKE },
{ 12, FRM_PREZZIE },
{ 16, FRM_JELLY2 },
{ 20, FRM_CAKE },
{ 24, FRM_BLOWER },
{ 30, FRM_PARTYHAT },
{ 5, FRM_TEDDY }, // SHOPITEM_TEDDY
{ 8, FRM_SARNIE }, // SHOPITEM_SARNIE
{ 10, FRM_CUPCAKE }, // SHOPITEM_CUPCAKE
{ 12, FRM_PREZZIE }, // SHOPITEM_PREZZIE
{ 16, FRM_JELLY2 }, // SHOPITEM_JELLY2
{ 20, FRM_CAKE }, // SHOPITEM_CAKE
{ 24, FRM_BLOWER }, // SHOPITEM_BLOWER
{ 30, FRM_PARTYHAT }, // SHOPITEM_PARTYHAT
};
xmPlayingId s_playId;

15
source/shop/shop.h
View File

@ -52,14 +52,15 @@ public:
typedef enum
{
SHOPITEM_BLOWER,
SHOPITEM_CAKE,
SHOPITEM_CUPCAKE,
SHOPITEM_JELLY2,
SHOPITEM_PARTYHAT,
SHOPITEM_PREZZIE,
SHOPITEM_SARNIE,
SHOPITEM_TEDDY,
SHOPITEM_SARNIE,
SHOPITEM_CUPCAKE,
SHOPITEM_PREZZIE,
SHOPITEM_JELLY2,
SHOPITEM_CAKE,
SHOPITEM_BLOWER,
SHOPITEM_PARTYHAT,
NUM_SHOP_ITEM_IDS
} SHOPITEM_ID;

14
source/system/gstate.cpp
View File

@ -139,10 +139,24 @@ void GameState::render()
/*****************************************************************************/
/*****************************************************************************/
/*****************************************************************************/
// Define this to make the game go to the scene selecter after every scene
//#define _ALWAYS_GO_BACK_TO_THE_SCENE_SELECTER_
#ifdef _ALWAYS_GO_BACK_TO_THE_SCENE_SELECTER_
#include "paul\scenesel.h"
#endif
void GameState::setNextScene( CScene *_nextScene )
{
ASSERT(!s_pendingScene);
#ifdef _ALWAYS_GO_BACK_TO_THE_SCENE_SELECTER_
if(s_currentScene!=&SceneSelector)
{
_nextScene=&SceneSelector;
}
#endif
s_pendingScene=_nextScene;
}