Hook up chat message events

Author: markus-wa

demopacket.go

@@ -62,6 +62,9 @@ func (p *Parser) parsePacket() {
 		case int(msg.SVC_Messages_svc_UpdateStringTable):
 			m = new(msg.CSVCMsg_UpdateStringTable)
 
+		case int(msg.SVC_Messages_svc_UserMessage):
+			m = new(msg.CSVCMsg_UserMessage)
+
 		default:
 			// We don't care about anything else for now
 			p.bitReader.EndChunk()

events/events.go

@@ -237,24 +237,38 @@ type PlayerDisconnectEvent struct {
 	Player *common.Player
 }
 
-// SayTextEvent signals a chat message. Not sure what the
-// difference between this and SayText2Event is.
+// SayTextEvent signals a chat message. It contains the raw
+// network message data for admin / console messages.
+// EntityIndex will probably always be 0
+// See ChatMessageEvent and SayText2Event for player chat messages.
 type SayTextEvent struct {
 	EntityIndex int
 	Text        string
 	IsChat      bool
 	IsChatAll   bool
 }
 
-// SayText2Event signals a chat message. Not sure what the
-// difference between this and SayTextEvent is.
+// SayText2Event signals a chat message. It just contains the raw network message
+// for player chat messages, ChatMessageEvent may be more interesting.
+// Team chat is generally not recorded so IsChatAll will probably always be false.
+// See SayTextEvent for admin / console messages.
 type SayText2Event struct {
 	Sender    *common.Player
-	Text      string
+	MsgName   string
+	Params    []string
 	IsChat    bool
 	IsChatAll bool
 }
 
+// ChatMessageEvent signals a player generated chat message.
+// Since team chat is generally not recorded IsChatAll will probably always be false.
+// See SayTextEvent for admin / console messages and SayText2Event for raw network packages.
+type ChatMessageEvent struct {
+	Sender    *common.Player
+	Text      string
+	IsChatAll bool
+}
+
 // RankUpdateEvent signals the new rank. Not sure if this
 // only occurs if the rank changed.
 type RankUpdateEvent struct {

packet_handlers.go

@@ -612,3 +612,53 @@ func (p *Parser) handleCreateStringTable(tab *msg.CSVCMsg_CreateStringTable) {
 	p.stringTables = append(p.stringTables, tab)
 	br.Pool()
 }
+
+func (p *Parser) handleUserMessage(um *msg.CSVCMsg_UserMessage) {
+	switch msg.ECstrike15UserMessages(um.MsgType) {
+	case msg.ECstrike15UserMessages_CS_UM_SayText:
+		st := new(msg.CCSUsrMsg_SayText)
+		err := st.Unmarshal(um.MsgData)
+		if err != nil {
+			panic(fmt.Sprintf("Failed to decode SayText message: %s", err.Error()))
+		}
+
+		p.eventDispatcher.Dispatch(events.SayTextEvent{
+			EntityIndex: int(st.EntIdx),
+			IsChat:      st.Chat,
+			IsChatAll:   st.Textallchat,
+			Text:        st.Text,
+		})
+
+	case msg.ECstrike15UserMessages_CS_UM_SayText2:
+		st := new(msg.CCSUsrMsg_SayText2)
+		err := st.Unmarshal(um.MsgData)
+		if err != nil {
+			panic(fmt.Sprintf("Failed to decode SayText2 message: %s", err.Error()))
+		}
+
+		sender := p.players[int(st.EntIdx)]
+		p.eventDispatcher.Dispatch(events.SayText2Event{
+			Sender:    sender,
+			IsChat:    st.Chat,
+			IsChatAll: st.Textallchat,
+			MsgName:   st.MsgName,
+			Params:    st.Params,
+		})
+
+		switch st.MsgName {
+		case "Cstrike_Chat_All":
+			fallthrough
+		case "Cstrike_Chat_AllDead":
+			p.eventDispatcher.Dispatch(events.ChatMessageEvent{
+				Sender:    sender,
+				Text:      st.Params[1],
+				IsChatAll: st.Textallchat,
+			})
+		default:
+		}
+
+	default:
+		// TODO: handle more user messages (if they are interesting)
+		// Maybe msg.ECstrike15UserMessages_CS_UM_RadioText
+	}
+}

parser.go

@@ -180,6 +180,7 @@ func NewParser(demostream io.Reader) *Parser {
 	p.msgDispatcher.RegisterHandler(p.handleGameEvent)
 	p.msgDispatcher.RegisterHandler(p.handleCreateStringTable)
 	p.msgDispatcher.RegisterHandler(p.handleUpdateStringTable)
+	p.msgDispatcher.RegisterHandler(p.handleUserMessage)
 
 	p.msgDispatcher.AddQueues(p.msgQueue)
 	return &p