Rename screen package to screens

z-riley · Nov 15, 2024 · 9f8394f · 9f8394f
1 parent ab9f9bb
commit 9f8394f
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 13 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/z-riley/go-2048-battle/config"
 	"github.com/z-riley/go-2048-battle/debug"
 	"github.com/z-riley/go-2048-battle/log"
-	"github.com/z-riley/go-2048-battle/screen"
+	"github.com/z-riley/go-2048-battle/screens"
 	"github.com/z-riley/turdgl"
 )
 
@@ -35,18 +35,18 @@ func main() {
 	}
 
 	// Parse starting screen arg
-	screenStr := flag.String("screen", string(screen.Title), "starting screen")
+	screenStr := flag.String("screen", string(screens.Title), "starting screen")
 	flag.Parse()
 
 	// Create screens
-	screen.Init(win)
-	screen.SetScreen(screen.ID(*screenStr), nil)
+	screens.Init(win)
+	screens.SetScreen(screens.ID(*screenStr), nil)
 
 	debugWidget := debug.NewDebugWidget(win)
 
 	// Main game loop
 	for win.IsRunning() {
-		screen.Update()
+		screens.Update()
 
 		if config.Debug {
 			// Add debug overlay

diff --git a/common/textbox.go b/common/textbox.go
@@ -158,7 +158,6 @@ func NewTooltip() *turdgl.TextBox {
 		SetStyle(turdgl.Style{Colour: ArenaBackgroundColour})
 
 	return turdgl.NewTextBox(r, "Click to edit", FontPathMedium).
-		SetTextOffset(turdgl.Vec{Y: 4}).
 		SetTextSize(16).
 		SetTextColour(LightGreyTextColour)
 }
diff --git a/screen/multiplayer.go → screens/multiplayer.go b/screen/multiplayer.go → screens/multiplayer.go
@@ -1,4 +1,4 @@
-package screen
+package screens
 
 import (
 	"fmt"

diff --git a/screen/multiplayer_host.go → screens/multiplayer_host.go b/screen/multiplayer_host.go → screens/multiplayer_host.go
@@ -1,4 +1,4 @@
-package screen
+package screens
 
 import (
 	"errors"

diff --git a/screen/multiplayer_join.go → screens/multiplayer_join.go b/screen/multiplayer_join.go → screens/multiplayer_join.go
@@ -1,4 +1,4 @@
-package screen
+package screens
 
 import (
 	"context"

diff --git a/screen/multiplayer_menu.go → screens/multiplayer_menu.go b/screen/multiplayer_menu.go → screens/multiplayer_menu.go
@@ -1,4 +1,4 @@
-package screen
+package screens
 
 import (
 	"github.com/z-riley/go-2048-battle/common"

diff --git a/screen/screen.go → screens/screens.go b/screen/screen.go → screens/screens.go
@@ -1,4 +1,4 @@
-package screen
+package screens
 
 import (
 	"github.com/z-riley/turdgl"

diff --git a/screen/singleplayer.go → screens/singleplayer.go b/screen/singleplayer.go → screens/singleplayer.go
@@ -1,4 +1,4 @@
-package screen
+package screens
 
 import (
 	"fmt"

diff --git a/screen/title.go → screens/title.go b/screen/title.go → screens/title.go
@@ -1,4 +1,4 @@
-package screen
+package screens
 
 import (
 	"github.com/z-riley/go-2048-battle/common"