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

Browse source
This commit is contained in:
Daveo 2001-01-12 22:45:13 +00:00
parent aeb95010d3
commit 694c91c470
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
source/game/game.cpp
View file

@ -15,6 +15,8 @@
#include "gfx\fdata.h" #include "gfx\fdata.h"
#include "level\level.h" #include "level\level.h"
#include "player\player.h"
#include "gfx\anim.h"
#ifndef __GFX_BUBICLES__ #ifndef __GFX_BUBICLES__
#include "gfx\bubicles.h" #include "gfx\bubicles.h"
@ -43,6 +45,9 @@ void CGameScene::init()
VidSetClearScreen(1); VidSetClearScreen(1);
m_conversation.init(); m_conversation.init();
Level.init(); Level.init();
Player.init();
CAnimDB::LoadAnims();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -58,7 +63,8 @@ void CGameScene::shutdown()
void CGameScene::render() void CGameScene::render()
{ {
m_conversation.render(); m_conversation.render();
Level.render(); Player.render();
// Level.render();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -66,9 +72,13 @@ void CGameScene::think(int _frames)
{ {
m_conversation.think(_frames); m_conversation.think(_frames);
Level.think(_frames); Level.think(_frames);
Player.think();
Player.Animate();
if(!m_conversation.isActive()&&PadGetDown(0)&PAD_START) if(!m_conversation.isActive()&&PadGetDown(0)&PAD_START)
{
m_conversation.trigger(SCRIPTS_SPEECHTEST_DAT); m_conversation.trigger(SCRIPTS_SPEECHTEST_DAT);
}
} }

2
source/game/game.h
View file

@ -7,6 +7,7 @@
#include "system\gstate.h" #include "system\gstate.h"
#include "level\level.h" #include "level\level.h"
#include "player\player.h"
#ifndef __GAME_CONVO_H__ #ifndef __GAME_CONVO_H__
#include "game\convo.h" #include "game\convo.h"
@ -33,6 +34,7 @@ public:
private: private:
CLevel Level; CLevel Level;
CPlayer Player;
CConversation m_conversation; CConversation m_conversation;
static FontBank *s_genericFont; static FontBank *s_genericFont;
//static class SpriteBank *s_sprites; <-- Was causing compile error, sorry //static class SpriteBank *s_sprites; <-- Was causing compile error, sorry