Browse Source

Renamed package/directory

master
Stephen McQuay 6 years ago
parent
commit
72d0843ff8
16 changed files with 27 additions and 27 deletions
  1. +9
    -9
      botserv/main.go
  2. +1
    -1
      config.go
  3. +3
    -3
      control.go
  4. +1
    -1
      deathmatch.go
  5. +2
    -2
      doc.go
  6. +1
    -1
      game.go
  7. +1
    -1
      id.go
  8. +1
    -1
      id_test.go
  9. +1
    -1
      melee.go
  10. +1
    -1
      obstacle.go
  11. +1
    -1
      player.go
  12. +1
    -1
      projectile.go
  13. +1
    -1
      protocol.go
  14. +1
    -1
      robot.go
  15. +1
    -1
      robot_test.go
  16. +1
    -1
      splosion.go

+ 9
- 9
botserv/main.go View File

@ -10,7 +10,7 @@ import (
"runtime/pprof"
"time"
"bitbucket.org/hackerbots/botserv"
hbserver "bitbucket.org/hackerbots/server"
"code.google.com/p/go.net/websocket"
)
@ -42,23 +42,23 @@ func main() {
log.Println("serving profile info at http://localhost:8667/debug/pprof/")
}
conf, err := botserv.LoadConfig(*config)
conf, err := hbserver.LoadConfig(*config)
if err != nil {
log.Fatal(err)
}
sm := http.NewServeMux()
c := botserv.NewController(conf, *mprofile, *profile)
c := hbserver.NewController(conf, *mprofile, *profile)
go c.Run()
sm.Handle("/", botserv.JsonHandler(c.Index))
sm.Handle("/", hbserver.JsonHandler(c.Index))
sm.Handle("/ws/", websocket.Handler(c.AddPlayer))
sm.Handle("/game/start/", botserv.JsonHandler(c.StartGame))
sm.Handle("/game/list/", botserv.JsonHandler(c.ListGames))
sm.Handle("/game/stats/", botserv.JsonHandler(c.GameStats))
sm.Handle("/game/bw/", botserv.JsonHandler(c.BW))
sm.Handle("/game/stop/", botserv.JsonHandler(c.StopGame))
sm.Handle("/game/start/", hbserver.JsonHandler(c.StartGame))
sm.Handle("/game/list/", hbserver.JsonHandler(c.ListGames))
sm.Handle("/game/stats/", hbserver.JsonHandler(c.GameStats))
sm.Handle("/game/bw/", hbserver.JsonHandler(c.BW))
sm.Handle("/game/stop/", hbserver.JsonHandler(c.StopGame))
sm.HandleFunc("/fuck/shit/up/", c.KillServer)
err = http.ListenAndServe(*addr, sm)

+ 1
- 1
config.go View File

@ -1,4 +1,4 @@
package botserv
package server
import (
"encoding/json"

+ 3
- 3
control.go View File

@ -1,4 +1,4 @@
package botserv
package server
import (
"encoding/json"
@ -24,7 +24,7 @@ func (h JsonHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
}
// Controller is the shepherd of a collection of games. The main package in
// botserv simply populates one of these and starts an http server.
// server simply populates one of these and starts an http server.
type Controller struct {
Idg *IdGenerator
Conf Config
@ -247,7 +247,7 @@ func (c *Controller) StopGame(w http.ResponseWriter, req *http.Request) {
log.Printf("returning from StopGame")
}
// KillServer is my favorite method of all the methods in botserv: it shuts
// KillServer is my favorite method of all the methods in server: it shuts
// things down respecting profiling requests.
func (c *Controller) KillServer(w http.ResponseWriter, req *http.Request) {
if c.Profile != "" {

+ 1
- 1
deathmatch.go View File

@ -1,4 +1,4 @@
package botserv
package server
import (
"log"

+ 2
- 2
doc.go View File

@ -1,3 +1,3 @@
// botserv is the collection of structs and functions used to implement
// server is the collection of structs and functions used to implement
// a hackerbots server
package botserv
package server

+ 1
- 1
game.go View File

@ -1,4 +1,4 @@
package botserv
package server
// delete me

+ 1
- 1
id.go View File

@ -1,4 +1,4 @@
package botserv
package server
import (
"crypto/md5"

+ 1
- 1
id_test.go View File

@ -1,4 +1,4 @@
package botserv
package server
import (
"testing"

+ 1
- 1
melee.go View File

@ -1,4 +1,4 @@
package botserv
package server
import (
"log"

+ 1
- 1
obstacle.go View File

@ -1,4 +1,4 @@
package botserv
package server
import (
"math"

+ 1
- 1
player.go View File

@ -1,4 +1,4 @@
package botserv
package server
import (
"encoding/gob"

+ 1
- 1
projectile.go View File

@ -1,4 +1,4 @@
package botserv
package server
import (
"log"

+ 1
- 1
protocol.go View File

@ -1,4 +1,4 @@
package botserv
package server
import (
"log"

+ 1
- 1
robot.go View File

@ -1,4 +1,4 @@
package botserv
package server
import (
"log"

+ 1
- 1
robot_test.go View File

@ -1,4 +1,4 @@
package botserv
package server
import (
"log"

+ 1
- 1
splosion.go View File

@ -1,4 +1,4 @@
package botserv
package server
import (
v "bitbucket.org/hackerbots/vector"

Loading…
Cancel
Save