thefish/alchemyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix context

Browse Source
This commit is contained in:
thefish 2019-11-13 02:59:58 +03:00
parent e0b4d000d3
commit 8b4844211b
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/game/main.go
View File

@ -14,6 +14,7 @@ import (
"lab.zaar.be/thefish/alchemyst-go/ui" "lab.zaar.be/thefish/alchemyst-go/ui"
"lab.zaar.be/thefish/alchemyst-go/ui/mainwindow" "lab.zaar.be/thefish/alchemyst-go/ui/mainwindow"
"lab.zaar.be/thefish/alchemyst-go/util" "lab.zaar.be/thefish/alchemyst-go/util"
"lab.zaar.be/thefish/alchemyst-go/util/appctx"
blt "lab.zaar.be/thefish/bearlibterminal" blt "lab.zaar.be/thefish/bearlibterminal"
"os" "os"
"runtime" "runtime"
@ -57,7 +58,7 @@ func main() {
var logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339}).Level(logLevels[config.Verbosity]) var logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339}).Level(logLevels[config.Verbosity])
// set up context // set up context
mainCtx := util.NewClientContext(config, &logger) mainCtx := appctx.NewClientContext(config, &logger)
//set up main window //set up main window
mw := mainwindow.Init(mainCtx) mw := mainwindow.Init(mainCtx)
@ -230,7 +231,7 @@ func setupLayers(mainwindow *mainwindow.MainWindow) {
mainwindow.AddLayer("menu", 3, "white") 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 exit = false
var waitForWCspam = true var waitForWCspam = true
for !exit { for !exit {

3
engine/gamemap/mapgens/default.go
View File

@ -5,6 +5,7 @@ import (
"lab.zaar.be/thefish/alchemyst-go/engine/gamemap" "lab.zaar.be/thefish/alchemyst-go/engine/gamemap"
"lab.zaar.be/thefish/alchemyst-go/engine/types" "lab.zaar.be/thefish/alchemyst-go/engine/types"
"lab.zaar.be/thefish/alchemyst-go/util" "lab.zaar.be/thefish/alchemyst-go/util"
"lab.zaar.be/thefish/alchemyst-go/util/appctx"
) )
//fixme move to config //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() rng := util.NewRNG()

6
ui/mainwindow/mainwindow.go
View File

@ -3,17 +3,17 @@ package mainwindow
import ( import (
"fmt" "fmt"
"lab.zaar.be/thefish/alchemyst-go/engine/types" "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" blt "lab.zaar.be/thefish/bearlibterminal"
) )
type MainWindow struct { type MainWindow struct {
types.Rect types.Rect
ctx util.ClientCtx ctx appctx.ClientCtx
layers map[string]types.Renderable layers map[string]types.Renderable
} }
func Init(ctx util.ClientCtx) *MainWindow { func Init(ctx appctx.ClientCtx) *MainWindow {
ctx.Logger().Info().Msgf("Opening main window...") ctx.Logger().Info().Msgf("Opening main window...")
mw := MainWindow{ctx: ctx, layers: make(map[string]types.Renderable, 0)} mw := MainWindow{ctx: ctx, layers: make(map[string]types.Renderable, 0)}
mw.Open() mw.Open()