Fix include guard position. Move contents of Grid.*pp to Gameplay.*pp to avoid a circular dependency.

This commit is contained in:
Tim Schubert 2016-01-24 13:56:38 +01:00
parent ac0d35e053
commit 100065e158
11 changed files with 536 additions and 528 deletions

View file

@ -1,3 +1,6 @@
#ifndef _BOB_H
#define _BOB_H
#include <iostream>
#include <string>
#include <utility>
@ -9,9 +12,6 @@
#include "Events.hpp"
#include "Gui.hpp"
#ifndef _BOB_H
#define _BOB_H
const int SCREEN_WIDTH = 800;
const int SCREEN_HEIGTH = 600;
const int SIDEBAR_WIDTH = 200;
@ -23,7 +23,7 @@ class Game
public:
Game(SDL_Rect *window_dimensions, Sint16 size)
{
this->event_context = new EventContext(4);
this->event_context = new EventContext();
this->layout = new Layout(pointy_orientation, size,
{window_dimensions->w / 2, window_dimensions->h / 2},
{0, 0, window_dimensions->w - SIDEBAR_WIDTH, window_dimensions->h});