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

fix tile colors, mem constant

Browse Source
This commit is contained in:
anton.gurov 2019-10-31 16:38:29 +03:00
parent cddc5fa70f
commit 2bb7cae632
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/game/main.go
View File

@ -47,10 +47,11 @@ func (*GameState) Do(f func()) {
// func doSomething(State main.GameState, args...) { // func doSomething(State main.GameState, args...) {
// ... // ...
// State.Do(func() { // State.Do(func() {
// ...do stuff in main thread // ...do stuff in main thread, ie render something
// }) // })
// ... // ...
// } // }
// Use this trick CAREFULLY, cause closures may cause memleaks
var State = GameState{ var State = GameState{
mainfunc: make(chan func()), mainfunc: make(chan func()),

16
engine/gamemap/tile.go
View File

@ -82,7 +82,7 @@ func (t *Tile) GetChar() string {
} }
func (t *Tile) GetRawColor() uint32 { func (t *Tile) GetRawColor() uint32 {
if t.Visible { if !t.Visible {
return t.Appearance.ColorSet.Fg.GetColor() return t.Appearance.ColorSet.Fg.GetColor()
} else { } else {
return t.Appearance.ColorSet.DarkFg.GetColor() return t.Appearance.ColorSet.DarkFg.GetColor()
@ -90,7 +90,7 @@ func (t *Tile) GetRawColor() uint32 {
} }
func (t *Tile) GetRawBgColor() uint32 { func (t *Tile) GetRawBgColor() uint32 {
if t.Visible { if !t.Visible {
return t.Appearance.ColorSet.Bg.GetColor() return t.Appearance.ColorSet.Bg.GetColor()
} else { } else {
return t.Appearance.ColorSet.DarkBg.GetColor() return t.Appearance.ColorSet.DarkBg.GetColor()
@ -182,11 +182,11 @@ func NewWaterTile() *Tile {
Bg: &DanceColorHolder{ Bg: &DanceColorHolder{
255, 255,
singleColorRing(19), singleColorRing(19),
fillColorRing(19, 0, 15, 2), fillColorRing(22, 2, 42, 4),
fillColorRing(70, 120, 220, 12), fillColorRing(204, 180, 229, 12),
}, },
DarkFg: &PlainColorHolder{255, 30, 20, 50 }, DarkFg: &PlainColorHolder{255, 30, 20, 50 },
DarkBg: &PlainColorHolder{255, 7, 7, 30}, DarkBg: &PlainColorHolder{255, 7, 7, 80},
}, },
}, },
} }
@ -209,11 +209,11 @@ func NewDeepWaterTile() *Tile {
Bg: &DanceColorHolder{ Bg: &DanceColorHolder{
255, 255,
singleColorRing(5), singleColorRing(5),
fillColorRing(2,2,42,4), fillColorRing(2,0,15,2),
fillColorRing(154, 150, 229, 12), fillColorRing(154, 120, 180, 5),
}, },
DarkFg: &PlainColorHolder{255, 30, 20, 50}, DarkFg: &PlainColorHolder{255, 30, 20, 50},
DarkBg: &PlainColorHolder{255, 7, 7, 30}, DarkBg: &PlainColorHolder{255, 7, 7, 80},
}, },
}, },
} }