Browse Source

Allow other classes to request the Game's Scene object.

legacy
Sam Hocevar sam 14 years ago
parent
commit
4ba04a7bfd
2 changed files with 16 additions and 6 deletions
  1. +14
    -6
      src/game.cpp
  2. +2
    -0
      src/game.h

+ 14
- 6
src/game.cpp View File

@@ -26,7 +26,7 @@ private:
int mousex, mousey; int mousex, mousey;
int done; int done;


int frame;
Scene *scene;
}; };


/* /*
@@ -39,7 +39,7 @@ Game::Game(char const *mapname)
data->map = new Map(mapname); data->map = new Map(mapname);
data->x = data->y = 0; data->x = data->y = 0;
data->done = 0; data->done = 0;
data->frame = 0;
data->scene = NULL;
} }


Game::~Game() Game::~Game()
@@ -62,12 +62,20 @@ void Game::TickRender(float delta_time)
{ {
Asset::TickRender(delta_time); Asset::TickRender(delta_time);


Scene *scene = new Scene();
GetScene();


data->map->Render(scene, data->mousex, data->mousey, 0);
data->map->Render(data->scene, data->mousex, data->mousey, 0);
data->scene->Render();


scene->Render();
delete scene;
delete data->scene;
data->scene = NULL;
}

Scene *Game::GetScene()
{
if (!data->scene)
data->scene = new Scene();
return data->scene;
} }


void Game::SetMouse(int x, int y) void Game::SetMouse(int x, int y)


+ 2
- 0
src/game.h View File

@@ -12,6 +12,7 @@
#define __DH_GAME_H__ #define __DH_GAME_H__


#include "asset.h" #include "asset.h"
#include "scene.h"


class GameData; class GameData;


@@ -29,6 +30,7 @@ protected:


public: public:
/* New methods */ /* New methods */
Scene *GetScene();
void SetMouse(int x, int y); void SetMouse(int x, int y);
void Quit(); void Quit();
int Finished(); int Finished();


Loading…
Cancel
Save