Moved entities from Parser to GameState

Author: markus-wa

entities.go

@@ -26,18 +26,18 @@ func (p *Parser) handlePacketEntities(pe *msg.CSVCMsg_PacketEntities) {
 
 		if r.ReadBit() {
 			// Leave PVS
-			p.entities[currentEntity].Destroy()
-			delete(p.entities, currentEntity)
+			p.gameState.entities[currentEntity].Destroy()
+			delete(p.gameState.entities, currentEntity)
 
 			// 'Force Delete' flag, not exactly sure what it's supposed to do
 			r.ReadBit()
 		} else {
 			if r.ReadBit() {
 				// Enter PVS
-				p.entities[currentEntity] = p.stParser.ReadEnterPVS(r, currentEntity)
+				p.gameState.entities[currentEntity] = p.stParser.ReadEnterPVS(r, currentEntity)
 			} else {
 				// Delta Update
-				p.entities[currentEntity].ApplyUpdate(r)
+				p.gameState.entities[currentEntity].ApplyUpdate(r)
 			}
 		}
 	}

game_state.go

@@ -2,6 +2,7 @@ package demoinfocs
 
 import (
 	"github.com/markus-wa/demoinfocs-golang/common"
+	st "github.com/markus-wa/demoinfocs-golang/sendtables"
 )
 
 // GameState contains all game-state relevant information.
@@ -11,6 +12,7 @@ type GameState struct {
 	ctState            TeamState
 	players            map[int]*common.Player
 	grenadeProjectiles map[int]*common.GrenadeProjectile // Used to keep track of grenades that have been thrown, but have not yet detonated.
+	entities           map[int]*st.Entity                // Maps entity IDs to entities
 }
 
 type ingameTickNumber int
@@ -81,10 +83,16 @@ func (gs GameState) GrenadeProjectiles() map[int]*common.GrenadeProjectile {
 	return gs.grenadeProjectiles
 }
 
+// Entities returns all currently existing entities.
+func (gs GameState) Entities() map[int]*st.Entity {
+	return gs.entities
+}
+
 func newGameState() GameState {
 	return GameState{
 		players:            make(map[int]*common.Player),
 		grenadeProjectiles: make(map[int]*common.GrenadeProjectile),
+		entities:           make(map[int]*st.Entity),
 	}
 }
 

parser.go

@@ -59,7 +59,6 @@ type Parser struct {
 	rawPlayers           map[int]*playerInfo                             // Maps entity IDs to 'raw' player info
 	entityIDToPlayers    map[int]*common.Player                          // Temporary storage since we need to map players from entityID to userID later
 	additionalPlayerInfo [maxPlayers]common.AdditionalPlayerInformation  // Maps entity IDs to additional player info (scoreboard info)
-	entities             map[int]*st.Entity                              // Maps entity IDs to entities
 	modelPreCache        []string                                        // Used to find out whether a weapon is a p250 or cz for example (same id)
 	weapons              [maxEntities]common.Equipment                   // Used to remember what a weapon is (p250 / cz etc.)
 	triggers             map[int]*boundingBoxInformation                 // Maps entity IDs to triggers (used for bombsites)
@@ -100,11 +99,6 @@ func (p *Parser) GameState() *GameState {
 	return &p.gameState
 }
 
-// Entities returns the available entities.
-func (p *Parser) Entities() map[int]*st.Entity {
-	return p.entities
-}
-
 // CurrentFrame return the number of the current frame, aka. 'demo-tick' (Since demos often have a different tick-rate than the game).
 // Starts with frame 0, should go up to DemoHeader.PlaybackFrames but might not be the case (usually it's just close to it).
 func (p *Parser) CurrentFrame() int {
@@ -244,7 +238,6 @@ func NewParserWithConfig(demostream io.Reader, config ParserConfig) *Parser {
 	p.equipmentMapping = make(map[*st.ServerClass]common.EquipmentElement)
 	p.rawPlayers = make(map[int]*playerInfo)
 	p.entityIDToPlayers = make(map[int]*common.Player)
-	p.entities = make(map[int]*st.Entity)
 	p.triggers = make(map[int]*boundingBoxInformation)
 	p.cancelChan = make(chan struct{}, 1)
 	p.gameState = newGameState()