bp99/quake-kube
1
0
Fork 0
forked from github-mirrorer/quake-kube
Code Pull Requests Activity

Adapt code to urban terror

Browse Source
This commit is contained in:
bp99
2025-05-06 23:23:26 +02:00
parent f38cc1c270
commit 21d1628b26
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/q3/app/server/server.go
View File

@ -4,16 +4,16 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/criticalstack/quake-kube/pkg/extensions" "github.com/criticalstack/quake-kube/pkg/extensions"
"net/url" // "net/url"
"time" "time"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
quakeclient "github.com/criticalstack/quake-kube/internal/quake/client" 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" 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" "github.com/criticalstack/quake-kube/public"
) )
@ -37,22 +37,22 @@ func NewCommand() *cobra.Command {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
defer cancel() defer cancel()
csurl, err := url.Parse(opts.ContentServer) // csurl, err := url.Parse(opts.ContentServer)
if err != nil { // if err != nil {
return err // return err
} // }
if !opts.AcceptEula { if !opts.AcceptEula {
fmt.Println(quakeserver.Q3DemoEULA) fmt.Println(quakeserver.Q3DemoEULA)
return errors.New("You must agree to the EULA to continue") return errors.New("You must agree to the EULA to continue")
} }
if err := httputil.GetUntil(opts.ContentServer, ctx.Done()); err != nil { // if err := httputil.GetUntil(opts.ContentServer, ctx.Done()); err != nil {
return err // return err
} // }
// TODO(chrism): only download what is in map config // TODO(chrism): only download what is in map config
if err := content.CopyAssets(csurl, opts.AssetsDir); err != nil { // if err := content.CopyAssets(csurl, opts.AssetsDir); err != nil {
return err // return err
} // }
go func() { go func() {
s := quakeserver.Server{ s := quakeserver.Server{

12
internal/quake/server/server.go
View File

@ -32,15 +32,15 @@ func (s *Server) Start(ctx context.Context) error {
return err return err
} }
args := []string{ args := []string{
"+set", "dedicated", "1", "+set", "dedicated", "2",
"+set", "net_ip", host, "+set", "net_ip", host,
"+set", "net_port", port, "+set", "net_port", port,
"+set", "com_homepath", s.Dir, "+set", "com_homepath", s.Dir,
"+set", "com_basegame", "baseq3", "+set", "com_basegame", "q3ut4",
"+set", "com_gamename", "Quake3Arena", "+set", "com_gamename", "UrbanTerror",
"+exec", "server.cfg", "+exec", "server.cfg",
} }
cmd := exec.CommandContext(ctx, "ioq3ded", args...) cmd := exec.CommandContext(ctx, "Quake3-UrT-Ded.x86_64", args...)
cmd.Dir = s.Dir cmd.Dir = s.Dir
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
@ -51,7 +51,7 @@ func (s *Server) Start(ctx context.Context) error {
if err != nil { if err != nil {
return err 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 return err
} }
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
@ -145,7 +145,7 @@ func (s *Server) reload() error {
if err != nil { if err != nil {
return err 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) { func (s *Server) watch(ctx context.Context) (<-chan struct{}, error) {