github-mirrorer/quake-kube
1
0
Fork 1
mirror of https://github.com/Octops/quake-kube.git synced 2026-04-06 01:40:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build standalone ioq3ded, fix asset timeout (#16)

Browse Source 
When specifying `BUILD_STANDALONE=1` for ioq3ded, the default `com_homepath`, `com_basegame`, and `com_gamename` change to foo/foobar, so this sets those explicitly to their previously default values. This can be exposed via option later to allow for custom games. This also fixes the short read timeout used by CopyAssets.
This commit is contained in:
Chris Marshall
2020-09-16 17:53:51 -04:00
committed by GitHub
parent f29bb81865
commit 2a599bcff5
9 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,6 @@ import (
quakeclient "github.com/criticalstack/quake-kube/internal/quake/client"
"github.com/criticalstack/quake-kube/internal/quake/content"
quakeserver "github.com/criticalstack/quake-kube/internal/quake/server"
netutil "github.com/criticalstack/quake-kube/internal/util/net"
httputil "github.com/criticalstack/quake-kube/internal/util/net/http"
"github.com/criticalstack/quake-kube/public"
)
@ -33,14 +32,6 @@ func NewCommand() *cobra.Command {
Short: "q3 server",
SilenceUsage: true,
RunE: func(cmd *cobra.Command, args []string) error {
if opts.ClientAddr == "" {
hostIPv4, err := netutil.DetectHostIPv4()
if err != nil {
return err
}
opts.ClientAddr = fmt.Sprintf("%s:8080", hostIPv4)
}
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
@ -94,7 +85,7 @@ func NewCommand() *cobra.Command {
cmd.Flags().StringVar(&opts.ContentServer, "content-server", "http://content.quakejs.com", "content server url")
cmd.Flags().BoolVar(&opts.AcceptEula, "agree-eula", false, "agree to the Quake 3 demo EULA")
cmd.Flags().StringVar(&opts.AssetsDir, "assets-dir", "assets", "location for game files")
cmd.Flags().StringVar(&opts.ClientAddr, "client-addr", "", "client address <host>:<port>")
cmd.Flags().StringVar(&opts.ClientAddr, "client-addr", "0.0.0.0:8080", "client address <host>:<port>")
cmd.Flags().StringVar(&opts.ServerAddr, "server-addr", "0.0.0.0:27960", "dedicated server <host>:<port>")
cmd.Flags().DurationVar(&opts.WatchInterval, "watch-interval", 15*time.Second, "dedicated server <host>:<port>")
return cmd