.gitignore

@@ -1,15 +0,0 @@
-# Build artifacts
-build/
-goonscape
-goonscape.exe
-
-# IDE files
-.vscode/
-.idea/
-*.swp
-
-# OS files
-.DS_Store
-Thumbs.db 
-
-resources/models/old_and_test/

.woodpecker.yml

@@ -1,25 +0,0 @@
-pipeline:
-  build:
-    image: golang:1.23
-    commands:
-      # Install build dependencies
-      - apt-get update && apt-get install -y gcc-mingw-w64 cmake zip libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev libwayland-dev wayland-protocols libxkbcommon-dev
-      
-      # Build for all platforms
-      - make all
-    
-    when:
-      event: tag
-      tag: v*
-
-  # Optional: Create Gitea release with built artifacts
-  release:
-    image: plugins/gitea-release
-    settings:
-      api_key: 
-        from_secret: gitea_token
-      base_url: https://gitea.boner.be
-      files: build/*.zip
-    when:
-      event: tag
-      tag: v* 

2

@@ -1,5 +0,0 @@
-INFO: 2025/02/10 14:51:58 main.go:15: Starting GoonScape client
-INFO: 2025/02/10 14:51:58 main.go:38: Initializing window
-INFO: 2025/02/10 14:51:58 main.go:55: Loading game assets
-INFO: 2025/02/10 14:51:58 game.go:54: Loading game assets
-INFO: 2025/02/10 14:51:58 assets.go:51: Loading models

LICENSE

@@ -1,21 +1,11 @@
-MIT License
+“Commons Clause” License Condition v1.0
 
-Copyright (c) 2025 bdnugget
+The Software is provided to you by the Licensor under the License, as defined below, subject to the following condition.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Without limiting other conditions in the License, the grant of rights under the License will not include, and the License does not grant to you,  right to Sell the Software.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+For purposes of the foregoing, “Sell” means practicing any or all of the rights granted to you under the License to provide to third parties, for a fee or other consideration (including without limitation fees for hosting or consulting/ support services related to the Software), a product or service whose value derives, entirely or substantially, from the functionality of the Software.  Any license notice or attribution required by the License must also include this Commons Cause License Condition notice.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Software: GoonScape
+License: Commons Clause v1.0
+Licensor: bdnugget

Makefile

@@ -3,7 +3,7 @@
 include scripts/platforms.mk
 
 BINARY_NAME=goonscape
-VERSION=1.1.0
+VERSION=1.0.0
 BUILD_DIR=build
 ASSETS_DIR=resources
 

README.md

@@ -16,57 +16,24 @@ A multiplayer isometric game inspired by Oldschool RuneScape, built with Go and
 ## Prerequisites
 
 - Go 1.23 or higher
-- GCC (for CGO/SQLite support)
-- OpenGL development libraries
 - Raylib dependencies (see [raylib-go](https://github.com/gen2brain/raylib-go#requirements))
 
 ## Installation
 
-### Pre-built Binaries
-The easiest way to get started is to download the latest release from:
-```
-https://gitea.boner.be/bdnugget/goonscape/releases
-```
-Choose the appropriate zip file for your platform:
-- Windows: `goonscape-windows-amd64-v1.1.0.zip`
-- Linux: `goonscape-linux-amd64-v1.1.0.zip`
-
-Extract the zip and run the executable.
-
-### Quick Start
-For development:
-```bash
-# Run directly (recommended for development)
-go run main.go
-
-# Run with local server
-go run main.go -local
-```
-
-### Server Setup
-The server requires CGO for SQLite support:
-```bash
-# Enable CGO
-go env -w CGO_ENABLED=1
-
-# Clone and build server
-git clone https://gitea.boner.be/bdnugget/goonserver.git
-cd goonserver
-go build
-```
-
-### Client Installation
-Then install or build:
-```bash
-# Install the client
-go install gitea.boner.be/bdnugget/goonscape@latest
-```
-
-Or build from source:
+1. Clone the repository:
 ```bash
 git clone https://gitea.boner.be/bdnugget/goonscape.git
 cd goonscape
-go build
+```
+
+2. Install dependencies:
+```bash
+go mod tidy
+```
+
+3. Build and run:
+```bash
+go run main.go
 ```
 
 ## Controls
@@ -122,15 +89,3 @@ The project uses Protocol Buffers for network communication. If you modify the `
 ```bash
 protoc --go_out=. goonserver/actions/actions.proto
 ```
-
-### Fixing the models
-This is a note/reminder to myself. The models and animations are generated with [meshy.ai (referral link, give me credits pls)](https://www.meshy.ai/?utm_source=referral-program&utm_medium=link&utm_content=TUZLRK). Somehow the bones armature things are not in the same root as the model and it becomes like a weird pudding when using the animation. I had to manually fix this in Blender by doing:
-- Selected the char1 mesh thing
-- Alt + P (the right Alt kek) => Clear Parent and Keep Transform
-- Tried to do the same for Armature, they should both be in the Scene collection as siblings, so straight from root
-- Select char1 and press Ctrl + A => All Transforms
-- Repeat for Armature
-- Select char1 and make sure it still has the Armature Modifier attached (via purple wrench icon), I remove it and reapply it just to be sure
-
-When exporting it, I make sure Transform +Y is up direction is turned off, otherwise my gooner walks on the walls instead of the floor lmao
-

assets/assets.go

@@ -1,172 +1,38 @@
 package assets
 
 import (
-	"fmt"
-	"sync"
-
-	"gitea.boner.be/bdnugget/goonscape/logging"
 	"gitea.boner.be/bdnugget/goonscape/types"
 	rl "github.com/gen2brain/raylib-go/raylib"
 )
 
-var (
-	assetMutex       sync.RWMutex
-	loadedModels     map[string]types.ModelAsset
-	audioMutex       sync.Mutex
-	audioInitialized bool
-)
-
-func init() {
-	loadedModels = make(map[string]types.ModelAsset)
-}
-
-// Helper function to load animations for a model
-func loadModelAnimations(animPaths map[string]string) (types.AnimationSet, error) {
-	var animSet types.AnimationSet
-
-	// Load idle animations if specified
-	if idlePath, ok := animPaths["idle"]; ok {
-		idleAnims := rl.LoadModelAnimations(idlePath)
-		if len(idleAnims) > 0 {
-			animSet.Idle = idleAnims
-			rl.TraceLog(rl.LogInfo, "Loaded idle animation: %s (%d frames, %f seconds)",
-				idlePath, idleAnims[0].FrameCount, float32(idleAnims[0].FrameCount)/60.0)
-		}
-	}
-
-	// Load walk animations if specified
-	if walkPath, ok := animPaths["walk"]; ok {
-		walkAnims := rl.LoadModelAnimations(walkPath)
-		if len(walkAnims) > 0 {
-			animSet.Walk = walkAnims
-			rl.TraceLog(rl.LogInfo, "Loaded walk animation: %s (%d frames, %f seconds)",
-				walkPath, walkAnims[0].FrameCount, float32(walkAnims[0].FrameCount)/60.0)
-		}
-	}
-
-	return animSet, nil
-}
-
 func LoadModels() ([]types.ModelAsset, error) {
-	logging.Info.Println("Loading models")
-	assetMutex.Lock()
-	defer assetMutex.Unlock()
+	goonerModel := rl.LoadModel("resources/models/goonion.obj")
+	goonerTexture := rl.LoadTexture("resources/models/goonion.png")
+	rl.SetMaterialTexture(goonerModel.Materials, rl.MapDiffuse, goonerTexture)
 
-	if len(loadedModels) > 0 {
-		logging.Info.Println("Returning cached models")
-		models := make([]types.ModelAsset, 0, len(loadedModels))
-		for _, model := range loadedModels {
-			models = append(models, model)
-		}
-		return models, nil
-	}
+	coomerModel := rl.LoadModel("resources/models/coomer.obj")
+	coomerTexture := rl.LoadTexture("resources/models/coomer.png")
+	rl.SetMaterialTexture(coomerModel.Materials, rl.MapDiffuse, coomerTexture)
 
-	// Goonion model and animations
-	goonerModel := rl.LoadModel("resources/models/gooner/walk_no_y_transform.glb")
-	goonerAnims, err := loadModelAnimations(map[string]string{
-		"idle": "resources/models/gooner/idle_no_y_transform.glb",
-		"walk": "resources/models/gooner/walk_no_y_transform.glb",
-	})
-	if err != nil {
-		return nil, err
-	}
+	shrekeModel := rl.LoadModel("resources/models/shreke.obj")
+	shrekeTexture := rl.LoadTexture("resources/models/shreke.png")
+	rl.SetMaterialTexture(shrekeModel.Materials, rl.MapDiffuse, shrekeTexture)
 
-	// Apply transformations
-	transform := rl.MatrixIdentity()
-	transform = rl.MatrixMultiply(transform, rl.MatrixRotateY(180*rl.Deg2rad))
-	transform = rl.MatrixMultiply(transform, rl.MatrixRotateX(-90*rl.Deg2rad))
-	transform = rl.MatrixMultiply(transform, rl.MatrixScale(1.0, 1.0, 1.0))
-	goonerModel.Transform = transform
-
-	// Coomer model (ready for animations)
-	coomerModel := rl.LoadModel("resources/models/coomer/idle_notransy.glb")
-	coomerAnims, err := loadModelAnimations(map[string]string{
-		"idle": "resources/models/coomer/idle_notransy.glb",
-		"walk": "resources/models/coomer/unsteadywalk_notransy.glb",
-	})
-	if err != nil {
-		return nil, err
-	}
-	coomerModel.Transform = transform
-
-	// Shreke model (ready for animations)
-	shrekeModel := rl.LoadModel("resources/models/shreke/Animation_Slow_Orc_Walk_withSkin.glb")
-	shrekeAnims, err := loadModelAnimations(map[string]string{
-		"idle": "resources/models/shreke/Animation_Slow_Orc_Walk_withSkin.glb",
-		"walk": "resources/models/shreke/Animation_Excited_Walk_M_withSkin.glb",
-	})
-	if err != nil {
-		return nil, err
-	}
-	shrekeModel.Transform = transform
-
-	// Store loaded models
-	models := []types.ModelAsset{
-		{
-			Name:       "gooner",
-			Model:      goonerModel,
-			Animation:  append(goonerAnims.Idle, goonerAnims.Walk...),
-			AnimFrames: int32(len(goonerAnims.Idle) + len(goonerAnims.Walk)),
-			Animations: goonerAnims,
-			YOffset:    0.0,
-		},
-		{
-			Model:      coomerModel,
-			Animation:  append(coomerAnims.Idle, coomerAnims.Walk...),
-			AnimFrames: int32(len(coomerAnims.Idle) + len(coomerAnims.Walk)),
-			Animations: coomerAnims,
-			YOffset:    -4.0,
-		},
-		{
-			Model:      shrekeModel,
-			Animation:  append(shrekeAnims.Idle, shrekeAnims.Walk...),
-			AnimFrames: int32(len(shrekeAnims.Idle) + len(shrekeAnims.Walk)),
-			Animations: shrekeAnims,
-			YOffset:    0.0,
-		},
-	}
-
-	for _, model := range models {
-		loadedModels[model.Name] = model
-	}
-
-	return models, nil
+	return []types.ModelAsset{
+		{Model: goonerModel, Texture: goonerTexture},
+		{Model: coomerModel, Texture: coomerTexture},
+		{Model: shrekeModel, Texture: shrekeTexture},
+	}, nil
 }
 
 func LoadMusic(filename string) (rl.Music, error) {
-	logging.Info.Printf("Loading music from %s", filename)
-	audioMutex.Lock()
-	defer audioMutex.Unlock()
-
-	if !rl.IsAudioDeviceReady() {
-		err := fmt.Errorf("audio device not initialized")
-		logging.Error.Println(err)
-		return rl.Music{}, err
-	}
-
-	music := rl.LoadMusicStream(filename)
-	if music.CtxType == 0 {
-		err := fmt.Errorf("failed to load music stream")
-		logging.Error.Println(err)
-		return rl.Music{}, err
-	}
-	logging.Info.Println("Music loaded successfully")
-	return music, nil
+	return rl.LoadMusicStream(filename), nil
 }
 
 func UnloadModels(models []types.ModelAsset) {
-	assetMutex.Lock()
-	defer assetMutex.Unlock()
-
 	for _, model := range models {
-		if model.Animation != nil {
-			for i := int32(0); i < model.AnimFrames; i++ {
-				rl.UnloadModelAnimation(model.Animation[i])
-			}
-		}
 		rl.UnloadModel(model.Model)
 		rl.UnloadTexture(model.Texture)
-		delete(loadedModels, model.Name)
 	}
 }
 

build/linux/amd64/resources/models/coomer.mtl

@@ -0,0 +1,12 @@
+# Blender 3.6.0 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.001
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd coomer.png

build/linux/amd64/resources/models/goonion.mtl

@@ -0,0 +1,12 @@
+# Blender 3.6.0 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.001
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd goonion.png

build/linux/amd64/resources/models/shreke.mtl

@@ -0,0 +1,12 @@
+# Blender 3.6.0 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.001
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd shreke.png

build/windows/amd64/resources/models/coomer.mtl

@@ -0,0 +1,12 @@
+# Blender 3.6.0 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.001
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd coomer.png

build/windows/amd64/resources/models/goonion.mtl

@@ -0,0 +1,12 @@
+# Blender 3.6.0 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.001
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd goonion.png

build/windows/amd64/resources/models/shreke.mtl

@@ -0,0 +1,12 @@
+# Blender 3.6.0 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.001
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd shreke.png

config/config.go

@@ -1,7 +0,0 @@
-package config
-
-type Config struct {
-	PlayMusic bool
-}
-
-var Current = Config{PlayMusic: true}

game/camera.go

@@ -10,7 +10,6 @@ var (
 	cameraDistance = float32(20.0)
 	cameraYaw      = float32(145.0)
 	cameraPitch    = float32(45.0)
-	lastMousePos   rl.Vector2 // Add this to track mouse movement
 )
 
 func UpdateCamera(camera *rl.Camera3D, player rl.Vector3, deltaTime float32) {
@@ -33,34 +32,6 @@ func UpdateCamera(camera *rl.Camera3D, player rl.Vector3, deltaTime float32) {
 		}
 	}
 
-	// Handle middle mouse camera rotation
-	if rl.IsMouseButtonDown(rl.MouseMiddleButton) {
-		currentMousePos := rl.GetMousePosition()
-
-		// If we just started holding the button, initialize last position
-		if !rl.IsMouseButtonPressed(rl.MouseMiddleButton) {
-			mouseDelta := rl.Vector2{
-				X: currentMousePos.X - lastMousePos.X,
-				Y: currentMousePos.Y - lastMousePos.Y,
-			}
-
-			// Adjust rotation speed as needed
-			cameraYaw += mouseDelta.X * 0.5 * deltaTime * 60
-			cameraPitch += mouseDelta.Y * 0.5 * deltaTime * 60
-
-			// Clamp pitch to prevent camera flipping
-			if cameraPitch < 20 {
-				cameraPitch = 20
-			}
-			if cameraPitch > 85 {
-				cameraPitch = 85
-			}
-		}
-
-		lastMousePos = currentMousePos
-	}
-
-	// Keep the keyboard controls too
 	if rl.IsKeyDown(rl.KeyRight) {
 		cameraYaw += 100 * deltaTime
 	}

game/chat.go

@@ -2,7 +2,6 @@ package game
 
 import (
 	"fmt"
-	"sync"
 	"time"
 
 	"gitea.boner.be/bdnugget/goonscape/types"
@@ -20,7 +19,6 @@ const (
 )
 
 type Chat struct {
-	sync.RWMutex
 	messages     []types.ChatMessage
 	inputBuffer  []rune
 	isTyping     bool
@@ -51,8 +49,6 @@ func (c *Chat) AddMessage(playerID int32, content string) {
 }
 
 func (c *Chat) HandleServerMessages(messages []*pb.ChatMessage) {
-	c.Lock()
-	defer c.Unlock()
 	// Convert protobuf messages to our local type
 	for _, msg := range messages {
 		localMsg := types.ChatMessage{
@@ -84,14 +80,13 @@ func (c *Chat) HandleServerMessages(messages []*pb.ChatMessage) {
 						ExpireTime: time.Now().Add(6 * time.Second),
 					}
 					game.Player.Unlock()
-				} else if otherPlayer, exists := game.OtherPlayers.Load(msg.PlayerId); exists {
-					other := otherPlayer.(*types.Player)
-					other.Lock()
-					other.FloatingMessage = &types.FloatingMessage{
+				} else if otherPlayer, exists := game.OtherPlayers[msg.PlayerId]; exists {
+					otherPlayer.Lock()
+					otherPlayer.FloatingMessage = &types.FloatingMessage{
 						Content:    msg.Content,
 						ExpireTime: time.Now().Add(6 * time.Second),
 					}
-					other.Unlock()
+					otherPlayer.Unlock()
 				}
 			}
 		}
@@ -99,8 +94,6 @@ func (c *Chat) HandleServerMessages(messages []*pb.ChatMessage) {
 }
 
 func (c *Chat) Draw(screenWidth, screenHeight int32) {
-	c.RLock()
-	defer c.RUnlock()
 	// Calculate chat window width based on screen width
 	chatWindowWidth := screenWidth - (chatMargin * 2)
 
@@ -125,14 +118,8 @@ func (c *Chat) Draw(screenWidth, screenHeight int32) {
 
 	for i := startIdx; i < endIdx; i++ {
 		msg := c.messages[i]
-		var color rl.Color
-		if msg.PlayerID == 0 { // System message
-			color = rl.Gold
-		} else {
-			color = rl.White
-		}
 		text := fmt.Sprintf("%s: %s", msg.Username, msg.Content)
-		rl.DrawText(text, int32(chatX)+5, int32(messageY), 20, color)
+		rl.DrawText(text, int32(chatX)+5, int32(messageY), 20, rl.White)
 		messageY += messageHeight
 	}
 

game/context.go

@@ -1,38 +0,0 @@
-package game
-
-import (
-	"context"
-	"sync"
-)
-
-type GameContext struct {
-	ctx        context.Context
-	cancel     context.CancelFunc
-	wg         sync.WaitGroup
-	assetsLock sync.RWMutex
-}
-
-func NewGameContext() *GameContext {
-	ctx, cancel := context.WithCancel(context.Background())
-	return &GameContext{
-		ctx:    ctx,
-		cancel: cancel,
-	}
-}
-
-func (gc *GameContext) Shutdown() {
-	gc.cancel()
-	gc.wg.Wait()
-}
-
-func (gc *GameContext) LoadAssets(fn func() error) error {
-	gc.assetsLock.Lock()
-	defer gc.assetsLock.Unlock()
-	return fn()
-}
-
-func (gc *GameContext) UnloadAssets(fn func()) {
-	gc.assetsLock.Lock()
-	defer gc.assetsLock.Unlock()
-	fn()
-}

game/game.go

@@ -1,44 +1,33 @@
 package game
 
 import (
-	"fmt"
 	"os"
-	"sync"
 	"time"
 
-	"sync/atomic"
-
 	"gitea.boner.be/bdnugget/goonscape/assets"
-	"gitea.boner.be/bdnugget/goonscape/config"
-	"gitea.boner.be/bdnugget/goonscape/logging"
 	"gitea.boner.be/bdnugget/goonscape/network"
 	"gitea.boner.be/bdnugget/goonscape/types"
 	pb "gitea.boner.be/bdnugget/goonserver/actions"
 	rl "github.com/gen2brain/raylib-go/raylib"
 )
 
-var audioMutex sync.Mutex
-var audioInitOnce sync.Once
-
 type Game struct {
-	ctx          *GameContext
 	Player       *types.Player
-	OtherPlayers sync.Map // Using sync.Map for concurrent access
+	OtherPlayers map[int32]*types.Player
 	Camera       rl.Camera3D
 	Models       []types.ModelAsset
 	Music        rl.Music
 	Chat         *Chat
-	MenuOpen     atomic.Bool
+	MenuOpen     bool
 	QuitChan     chan struct{} // Channel to signal shutdown
 	loginScreen  *LoginScreen
-	isLoggedIn   atomic.Bool
+	isLoggedIn   bool
 }
 
 func New() *Game {
 	InitWorld()
 	game := &Game{
-		ctx:          NewGameContext(),
-		OtherPlayers: sync.Map{},
+		OtherPlayers: make(map[int32]*types.Player),
 		Camera: rl.Camera3D{
 			Position:   rl.NewVector3(0, 10, 10),
 			Target:     rl.NewVector3(0, 0, 0),
@@ -55,38 +44,22 @@ func New() *Game {
 }
 
 func (g *Game) LoadAssets() error {
-	audioMutex.Lock()
-	defer audioMutex.Unlock()
-
-	logging.Info.Println("Loading game assets")
 	var err error
-
-	// Load models first
 	g.Models, err = assets.LoadModels()
 	if err != nil {
-		logging.Error.Printf("Failed to load models: %v", err)
 		return err
 	}
 
-	// Load music only if enabled
-	if config.Current.PlayMusic {
-		logging.Info.Println("Loading music stream")
-		g.Music = rl.LoadMusicStream("resources/audio/GoonScape2.mp3")
-		if g.Music.CtxType == 0 {
-			logging.Error.Println("Failed to load music stream")
-			return fmt.Errorf("failed to load music stream")
-		}
-		logging.Info.Println("Music stream loaded successfully")
-	} else {
-		logging.Info.Println("Music disabled by config")
+	g.Music, err = assets.LoadMusic("resources/audio/GoonScape2.mp3")
+	if err != nil {
+		return err
 	}
 
-	logging.Info.Println("Assets loaded successfully")
 	return nil
 }
 
 func (g *Game) Update(deltaTime float32) {
-	if !g.isLoggedIn.Load() {
+	if !g.isLoggedIn {
 		username, password, isRegistering, submitted := g.loginScreen.Update()
 		if submitted {
 			conn, playerID, err := network.ConnectToServer(username, password, isRegistering)
@@ -95,17 +68,20 @@ func (g *Game) Update(deltaTime float32) {
 				return
 			}
 
+			// Assign model based on player ID
+			modelIndex := int(playerID) % len(g.Models)
 			g.Player = &types.Player{
 				Speed:      50.0,
 				TargetPath: []types.Tile{},
 				UserData:   g,
 				QuitDone:   make(chan struct{}),
 				ID:         playerID,
+				Model:      g.Models[modelIndex].Model,
+				Texture:    g.Models[modelIndex].Texture,
 			}
-			g.AssignModelToPlayer(g.Player)
 
-			go network.HandleServerCommunication(conn, playerID, g.Player, &g.OtherPlayers, g.QuitChan)
-			g.isLoggedIn.Store(true)
+			go network.HandleServerCommunication(conn, playerID, g.Player, g.OtherPlayers, g.QuitChan)
+			g.isLoggedIn = true
 			return
 		}
 		g.loginScreen.Draw()
@@ -114,12 +90,12 @@ func (g *Game) Update(deltaTime float32) {
 
 	// Handle ESC for menu
 	if rl.IsKeyPressed(rl.KeyEscape) {
-		g.MenuOpen.Store(!g.MenuOpen.Load())
+		g.MenuOpen = !g.MenuOpen
 		return
 	}
 
 	// Don't process other inputs if menu is open
-	if g.MenuOpen.Load() {
+	if g.MenuOpen {
 		return
 	}
 
@@ -135,21 +111,15 @@ func (g *Game) Update(deltaTime float32) {
 
 	g.HandleInput()
 
-	if len(g.Player.TargetPath) > 0 {
-		g.Player.Lock()
 	if len(g.Player.TargetPath) > 0 {
 		g.Player.MoveTowards(g.Player.TargetPath[0], deltaTime, GetMapGrid())
 	}
-		g.Player.Unlock()
-	}
 
-	g.OtherPlayers.Range(func(key, value any) bool {
-		other := value.(*types.Player)
+	for _, other := range g.OtherPlayers {
 		if len(other.TargetPath) > 0 {
 			other.MoveTowards(other.TargetPath[0], deltaTime, GetMapGrid())
 		}
-		return true
-	})
+	}
 
 	UpdateCamera(&g.Camera, g.Player.PosActual, deltaTime)
 }
@@ -182,42 +152,19 @@ func (g *Game) DrawMap() {
 	}
 }
 
-func (g *Game) DrawPlayer(player *types.Player) {
+func (g *Game) DrawPlayer(player *types.Player, model rl.Model) {
 	player.Lock()
 	defer player.Unlock()
 
-	if player.Model.Meshes == nil {
-		logging.Error.Println("Player model not initialized")
-		return
-	}
-
 	grid := GetMapGrid()
-	modelIndex := int(player.ID) % len(g.Models)
-	modelAsset := g.Models[modelIndex]
-
-	const defaultHeight = 8.0 // Default height above tile, fine tune per model in types.ModelAsset
 	playerPos := rl.Vector3{
 		X: player.PosActual.X,
-		Y: grid[player.PosTile.X][player.PosTile.Y].Height*types.TileHeight + defaultHeight + modelAsset.YOffset,
+		Y: grid[player.PosTile.X][player.PosTile.Y].Height*types.TileHeight + 16.0,
 		Z: player.PosActual.Z,
 	}
 
-	// Check if model has animations
-	if modelAsset.Animations.Idle != nil || modelAsset.Animations.Walk != nil {
-		if player.IsMoving && len(modelAsset.Animations.Walk) > 0 {
-			anim := modelAsset.Animations.Walk[0] // Use first walk animation
-			player.AnimationFrame = player.AnimationFrame % anim.FrameCount
-			rl.UpdateModelAnimation(player.Model, anim, player.AnimationFrame)
-		} else if len(modelAsset.Animations.Idle) > 0 {
-			anim := modelAsset.Animations.Idle[0] // Use first idle animation
-			player.AnimationFrame = player.AnimationFrame % anim.FrameCount
-			rl.UpdateModelAnimation(player.Model, anim, player.AnimationFrame)
-		}
-	}
+	rl.DrawModel(model, playerPos, 16, rl.White)
 
-	rl.DrawModel(player.Model, playerPos, 16, rl.White)
-
-	// Draw floating messages and path indicators
 	if player.FloatingMessage != nil {
 		screenPos := rl.GetWorldToScreen(rl.Vector3{
 			X: playerPos.X,
@@ -248,36 +195,27 @@ func (g *Game) DrawPlayer(player *types.Player) {
 }
 
 func (g *Game) Render() {
-	if !rl.IsWindowReady() {
-		logging.Error.Println("Window not ready for rendering")
-		return
-	}
-
 	rl.BeginDrawing()
-	defer func() {
-		if rl.IsWindowReady() {
-			rl.EndDrawing()
-		}
-	}()
+	rl.ClearBackground(rl.RayWhite)
 
-	if !g.isLoggedIn.Load() {
+	if !g.isLoggedIn {
 		g.loginScreen.Draw()
+		rl.EndDrawing()
 		return
 	}
 
 	rl.BeginMode3D(g.Camera)
 	g.DrawMap()
-	g.DrawPlayer(g.Player)
-
-	g.OtherPlayers.Range(func(key, value any) bool {
-		other := value.(*types.Player)
+	g.DrawPlayer(g.Player, g.Player.Model)
+	for id, other := range g.OtherPlayers {
 		if other.Model.Meshes == nil {
-			g.AssignModelToPlayer(other)
+			// Assign model based on player ID for consistency
+			modelIndex := int(id) % len(g.Models)
+			other.Model = g.Models[modelIndex].Model
+			other.Texture = g.Models[modelIndex].Texture
+		}
+		g.DrawPlayer(other, other.Model)
 	}
-		g.DrawPlayer(other)
-		return true
-	})
-
 	rl.EndMode3D()
 
 	// Draw floating messages
@@ -305,41 +243,27 @@ func (g *Game) Render() {
 		drawFloatingMessage(g.Player.FloatingMessage)
 	}
 
-	g.OtherPlayers.Range(func(key, value any) bool {
-		other := value.(*types.Player)
+	for _, other := range g.OtherPlayers {
 		drawFloatingMessage(other.FloatingMessage)
-		return true
-	})
+	}
 
 	// Draw menu if open
-	if g.MenuOpen.Load() {
+	if g.MenuOpen {
 		g.DrawMenu()
 	}
 
 	// Only draw chat if menu is not open
-	if !g.MenuOpen.Load() {
+	if !g.MenuOpen {
 		g.Chat.Draw(int32(rl.GetScreenWidth()), int32(rl.GetScreenHeight()))
 	}
 
 	rl.DrawFPS(10, 10)
+	rl.EndDrawing()
 }
 
 func (g *Game) Cleanup() {
-	// Unload models
-	if g.Models != nil {
 	assets.UnloadModels(g.Models)
-	}
-
-	// Stop and unload music if enabled
-	if config.Current.PlayMusic && g.Music.CtxType != 0 {
-		rl.StopMusicStream(g.Music)
-		rl.UnloadMusicStream(g.Music)
-	}
-
-	// Close audio device if it's ready
-	if rl.IsAudioDeviceReady() {
-		rl.CloseAudioDevice()
-	}
+	assets.UnloadMusic(g.Music)
 }
 
 func (g *Game) HandleInput() {
@@ -398,7 +322,7 @@ func (g *Game) DrawMenu() {
 			if rl.IsMouseButtonPressed(rl.MouseLeftButton) {
 				switch item {
 				case "Resume":
-					g.MenuOpen.Store(false)
+					g.MenuOpen = false
 				case "Settings":
 					// TODO: Implement settings
 				case "Exit Game":
@@ -428,42 +352,3 @@ func (g *Game) Shutdown() {
 func (g *Game) HandleServerMessages(messages []*pb.ChatMessage) {
 	g.Chat.HandleServerMessages(messages)
 }
-
-func (g *Game) AssignModelToPlayer(player *types.Player) {
-	modelIndex := int(player.ID) % len(g.Models)
-	modelAsset := g.Models[modelIndex]
-
-	player.Model = modelAsset.Model
-	player.Texture = modelAsset.Texture
-	player.AnimationFrame = 0
-}
-
-func (g *Game) Run() {
-	if config.Current.PlayMusic {
-		audioInitOnce.Do(func() {
-			logging.Info.Println("Initializing audio device")
-			rl.InitAudioDevice()
-			if !rl.IsAudioDeviceReady() {
-				logging.Error.Println("Failed to initialize audio device")
-			}
-		})
-		defer func() {
-			logging.Info.Println("Closing audio device")
-			rl.CloseAudioDevice()
-		}()
-	}
-
-	logging.Info.Println("Starting game loop")
-	for !rl.WindowShouldClose() {
-		deltaTime := rl.GetFrameTime()
-		if config.Current.PlayMusic {
-			rl.UpdateMusicStream(g.Music)
-		}
-		g.Update(deltaTime)
-		g.Render()
-	}
-	logging.Info.Println("Game loop ended")
-
-	logging.Info.Println("Closing quit channel")
-	close(g.QuitChan)
-}

game/pathfinding.go

@@ -83,7 +83,6 @@ func heuristic(a, b types.Tile) float32 {
 }
 
 func distance(a, b types.Tile) float32 {
-	_, _ = a, b
 	return 1.0 // uniform cost for now
 }
 

go.mod

@@ -3,15 +3,15 @@ module gitea.boner.be/bdnugget/goonscape
 go 1.23.0
 
 require (
-	gitea.boner.be/bdnugget/goonserver v1.1.0
+	gitea.boner.be/bdnugget/goonserver v0.0.0-20250113131525-49e23114973c
 	github.com/gen2brain/raylib-go/raylib v0.0.0-20250109172833-6dbba4f81a9b
 	google.golang.org/protobuf v1.36.3
 )
 
 require (
 	github.com/ebitengine/purego v0.8.2 // indirect
-	golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 // indirect
-	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
+	golang.org/x/sys v0.29.0 // indirect
 )
 
 replace gitea.boner.be/bdnugget/goonserver => ./goonserver

go.sum

@@ -6,11 +6,7 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA=
 golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
-golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 h1:qNgPs5exUA+G0C96DrPwNrvLSj7GT/9D+3WMWUcUg34=
-golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
 golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
 golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
 google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

goonserver

@@ -1 +1 @@
-Subproject commit f9ec811b10bbab54e843199eb68156e9e7c143cc
+Subproject commit 27da845b11f968aa77139c871becc6ce4c688038

logging/logging.go

@@ -1,16 +0,0 @@
-package logging
-
-import (
-	"log"
-	"os"
-)
-
-var (
-	Info  *log.Logger
-	Error *log.Logger
-)
-
-func init() {
-	Info = log.New(os.Stdout, "INFO: ", log.Ldate|log.Ltime|log.Lshortfile)
-	Error = log.New(os.Stderr, "ERROR: ", log.Ldate|log.Ltime|log.Lshortfile)
-}

main.go

@@ -5,27 +5,17 @@ import (
 	"log"
 	"strings"
 
-	"gitea.boner.be/bdnugget/goonscape/config"
 	"gitea.boner.be/bdnugget/goonscape/game"
-	"gitea.boner.be/bdnugget/goonscape/logging"
 	"gitea.boner.be/bdnugget/goonscape/network"
 	rl "github.com/gen2brain/raylib-go/raylib"
 )
 
 func main() {
-	logging.Info.Println("Starting GoonScape client")
-
-	// Raylib log level warn
-	rl.SetTraceLogLevel(rl.LogWarning)
 	// Parse command line flags
 	local := flag.Bool("local", false, "Connect to local server")
 	addr := flag.String("addr", "", "Server address (host or host:port)")
-	noMusic := flag.Bool("no-music", false, "Disable music playback")
 	flag.Parse()
 
-	// Set config before any game initialization
-	config.Current.PlayMusic = !*noMusic
-
 	// Set server address based on flags
 	if *local {
 		if *addr != "" {
@@ -40,40 +30,31 @@ func main() {
 		network.SetServerAddr(*addr)
 	}
 
-	logging.Info.Println("Initializing window")
 	rl.InitWindow(1024, 768, "GoonScape")
-	defer func() {
-		logging.Info.Println("Closing window")
-		rl.CloseWindow()
-	}()
+	rl.SetExitKey(0)
+	defer rl.CloseWindow()
 
-	// Initialize audio device first
-	if !rl.IsAudioDeviceReady() {
 	rl.InitAudioDevice()
-		if !rl.IsAudioDeviceReady() {
-			log.Fatal("Failed to initialize audio device")
-		}
-	}
 	defer rl.CloseAudioDevice()
 
+	rl.SetTargetFPS(60)
+
 	game := game.New()
-	logging.Info.Println("Loading game assets")
 	if err := game.LoadAssets(); err != nil {
 		log.Fatalf("Failed to load assets: %v", err)
 	}
-	defer func() {
-		logging.Info.Println("Cleaning up game resources")
-		game.Cleanup()
-	}()
+	defer game.Cleanup()
 
-	if config.Current.PlayMusic {
-		logging.Info.Println("Starting music playback")
 	rl.PlayMusicStream(game.Music)
 	rl.SetMusicVolume(game.Music, 0.5)
+
+	for !rl.WindowShouldClose() {
+		deltaTime := rl.GetFrameTime()
+		rl.UpdateMusicStream(game.Music)
+		game.Update(deltaTime)
+		game.Render()
 	}
 
-	rl.SetTargetFPS(60)
-	logging.Info.Println("Starting game loop")
-	game.Run()
-	logging.Info.Println("Game exited cleanly")
+	// Wait for clean shutdown
+	<-game.QuitChan
 }

network/network.go

@@ -2,18 +2,16 @@ package network
 
 import (
 	"bufio"
-	"context"
 	"encoding/binary"
 	"fmt"
 	"io"
 	"log"
 	"net"
-	"sync"
 	"time"
 
-	"gitea.boner.be/bdnugget/goonscape/logging"
 	"gitea.boner.be/bdnugget/goonscape/types"
 	pb "gitea.boner.be/bdnugget/goonserver/actions"
+	rl "github.com/gen2brain/raylib-go/raylib"
 	"google.golang.org/protobuf/proto"
 )
 
@@ -21,84 +19,18 @@ const protoVersion = 1
 
 var serverAddr = "boner.be:6969"
 
-type NetworkManager struct {
-	ctx    context.Context
-	conn   net.Conn
-	reader *bufio.Reader
-	writer *bufio.Writer
-	mu     sync.Mutex
-}
-
-func NewNetworkManager(ctx context.Context) *NetworkManager {
-	return &NetworkManager{
-		ctx: ctx,
-	}
-}
-
 func SetServerAddr(addr string) {
 	serverAddr = addr
 }
 
-func (nm *NetworkManager) Connect(addr string) error {
-	nm.mu.Lock()
-	defer nm.mu.Unlock()
-
-	var err error
-	nm.conn, err = net.Dial("tcp", addr)
-	if err != nil {
-		return err
-	}
-
-	nm.reader = bufio.NewReader(nm.conn)
-	nm.writer = bufio.NewWriter(nm.conn)
-
-	go nm.readLoop()
-	return nil
-}
-
-func (nm *NetworkManager) readLoop() {
-	for {
-		select {
-		case <-nm.ctx.Done():
-			return
-		default:
-			// Read and process messages
-		}
-	}
-}
-
-func (nm *NetworkManager) Send(message proto.Message) error {
-	nm.mu.Lock()
-	defer nm.mu.Unlock()
-
-	data, err := proto.Marshal(message)
-	if err != nil {
-		return err
-	}
-
-	// Write length prefix
-	lengthBuf := make([]byte, 4)
-	binary.BigEndian.PutUint32(lengthBuf, uint32(len(data)))
-	if _, err := nm.writer.Write(lengthBuf); err != nil {
-		return err
-	}
-
-	// Write message body
-	if _, err := nm.writer.Write(data); err != nil {
-		return err
-	}
-
-	return nm.writer.Flush()
-}
-
 func ConnectToServer(username, password string, isRegistering bool) (net.Conn, int32, error) {
-	logging.Info.Println("Attempting to connect to server at", serverAddr)
 	conn, err := net.Dial("tcp", serverAddr)
 	if err != nil {
-		logging.Error.Printf("Failed to dial server: %v", err)
+		log.Printf("Failed to dial server: %v", err)
 		return nil, 0, err
 	}
-	logging.Info.Println("Connected to server. Authenticating...")
+
+	log.Println("Connected to server. Authenticating...")
 
 	// Send auth message
 	authAction := &pb.Action{
@@ -149,7 +81,7 @@ func ConnectToServer(username, password string, isRegistering bool) (net.Conn, i
 
 	if !response.AuthSuccess {
 		conn.Close()
-		return nil, 0, fmt.Errorf("authentication failed: %s", response.ErrorMessage)
+		return nil, 0, fmt.Errorf(response.ErrorMessage)
 	}
 
 	playerID := response.GetPlayerId()
@@ -157,63 +89,134 @@ func ConnectToServer(username, password string, isRegistering bool) (net.Conn, i
 	return conn, playerID, nil
 }
 
-func HandleServerCommunication(conn net.Conn, playerID int32, player *types.Player, otherPlayers *sync.Map, quitChan <-chan struct{}) {
-	defer func() {
-		logging.Info.Println("Closing connection and cleaning up for player", playerID)
-		conn.Close()
-		close(player.QuitDone)
-	}()
-
+func HandleServerCommunication(conn net.Conn, playerID int32, player *types.Player, otherPlayers map[int32]*types.Player, quitChan <-chan struct{}) {
 	reader := bufio.NewReader(conn)
-	ticker := time.NewTicker(100 * time.Millisecond)
-	defer ticker.Stop()
+
+	actionTicker := time.NewTicker(types.ClientTickRate)
+	defer actionTicker.Stop()
+	defer conn.Close()
+	defer close(player.QuitDone)
+
+	// Create a channel to signal when goroutines are done
+	done := make(chan struct{})
+
+	go func() {
+		for {
+			select {
+			case <-quitChan:
+				// Send disconnect message to server
+				disconnectMsg := &pb.ActionBatch{
+					PlayerId: playerID,
+					Actions: []*pb.Action{{
+						Type:     pb.Action_DISCONNECT,
+						PlayerId: playerID,
+					}},
+				}
+				writeMessage(conn, disconnectMsg)
+				done <- struct{}{}
+				return
+			case <-actionTicker.C:
+				player.Lock()
+				if len(player.ActionQueue) > 0 {
+					actions := make([]*pb.Action, len(player.ActionQueue))
+					copy(actions, player.ActionQueue)
+
+					batch := &pb.ActionBatch{
+						PlayerId: playerID,
+						Actions:  actions,
+						Tick:     player.CurrentTick,
+					}
+
+					player.ActionQueue = player.ActionQueue[:0]
+					player.Unlock()
+
+					if err := writeMessage(conn, batch); err != nil {
+						log.Printf("Failed to send actions to server: %v", err)
+						return
+					}
+				} else {
+					player.Unlock()
+				}
+			}
+		}
+	}()
 
 	for {
 		select {
 		case <-quitChan:
+			done := make(chan struct{})
+			go func() {
+				<-done
+				close(player.QuitDone)
+			}()
+
+			select {
+			case <-done:
+				time.Sleep(100 * time.Millisecond)
+			case <-time.After(1 * time.Second):
+				log.Println("Shutdown timed out")
+			}
 			return
-		case <-ticker.C:
-			// Read message length
+		default:
+			// Read message length (4 bytes)
 			lengthBuf := make([]byte, 4)
 			if _, err := io.ReadFull(reader, lengthBuf); err != nil {
 				log.Printf("Failed to read message length: %v", err)
-				continue
+				return
 			}
 			messageLength := binary.BigEndian.Uint32(lengthBuf)
 
-			// Read message body
+			// Read the full message
 			messageBuf := make([]byte, messageLength)
 			if _, err := io.ReadFull(reader, messageBuf); err != nil {
 				log.Printf("Failed to read message body: %v", err)
-				continue
+				return
 			}
 
-			// Process server message
 			var serverMessage pb.ServerMessage
 			if err := proto.Unmarshal(messageBuf, &serverMessage); err != nil {
 				log.Printf("Failed to unmarshal server message: %v", err)
 				continue
 			}
 
-			// Update player states
+			player.Lock()
+			player.CurrentTick = serverMessage.CurrentTick
+
+			tickDiff := serverMessage.CurrentTick - player.CurrentTick
+			if tickDiff > types.MaxTickDesync {
 				for _, state := range serverMessage.Players {
-				if state == nil {
-					logging.Error.Println("Received nil player state")
+					if state.PlayerId == playerID {
+						player.ForceResync(state)
+						break
+					}
+				}
+			}
+			player.Unlock()
+
+			for _, state := range serverMessage.Players {
+				if state.PlayerId == playerID {
+					player.Lock()
+					// Update initial position if not set
+					if player.PosActual.X == 0 && player.PosActual.Z == 0 {
+						player.PosActual = rl.Vector3{
+							X: float32(state.X * types.TileSize),
+							Y: 0,
+							Z: float32(state.Y * types.TileSize),
+						}
+						player.PosTile = types.Tile{X: int(state.X), Y: int(state.Y)}
+					}
+					player.Unlock()
 					continue
 				}
 
-				if state.PlayerId == playerID {
-					player.UpdatePosition(state, types.ServerTickRate)
-				} else if existing, ok := otherPlayers.Load(state.PlayerId); ok {
-					existing.(*types.Player).UpdatePosition(state, types.ServerTickRate)
+				if otherPlayer, exists := otherPlayers[state.PlayerId]; exists {
+					otherPlayer.UpdatePosition(state, types.ServerTickRate)
 				} else {
-					newPlayer := types.NewPlayer(state)
-					otherPlayers.Store(state.PlayerId, newPlayer)
+					otherPlayers[state.PlayerId] = types.NewPlayer(state)
 				}
 			}
 
-			// Handle chat messages
-			if handler, ok := player.UserData.(types.ChatMessageHandler); ok {
+			if handler, ok := player.UserData.(types.ChatMessageHandler); ok && len(serverMessage.ChatMessages) > 0 {
 				handler.HandleServerMessages(serverMessage.ChatMessages)
 			}
 		}

scripts/build.sh

@@ -6,15 +6,12 @@ build() {
     local arch=$2
     local output=$3
 
-    # Set GOOS and GOARCH for cross-compilation
+    # Set CGO flags for static linking
+    export CGO_ENABLED=1
     export GOOS=$os
     export GOARCH=$arch
     
-    # Disable CGO only for cross-compilation
-    if [ "$os" != "$(go env GOOS)" ] || [ "$arch" != "$(go env GOARCH)" ]; then
-        export CGO_ENABLED=0
-    fi
-
+    # Platform specific flags
     if [ "$os" = "windows" ]; then
         export CC=x86_64-w64-mingw32-gcc
         export CXX=x86_64-w64-mingw32-g++

segfault.txt

@@ -1,126 +0,0 @@
-INFO: 2025/02/10 15:53:21 main.go:16: Starting GoonScape client
-INFO: 2025/02/10 15:53:21 main.go:43: Initializing window
-INFO: 2025/02/10 15:53:21 main.go:60: Loading game assets
-INFO: 2025/02/10 15:53:21 game.go:61: Loading game assets
-INFO: 2025/02/10 15:53:21 assets.go:51: Loading models
-INFO: 2025/02/10 15:53:21 game.go:81: Music disabled by config
-INFO: 2025/02/10 15:53:21 game.go:84: Assets loaded successfully
-INFO: 2025/02/10 15:53:21 main.go:76: Starting game loop
-INFO: 2025/02/10 15:53:21 game.go:456: Starting game loop
-malloc(): unsorted double linked list corrupted
-SIGABRT: abort
-PC=0x78a790604c4c m=0 sigcode=18446744073709551610
-signal arrived during cgo execution
-
-goroutine 1 gp=0xc0000061c0 m=0 mp=0xaf8e20 [syscall, locked to thread]:
-runtime.cgocall(0x6da9a0, 0xc00002da50)
-	/usr/lib/go/src/runtime/cgocall.go:167 +0x5b fp=0xc00002da28 sp=0xc00002d9f0 pc=0x46d0fb
-github.com/gen2brain/raylib-go/raylib._Cfunc_EndDrawing()
-	_cgo_gotypes.go:2539 +0x3f fp=0xc00002da50 sp=0xc00002da28 pc=0x51cdbf
-github.com/gen2brain/raylib-go/raylib.EndDrawing(...)
-	/home/bd/.cache/go/mod/github.com/gen2brain/raylib-go/raylib@v0.0.0-20250109172833-6dbba4f81a9b/rcore.go:464
-gitea.boner.be/bdnugget/goonscape/game.(*Game).Render.func1()
-	/home/bd/Projects/go/goonscape/game/game.go:259 +0x36 fp=0xc00002da68 sp=0xc00002da50 pc=0x6b6fb6
-runtime.deferreturn()
-	/usr/lib/go/src/runtime/panic.go:605 +0x5e fp=0xc00002daf8 sp=0xc00002da68 pc=0x4396fe
-gitea.boner.be/bdnugget/goonscape/game.(*Game).Render(0xc0001ae000)
-	/home/bd/Projects/go/goonscape/game/game.go:265 +0x405 fp=0xc00002dbf8 sp=0xc00002daf8 pc=0x6b27a5
-gitea.boner.be/bdnugget/goonscape/game.(*Game).Run(0xc0001ae000)
-	/home/bd/Projects/go/goonscape/game/game.go:463 +0x105 fp=0xc00002dcc0 sp=0xc00002dbf8 pc=0x6b3e85
-main.main()
-	/home/bd/Projects/go/goonscape/main.go:77 +0xb85 fp=0xc00002df50 sp=0xc00002dcc0 pc=0x6b8345
-runtime.main()
-	/usr/lib/go/src/runtime/proc.go:272 +0x28b fp=0xc00002dfe0 sp=0xc00002df50 pc=0x43d84b
-runtime.goexit({})
-	/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc00002dfe8 sp=0xc00002dfe0 pc=0x47ac81
-
-goroutine 2 gp=0xc000006c40 m=nil [force gc (idle)]:
-runtime.gopark(0xaedc20?, 0xaf8e20?, 0x0?, 0x0?, 0x0?)
-	/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc0000567a8 sp=0xc000056788 pc=0x47356e
-runtime.goparkunlock(...)
-	/usr/lib/go/src/runtime/proc.go:430
-runtime.forcegchelper()
-	/usr/lib/go/src/runtime/proc.go:337 +0xb3 fp=0xc0000567e0 sp=0xc0000567a8 pc=0x43db93
-runtime.goexit({})
-	/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc0000567e8 sp=0xc0000567e0 pc=0x47ac81
-created by runtime.init.7 in goroutine 1
-	/usr/lib/go/src/runtime/proc.go:325 +0x1a
-
-goroutine 3 gp=0xc000007180 m=nil [GC sweep wait]:
-runtime.gopark(0x0?, 0x0?, 0x0?, 0x0?, 0x0?)
-	/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc00006af80 sp=0xc00006af60 pc=0x47356e
-runtime.goparkunlock(...)
-	/usr/lib/go/src/runtime/proc.go:430
-runtime.bgsweep(0xc000080000)
-	/usr/lib/go/src/runtime/mgcsweep.go:277 +0x94 fp=0xc00006afc8 sp=0xc00006af80 pc=0x428714
-runtime.gcenable.gowrap1()
-	/usr/lib/go/src/runtime/mgc.go:204 +0x25 fp=0xc00006afe0 sp=0xc00006afc8 pc=0x41ce25
-runtime.goexit({})
-	/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc00006afe8 sp=0xc00006afe0 pc=0x47ac81
-created by runtime.gcenable in goroutine 1
-	/usr/lib/go/src/runtime/mgc.go:204 +0x66
-
-goroutine 4 gp=0xc000007340 m=nil [GC scavenge wait]:
-runtime.gopark(0xc000080000?, 0x8e5b60?, 0x1?, 0x0?, 0xc000007340?)
-	/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc000064f78 sp=0xc000064f58 pc=0x47356e
-runtime.goparkunlock(...)
-	/usr/lib/go/src/runtime/proc.go:430
-runtime.(*scavengerState).park(0xaf8060)
-	/usr/lib/go/src/runtime/mgcscavenge.go:425 +0x49 fp=0xc000064fa8 sp=0xc000064f78 pc=0x426149
-runtime.bgscavenge(0xc000080000)
-	/usr/lib/go/src/runtime/mgcscavenge.go:653 +0x3c fp=0xc000064fc8 sp=0xc000064fa8 pc=0x4266bc
-runtime.gcenable.gowrap2()
-	/usr/lib/go/src/runtime/mgc.go:205 +0x25 fp=0xc000064fe0 sp=0xc000064fc8 pc=0x41cdc5
-runtime.goexit({})
-	/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc000064fe8 sp=0xc000064fe0 pc=0x47ac81
-created by runtime.gcenable in goroutine 1
-	/usr/lib/go/src/runtime/mgc.go:205 +0xa5
-
-goroutine 18 gp=0xc000104700 m=nil [finalizer wait]:
-runtime.gopark(0x0?, 0x0?, 0x0?, 0x0?, 0x0?)
-	/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc000184e20 sp=0xc000184e00 pc=0x47356e
-runtime.runfinq()
-	/usr/lib/go/src/runtime/mfinal.go:193 +0x145 fp=0xc000184fe0 sp=0xc000184e20 pc=0x41bea5
-runtime.goexit({})
-	/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc000184fe8 sp=0xc000184fe0 pc=0x47ac81
-created by runtime.createfing in goroutine 1
-	/usr/lib/go/src/runtime/mfinal.go:163 +0x3d
-
-goroutine 19 gp=0xc0001048c0 m=nil [chan receive]:
-runtime.gopark(0x0?, 0x0?, 0x0?, 0x0?, 0x0?)
-	/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc00006bf18 sp=0xc00006bef8 pc=0x47356e
-runtime.chanrecv(0xc0001140e0, 0x0, 0x1)
-	/usr/lib/go/src/runtime/chan.go:639 +0x3bc fp=0xc00006bf90 sp=0xc00006bf18 pc=0x40c89c
-runtime.chanrecv1(0x0?, 0x0?)
-	/usr/lib/go/src/runtime/chan.go:489 +0x12 fp=0xc00006bfb8 sp=0xc00006bf90 pc=0x40c4d2
-runtime.unique_runtime_registerUniqueMapCleanup.func1(...)
-	/usr/lib/go/src/runtime/mgc.go:1781
-runtime.unique_runtime_registerUniqueMapCleanup.gowrap1()
-	/usr/lib/go/src/runtime/mgc.go:1784 +0x2f fp=0xc00006bfe0 sp=0xc00006bfb8 pc=0x41fe4f
-runtime.goexit({})
-	/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc00006bfe8 sp=0xc00006bfe0 pc=0x47ac81
-created by unique.runtime_registerUniqueMapCleanup in goroutine 1
-	/usr/lib/go/src/runtime/mgc.go:1779 +0x96
-
-rax    0x0
-rbx    0x4829
-rcx    0x78a790604c4c
-rdx    0x6
-rdi    0x4829
-rsi    0x4829
-rbp    0x78a7902fc740
-rsp    0x7ffd63425870
-r8     0xffffffff
-r9     0x0
-r10    0x8
-r11    0x246
-r12    0x7ffd634259d0
-r13    0x6
-r14    0x7ffd634259d0
-r15    0x7ffd634259d0
-rip    0x78a790604c4c
-rflags 0x246
-cs     0x33
-fs     0x0
-gs     0x0
-exit status 2

types/player.go

@@ -1,34 +1,12 @@
 package types
 
 import (
-	"sync"
 	"time"
 
 	pb "gitea.boner.be/bdnugget/goonserver/actions"
 	rl "github.com/gen2brain/raylib-go/raylib"
 )
 
-type Player struct {
-	sync.RWMutex
-	PosActual             rl.Vector3
-	PosTile               Tile
-	TargetPath            []Tile
-	ActionQueue           []*pb.Action
-	Speed                 float32
-	ID                    int32
-	IsMoving              bool
-	AnimationFrame        int32
-	LastAnimUpdate        time.Time
-	LastUpdateTime        time.Time
-	InterpolationProgress float32
-	FloatingMessage       *FloatingMessage
-	QuitDone              chan struct{}
-	UserData              interface{}
-	Model                 rl.Model
-	Texture               rl.Texture2D
-	Username              string
-}
-
 func (p *Player) MoveTowards(target Tile, deltaTime float32, mapGrid [][]Tile) {
 	p.Lock()
 	defer p.Unlock()
@@ -41,33 +19,6 @@ func (p *Player) MoveTowards(target Tile, deltaTime float32, mapGrid [][]Tile) {
 
 	direction := rl.Vector3Subtract(targetPos, p.PosActual)
 	distance := rl.Vector3Length(direction)
-
-	if distance > 1.0 {
-		wasMoving := p.IsMoving
-		p.IsMoving = true
-
-		if !wasMoving {
-			p.AnimationFrame = 0
-		}
-
-		oldFrame := p.AnimationFrame
-		p.AnimationFrame += int32(deltaTime * 60)
-		rl.TraceLog(rl.LogInfo, "Walk frame update: %d -> %d (delta: %f)",
-			oldFrame, p.AnimationFrame, deltaTime)
-	} else {
-		wasMoving := p.IsMoving
-		p.IsMoving = false
-
-		if wasMoving {
-			p.AnimationFrame = 0
-		}
-
-		oldFrame := p.AnimationFrame
-		p.AnimationFrame += int32(deltaTime * 60)
-		rl.TraceLog(rl.LogInfo, "Idle frame update: %d -> %d (delta: %f)",
-			oldFrame, p.AnimationFrame, deltaTime)
-	}
-
 	if distance > 0 {
 		direction = rl.Vector3Scale(direction, p.Speed*deltaTime/distance)
 	}
@@ -93,9 +44,6 @@ func NewPlayer(state *pb.PlayerState) *Player {
 		PosTile: Tile{X: int(state.X), Y: int(state.Y)},
 		Speed:   50.0,
 		ID:      state.PlayerId,
-		IsMoving:       false,
-		AnimationFrame: 0,
-		LastAnimUpdate: time.Now(),
 	}
 }
 

types/types.go

@@ -1,6 +1,7 @@
 package types
 
 import (
+	"sync"
 	"time"
 
 	pb "gitea.boner.be/bdnugget/goonserver/actions"
@@ -13,22 +14,27 @@ type Tile struct {
 	Walkable bool
 }
 
-type AnimationSet struct {
-	Idle []rl.ModelAnimation
-	Walk []rl.ModelAnimation
-	// Can add more animation types later like:
-	// Attack []ModelAnimation
-	// Jump   []ModelAnimation
+type Player struct {
+	sync.Mutex
+	PosActual             rl.Vector3
+	PosTile               Tile
+	TargetPath            []Tile
+	ActionQueue           []*pb.Action
+	Speed                 float32
+	Model                 rl.Model
+	Texture               rl.Texture2D
+	ID                    int32
+	CurrentTick           int64
+	LastUpdateTime        time.Time
+	InterpolationProgress float32
+	UserData              interface{}
+	FloatingMessage       *FloatingMessage
+	QuitDone              chan struct{}
 }
 
 type ModelAsset struct {
 	Model   rl.Model
 	Texture rl.Texture2D
-	Animation  []rl.ModelAnimation // Keep this for compatibility
-	AnimFrames int32               // Keep this for compatibility
-	Animations AnimationSet        // New field for organized animations
-	YOffset    float32             // Additional height offset (added to default 8.0)
-	Name       string
 }
 
 type ChatMessage struct {
@@ -48,13 +54,6 @@ type ChatMessageHandler interface {
 	HandleServerMessages([]*pb.ChatMessage)
 }
 
-type PlayerState struct {
-	PlayerId int32
-	X        int32
-	Y        int32
-	Username string
-}
-
 const (
 	MapWidth   = 50
 	MapHeight  = 50