From 287b5ed932cdc9e1358069b43d8edbf7726bf45c Mon Sep 17 00:00:00 2001
From: wgroeneveld <wouter.groeneveld@gmail.com>
Date: Thu, 29 Nov 2018 13:09:09 +0100
Subject: [PATCH] it is now possible to neglect palette initialization

---
 demos/demo1-basicfeatures/src/flying_stuff_scene.cpp | 2 +-
 demos/demo1-basicfeatures/src/flying_stuff_scene.h   | 2 +-
 demos/demo2-arkanoid/src/arkanoid_game_scene.cpp     | 1 -
 engine/include/libgba-sprite-engine/scene.h          | 5 ++++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/demos/demo1-basicfeatures/src/flying_stuff_scene.cpp b/demos/demo1-basicfeatures/src/flying_stuff_scene.cpp
index 48ad67e..eddfd3f 100644
--- a/demos/demo1-basicfeatures/src/flying_stuff_scene.cpp
+++ b/demos/demo1-basicfeatures/src/flying_stuff_scene.cpp
@@ -59,7 +59,7 @@ void FlyingStuffScene::load() {
     bg.get()->useMapScreenBlock(16);
 }
 
-void FlyingStuffScene::tick(u16 i) {
+void FlyingStuffScene::tick(u16 keys) {
     scrollX += 1;
 
     rotation += rotationDiff;
diff --git a/demos/demo1-basicfeatures/src/flying_stuff_scene.h b/demos/demo1-basicfeatures/src/flying_stuff_scene.h
index c4dca48..5743d89 100644
--- a/demos/demo1-basicfeatures/src/flying_stuff_scene.h
+++ b/demos/demo1-basicfeatures/src/flying_stuff_scene.h
@@ -28,7 +28,7 @@ public:
     std::vector<Background *> backgrounds() override;
 
     void load() override;
-    void tick(u16 i) override;
+    void tick(u16 keys) override;
 };
 
 
diff --git a/demos/demo2-arkanoid/src/arkanoid_game_scene.cpp b/demos/demo2-arkanoid/src/arkanoid_game_scene.cpp
index 0d74001..309fde7 100644
--- a/demos/demo2-arkanoid/src/arkanoid_game_scene.cpp
+++ b/demos/demo2-arkanoid/src/arkanoid_game_scene.cpp
@@ -79,7 +79,6 @@ void ArkanoidGameScene::tick(u16 keys) {
 
 void ArkanoidGameScene::load() {
     foregroundPalette = std::unique_ptr<ForegroundPaletteManager>(new ForegroundPaletteManager(paletteSharedPal, sizeof(paletteSharedPal)));
-    backgroundPalette = std::unique_ptr<BackgroundPaletteManager>(new BackgroundPaletteManager());
 
     SpriteBuilder<Sprite> builder;
 
diff --git a/engine/include/libgba-sprite-engine/scene.h b/engine/include/libgba-sprite-engine/scene.h
index 148e54a..86ad49f 100644
--- a/engine/include/libgba-sprite-engine/scene.h
+++ b/engine/include/libgba-sprite-engine/scene.h
@@ -32,7 +32,10 @@ public:
     virtual void load() = 0;
     virtual void tick(u16 i) = 0;
 
-    Scene(std::shared_ptr<GBAEngine> engine) : engine(engine) { }
+    Scene(std::shared_ptr<GBAEngine> engine) :
+            engine(engine),
+            foregroundPalette(std::unique_ptr<ForegroundPaletteManager>(new ForegroundPaletteManager())),
+            backgroundPalette(std::unique_ptr<BackgroundPaletteManager>(new BackgroundPaletteManager())) { }
     virtual ~Scene() {
         // scenes should manage their own resources - use std::unique_ptr
     }