summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd.go6
-rw-r--r--internal/mkserialize/mkserialize.go6
-rw-r--r--minimap.go8
-rw-r--r--nodebox.go10
-rw-r--r--pktinfos6
-rw-r--r--pktinfos.go6
-rw-r--r--serialize.go12
-rw-r--r--sound.go6
-rw-r--r--tileanim.go6
-rw-r--r--tocltcmds.go14
-rw-r--r--tosrvcmds6
-rw-r--r--tosrvcmds.go12
-rw-r--r--tosrvcmds_cmdno.go12
13 files changed, 55 insertions, 55 deletions
diff --git a/cmd.go b/cmd.go
index 19c250e..68cb9cb 100644
--- a/cmd.go
+++ b/cmd.go
@@ -63,9 +63,9 @@ func (*ToCltMinimapModes) cmd() {}
func (*ToSrvNil) cmd() {}
func (*ToSrvInit) cmd() {}
func (*ToSrvInit2) cmd() {}
-func (*ToSrvModChanJoin) cmd() {}
-func (*ToSrvModChanLeave) cmd() {}
-func (*ToSrvModChanMsg) cmd() {}
+func (*ToSrvJoinModChan) cmd() {}
+func (*ToSrvLeaveModChan) cmd() {}
+func (*ToSrvMsgModChan) cmd() {}
func (*ToSrvPlayerPos) cmd() {}
func (*ToSrvGotBlks) cmd() {}
func (*ToSrvDeletedBlks) cmd() {}
diff --git a/internal/mkserialize/mkserialize.go b/internal/mkserialize/mkserialize.go
index 9b4b019..2ef57e9 100644
--- a/internal/mkserialize/mkserialize.go
+++ b/internal/mkserialize/mkserialize.go
@@ -443,9 +443,9 @@ var typeNames = []string{
"ToSrvNil",
"ToSrvInit",
"ToSrvInit2",
- "ToSrvModChanJoin",
- "ToSrvModChanLeave",
- "ToSrvModChanMsg",
+ "ToSrvJoinModChan",
+ "ToSrvLeaveModChan",
+ "ToSrvMsgModChan",
"ToSrvPlayerPos",
"ToSrvGotBlks",
"ToSrvDeletedBlks",
diff --git a/minimap.go b/minimap.go
index 221a16b..857bf51 100644
--- a/minimap.go
+++ b/minimap.go
@@ -3,10 +3,10 @@ package mt
type MinimapType uint16
const (
- NoMinimap MinimapType = iota // none
- SurfaceMinimap // surface
- RadarMinimap // radar
- TextureMinimap // texture
+ NoMinimap MinimapType = iota // none
+ SurfaceMinimap // surface
+ RadarMinimap // radar
+ TextureMinimap // texture
)
//go:generate stringer -linecomment -type MinimapType
diff --git a/nodebox.go b/nodebox.go
index 166961e..ce144a4 100644
--- a/nodebox.go
+++ b/nodebox.go
@@ -5,11 +5,11 @@ type Box [2]Vec
type NodeBoxType uint8
const (
- CubeBox NodeBoxType = iota // Cube
- FixedBox // Fixed
- MountedBox // Mounted
- LeveledBox // Leveled
- ConnectedBox // Connected
+ CubeBox NodeBoxType = iota // Cube
+ FixedBox // Fixed
+ MountedBox // Mounted
+ LeveledBox // Leveled
+ ConnectedBox // Connected
maxBox
)
diff --git a/pktinfos b/pktinfos
index e6316f2..d43aa19 100644
--- a/pktinfos
+++ b/pktinfos
@@ -58,9 +58,9 @@ ToCltMinimapModes 0 rel
ToSrvNil 0 rel
ToSrvInit 1 unrel
ToSrvInit2 1 rel
-ToSrvModChanJoin 0 rel
-ToSrvModChanLeave 0 rel
-ToSrvModChanMsg 0 rel
+ToSrvJoinModChan 0 rel
+ToSrvLeaveModChan 0 rel
+ToSrvMsgModChan 0 rel
ToSrvPlayerPos 0 unrel
ToSrvGotBlks 2 rel
ToSrvDeletedBlks 2 rel
diff --git a/pktinfos.go b/pktinfos.go
index 47b7783..69856a3 100644
--- a/pktinfos.go
+++ b/pktinfos.go
@@ -64,9 +64,9 @@ func (*ToCltMinimapModes) DefaultPktInfo() rudp.PktInfo { return rudp.P
func (*ToSrvNil) DefaultPktInfo() rudp.PktInfo { return rudp.PktInfo{0, false} }
func (*ToSrvInit) DefaultPktInfo() rudp.PktInfo { return rudp.PktInfo{1, true} }
func (*ToSrvInit2) DefaultPktInfo() rudp.PktInfo { return rudp.PktInfo{1, false} }
-func (*ToSrvModChanJoin) DefaultPktInfo() rudp.PktInfo { return rudp.PktInfo{0, false} }
-func (*ToSrvModChanLeave) DefaultPktInfo() rudp.PktInfo { return rudp.PktInfo{0, false} }
-func (*ToSrvModChanMsg) DefaultPktInfo() rudp.PktInfo { return rudp.PktInfo{0, false} }
+func (*ToSrvJoinModChan) DefaultPktInfo() rudp.PktInfo { return rudp.PktInfo{0, false} }
+func (*ToSrvLeaveModChan) DefaultPktInfo() rudp.PktInfo { return rudp.PktInfo{0, false} }
+func (*ToSrvMsgModChan) DefaultPktInfo() rudp.PktInfo { return rudp.PktInfo{0, false} }
func (*ToSrvPlayerPos) DefaultPktInfo() rudp.PktInfo { return rudp.PktInfo{0, true} }
func (*ToSrvGotBlks) DefaultPktInfo() rudp.PktInfo { return rudp.PktInfo{2, false} }
func (*ToSrvDeletedBlks) DefaultPktInfo() rudp.PktInfo { return rudp.PktInfo{2, false} }
diff --git a/serialize.go b/serialize.go
index 6f27a98..aef4017 100644
--- a/serialize.go
+++ b/serialize.go
@@ -303,7 +303,7 @@ func (obj *ToSrvInit2) deserialize(r io.Reader) {
}))(obj)).Lang) = string(local3)
}
-func (obj *ToSrvModChanJoin) serialize(w io.Writer) {
+func (obj *ToSrvJoinModChan) serialize(w io.Writer) {
if len(([]byte((*(*(struct {
Channel string
}))(obj)).Channel))) > math.MaxUint16 {
@@ -323,7 +323,7 @@ func (obj *ToSrvModChanJoin) serialize(w io.Writer) {
}
}
-func (obj *ToSrvModChanJoin) deserialize(r io.Reader) {
+func (obj *ToSrvJoinModChan) deserialize(r io.Reader) {
var local5 []uint8
var local6 uint16
{
@@ -340,7 +340,7 @@ func (obj *ToSrvModChanJoin) deserialize(r io.Reader) {
}))(obj)).Channel) = string(local5)
}
-func (obj *ToSrvModChanLeave) serialize(w io.Writer) {
+func (obj *ToSrvLeaveModChan) serialize(w io.Writer) {
if len(([]byte((*(*(struct {
Channel string
}))(obj)).Channel))) > math.MaxUint16 {
@@ -360,7 +360,7 @@ func (obj *ToSrvModChanLeave) serialize(w io.Writer) {
}
}
-func (obj *ToSrvModChanLeave) deserialize(r io.Reader) {
+func (obj *ToSrvLeaveModChan) deserialize(r io.Reader) {
var local7 []uint8
var local8 uint16
{
@@ -377,7 +377,7 @@ func (obj *ToSrvModChanLeave) deserialize(r io.Reader) {
}))(obj)).Channel) = string(local7)
}
-func (obj *ToSrvModChanMsg) serialize(w io.Writer) {
+func (obj *ToSrvMsgModChan) serialize(w io.Writer) {
if len(([]byte((*(*(struct {
Channel string
Msg string
@@ -420,7 +420,7 @@ func (obj *ToSrvModChanMsg) serialize(w io.Writer) {
}
}
-func (obj *ToSrvModChanMsg) deserialize(r io.Reader) {
+func (obj *ToSrvMsgModChan) deserialize(r io.Reader) {
var local9 []uint8
var local10 uint16
{
diff --git a/sound.go b/sound.go
index c662968..913b0e1 100644
--- a/sound.go
+++ b/sound.go
@@ -5,9 +5,9 @@ type SoundID int32
type SoundSrcType uint8
const (
- NoSrc SoundSrcType = iota // nowhere
- PosSrc // pos
- AOSrc // ao
+ NoSrc SoundSrcType = iota // nowhere
+ PosSrc // pos
+ AOSrc // ao
)
//go:generate stringer -linecomment -type SoundSrcType
diff --git a/tileanim.go b/tileanim.go
index 8d664df..339f15e 100644
--- a/tileanim.go
+++ b/tileanim.go
@@ -3,9 +3,9 @@ package mt
type AnimType uint8
const (
- NoAnim AnimType = iota // none
- VerticalFrameAnim // vertical frame
- SpriteSheetAnim // sprite sheet
+ NoAnim AnimType = iota // none
+ VerticalFrameAnim // vertical frame
+ SpriteSheetAnim // sprite sheet
maxAnim
)
diff --git a/tocltcmds.go b/tocltcmds.go
index 5fbe18b..9f8fbd4 100644
--- a/tocltcmds.go
+++ b/tocltcmds.go
@@ -196,10 +196,10 @@ type ToCltChatMsg struct {
type ChatMsgType uint8
const (
- RawMsg ChatMsgType = iota // raw
- NormalMsg // normal
- AnnounceMsg // announce
- SysMsg // sys
+ RawMsg ChatMsgType = iota // raw
+ NormalMsg // normal
+ AnnounceMsg // announce
+ SysMsg // sys
maxMsg
)
@@ -650,9 +650,9 @@ type ToCltUpdatePlayerList struct {
type PlayerListUpdateType uint8
const (
- InitPlayers PlayerListUpdateType = iota // init
- AddPlayers // add
- RemovePlayers // remove
+ InitPlayers PlayerListUpdateType = iota // init
+ AddPlayers // add
+ RemovePlayers // remove
)
//go:generate stringer -linecomment -type PlayerListUpdateType
diff --git a/tosrvcmds b/tosrvcmds
index 08d880f..2236b30 100644
--- a/tosrvcmds
+++ b/tosrvcmds
@@ -1,9 +1,9 @@
0 Nil
2 Init
17 Init2
-23 ModChanJoin
-24 ModChanLeave
-25 ModChanMsg
+23 JoinModChan
+24 LeaveModChan
+25 MsgModChan
35 PlayerPos
36 GotBlks
37 DeletedBlks
diff --git a/tosrvcmds.go b/tosrvcmds.go
index 4915204..de80b12 100644
--- a/tosrvcmds.go
+++ b/tosrvcmds.go
@@ -30,18 +30,18 @@ type ToSrvInit2 struct {
Lang string
}
-// ToSrvModChanJoin attempts to join a mod channel.
-type ToSrvModChanJoin struct {
+// ToSrvJoinModChan attempts to join a mod channel.
+type ToSrvJoinModChan struct {
Channel string
}
-// ToSrvModChanJoin attempts to leave a mod channel.
-type ToSrvModChanLeave struct {
+// ToSrvJoinModChan attempts to leave a mod channel.
+type ToSrvLeaveModChan struct {
Channel string
}
-// ToSrvModChanJoin sends a message on a mod channel.
-type ToSrvModChanMsg struct {
+// ToSrvJoinModChan sends a message on a mod channel.
+type ToSrvMsgModChan struct {
Channel string
Msg string
}
diff --git a/tosrvcmds_cmdno.go b/tosrvcmds_cmdno.go
index 6da3e81..7e0ad26 100644
--- a/tosrvcmds_cmdno.go
+++ b/tosrvcmds_cmdno.go
@@ -5,9 +5,9 @@ package mt
func (*ToSrvNil) toSrvCmdNo() uint16 { return 0 }
func (*ToSrvInit) toSrvCmdNo() uint16 { return 2 }
func (*ToSrvInit2) toSrvCmdNo() uint16 { return 17 }
-func (*ToSrvModChanJoin) toSrvCmdNo() uint16 { return 23 }
-func (*ToSrvModChanLeave) toSrvCmdNo() uint16 { return 24 }
-func (*ToSrvModChanMsg) toSrvCmdNo() uint16 { return 25 }
+func (*ToSrvJoinModChan) toSrvCmdNo() uint16 { return 23 }
+func (*ToSrvLeaveModChan) toSrvCmdNo() uint16 { return 24 }
+func (*ToSrvMsgModChan) toSrvCmdNo() uint16 { return 25 }
func (*ToSrvPlayerPos) toSrvCmdNo() uint16 { return 35 }
func (*ToSrvGotBlks) toSrvCmdNo() uint16 { return 36 }
func (*ToSrvDeletedBlks) toSrvCmdNo() uint16 { return 37 }
@@ -30,9 +30,9 @@ var newToSrvCmd = map[uint16]func() Cmd{
0: func() Cmd { return new(ToSrvNil) },
2: func() Cmd { return new(ToSrvInit) },
17: func() Cmd { return new(ToSrvInit2) },
- 23: func() Cmd { return new(ToSrvModChanJoin) },
- 24: func() Cmd { return new(ToSrvModChanLeave) },
- 25: func() Cmd { return new(ToSrvModChanMsg) },
+ 23: func() Cmd { return new(ToSrvJoinModChan) },
+ 24: func() Cmd { return new(ToSrvLeaveModChan) },
+ 25: func() Cmd { return new(ToSrvMsgModChan) },
35: func() Cmd { return new(ToSrvPlayerPos) },
36: func() Cmd { return new(ToSrvGotBlks) },
37: func() Cmd { return new(ToSrvDeletedBlks) },