From 8b4844211ba585c58804a64f0c073ec08dc30bac Mon Sep 17 00:00:00 2001
From: thefish <thefish@zaar.be>
Date: Wed, 13 Nov 2019 02:59:58 +0300
Subject: [PATCH] fix context

---
 cmd/game/main.go                  | 5 +++--
 engine/gamemap/mapgens/default.go | 3 ++-
 ui/mainwindow/mainwindow.go       | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cmd/game/main.go b/cmd/game/main.go
index 2fc4b78..8056219 100644
--- a/cmd/game/main.go
+++ b/cmd/game/main.go
@@ -14,6 +14,7 @@ import (
 	"lab.zaar.be/thefish/alchemyst-go/ui"
 	"lab.zaar.be/thefish/alchemyst-go/ui/mainwindow"
 	"lab.zaar.be/thefish/alchemyst-go/util"
+	"lab.zaar.be/thefish/alchemyst-go/util/appctx"
 	blt "lab.zaar.be/thefish/bearlibterminal"
 	"os"
 	"runtime"
@@ -57,7 +58,7 @@ func main() {
 	var logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339}).Level(logLevels[config.Verbosity])
 
 	// set up context
-	mainCtx := util.NewClientContext(config, &logger)
+	mainCtx := appctx.NewClientContext(config, &logger)
 
 	//set up main window
 	mw := mainwindow.Init(mainCtx)
@@ -230,7 +231,7 @@ func setupLayers(mainwindow *mainwindow.MainWindow) {
 	mainwindow.AddLayer("menu", 3, "white")
 }
 
-func decodeInput(ctx util.ClientCtx, baseLayer *mainwindow.Layer) {
+func decodeInput(ctx appctx.ClientCtx, baseLayer *mainwindow.Layer) {
 	var exit = false
 	var waitForWCspam = true
 	for !exit {
diff --git a/engine/gamemap/mapgens/default.go b/engine/gamemap/mapgens/default.go
index 4dd901f..09c49f1 100644
--- a/engine/gamemap/mapgens/default.go
+++ b/engine/gamemap/mapgens/default.go
@@ -5,6 +5,7 @@ import (
 	"lab.zaar.be/thefish/alchemyst-go/engine/gamemap"
 	"lab.zaar.be/thefish/alchemyst-go/engine/types"
 	"lab.zaar.be/thefish/alchemyst-go/util"
+	"lab.zaar.be/thefish/alchemyst-go/util/appctx"
 )
 
 //fixme move to config
@@ -38,7 +39,7 @@ var fges = map[int]types.RectFill{
 	},
 }
 
-func DefaultGen(ctx util.ClientCtx,l *gamemap.Level) (*gamemap.Level, []gamemap.Room) {
+func DefaultGen(ctx appctx.ClientCtx,l *gamemap.Level) (*gamemap.Level, []gamemap.Room) {
 
 	rng := util.NewRNG()
 
diff --git a/ui/mainwindow/mainwindow.go b/ui/mainwindow/mainwindow.go
index b36a593..2577a4b 100644
--- a/ui/mainwindow/mainwindow.go
+++ b/ui/mainwindow/mainwindow.go
@@ -3,17 +3,17 @@ package mainwindow
 import (
 	"fmt"
 	"lab.zaar.be/thefish/alchemyst-go/engine/types"
-	"lab.zaar.be/thefish/alchemyst-go/util"
+	"lab.zaar.be/thefish/alchemyst-go/util/appctx"
 	blt "lab.zaar.be/thefish/bearlibterminal"
 )
 
 type MainWindow struct {
 	types.Rect
-	ctx    util.ClientCtx
+	ctx    appctx.ClientCtx
 	layers map[string]types.Renderable
 }
 
-func Init(ctx util.ClientCtx) *MainWindow {
+func Init(ctx appctx.ClientCtx) *MainWindow {
 	ctx.Logger().Info().Msgf("Opening main window...")
 	mw := MainWindow{ctx: ctx, layers: make(map[string]types.Renderable, 0)}
 	mw.Open()