From 21d1628b26bb42ed927022b011e7cfd6dbe8f9ee Mon Sep 17 00:00:00 2001
From: bp99 <bertalan.peter@bp99.eu>
Date: Tue, 6 May 2025 23:23:26 +0200
Subject: [PATCH] Adapt code to urban terror

---
 cmd/q3/app/server/server.go     | 26 +++++++++++++-------------
 internal/quake/server/server.go | 12 ++++++------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/cmd/q3/app/server/server.go b/cmd/q3/app/server/server.go
index 63f5a8f..8a928d3 100644
--- a/cmd/q3/app/server/server.go
+++ b/cmd/q3/app/server/server.go
@@ -4,16 +4,16 @@ import (
 	"context"
 	"fmt"
 	"github.com/criticalstack/quake-kube/pkg/extensions"
-	"net/url"
+	// "net/url"
 	"time"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
 	quakeclient "github.com/criticalstack/quake-kube/internal/quake/client"
-	"github.com/criticalstack/quake-kube/internal/quake/content"
+	// "github.com/criticalstack/quake-kube/internal/quake/content"
 	quakeserver "github.com/criticalstack/quake-kube/internal/quake/server"
-	httputil "github.com/criticalstack/quake-kube/internal/util/net/http"
+	// httputil "github.com/criticalstack/quake-kube/internal/util/net/http"
 	"github.com/criticalstack/quake-kube/public"
 )
 
@@ -37,22 +37,22 @@ func NewCommand() *cobra.Command {
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 
-			csurl, err := url.Parse(opts.ContentServer)
-			if err != nil {
-				return err
-			}
+			// csurl, err := url.Parse(opts.ContentServer)
+			// if err != nil {
+			// 	return err
+			// }
 			if !opts.AcceptEula {
 				fmt.Println(quakeserver.Q3DemoEULA)
 				return errors.New("You must agree to the EULA to continue")
 			}
-			if err := httputil.GetUntil(opts.ContentServer, ctx.Done()); err != nil {
-				return err
-			}
+			// if err := httputil.GetUntil(opts.ContentServer, ctx.Done()); err != nil {
+			// 	return err
+			// }
 
 			// TODO(chrism): only download what is in map config
-			if err := content.CopyAssets(csurl, opts.AssetsDir); err != nil {
-				return err
-			}
+			// if err := content.CopyAssets(csurl, opts.AssetsDir); err != nil {
+			// 	return err
+			// }
 
 			go func() {
 				s := quakeserver.Server{
diff --git a/internal/quake/server/server.go b/internal/quake/server/server.go
index a790cda..499f6cd 100644
--- a/internal/quake/server/server.go
+++ b/internal/quake/server/server.go
@@ -32,15 +32,15 @@ func (s *Server) Start(ctx context.Context) error {
 		return err
 	}
 	args := []string{
-		"+set", "dedicated", "1",
+		"+set", "dedicated", "2",
 		"+set", "net_ip", host,
 		"+set", "net_port", port,
 		"+set", "com_homepath", s.Dir,
-		"+set", "com_basegame", "baseq3",
-		"+set", "com_gamename", "Quake3Arena",
+		"+set", "com_basegame", "q3ut4",
+		"+set", "com_gamename", "UrbanTerror",
 		"+exec", "server.cfg",
 	}
-	cmd := exec.CommandContext(ctx, "ioq3ded", args...)
+	cmd := exec.CommandContext(ctx, "Quake3-UrT-Ded.x86_64", args...)
 	cmd.Dir = s.Dir
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
@@ -51,7 +51,7 @@ func (s *Server) Start(ctx context.Context) error {
 		if err != nil {
 			return err
 		}
-		if err := ioutil.WriteFile(filepath.Join(s.Dir, "baseq3/server.cfg"), data, 0644); err != nil {
+		if err := ioutil.WriteFile(filepath.Join(s.Dir, "q3ut4/server.cfg"), data, 0644); err != nil {
 			return err
 		}
 		if err := cmd.Start(); err != nil {
@@ -145,7 +145,7 @@ func (s *Server) reload() error {
 	if err != nil {
 		return err
 	}
-	return ioutil.WriteFile(filepath.Join(s.Dir, "baseq3/server.cfg"), data, 0644)
+	return ioutil.WriteFile(filepath.Join(s.Dir, "q3ut4/server.cfg"), data, 0644)
 }
 
 func (s *Server) watch(ctx context.Context) (<-chan struct{}, error) {