Skip to content

Commit 82e8cba

Browse files
committed
linting fixes
1 parent 9ebfcca commit 82e8cba

File tree

10 files changed

+12
-11
lines changed

10 files changed

+12
-11
lines changed

pkg/demoinfocs/common/common.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func (g *GrenadeProjectile) UniqueID() int64 {
9696
//
9797
// Intended for internal use only.
9898
func NewGrenadeProjectile() *GrenadeProjectile {
99-
return &GrenadeProjectile{uniqueID: rand.Int63()}
99+
return &GrenadeProjectile{uniqueID: rand.Int63()} //nolint:gosec
100100
}
101101

102102
// Bomb tracks the bomb's position, and the player carrying it, if any.

pkg/demoinfocs/common/equipment.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ func (e *Equipment) AmmoReserve() int {
375375
//
376376
// Intended for internal use only.
377377
func NewEquipment(wep EquipmentType) *Equipment {
378-
return &Equipment{Type: wep, uniqueID: rand.Int63()}
378+
return &Equipment{Type: wep, uniqueID: rand.Int63()} //nolint:gosec
379379
}
380380

381381
var equipmentToAlternative = map[EquipmentType]EquipmentType{

pkg/demoinfocs/common/inferno.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func convexHull(pointCloud []r3.Vector) quickhull.ConvexHull {
189189
func NewInferno(demoInfoProvider demoInfoProvider, entity st.Entity) *Inferno {
190190
return &Inferno{
191191
Entity: entity,
192-
uniqueID: rand.Int63(),
192+
uniqueID: rand.Int63(), //nolint:gosec
193193
demoInfoProvider: demoInfoProvider,
194194
}
195195
}

pkg/demoinfocs/debug_on.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func debugGameEvent(d *msg.CSVCMsg_GameEventListDescriptorT, ge *msg.CSVCMsg_Gam
4343
data := make(map[string]any)
4444

4545
for k, v := range mapGameEventData(d, ge) {
46-
switch v.Type {
46+
switch v.GetType() {
4747
case typeStr:
4848
data[k] = v.ValString
4949
case typeFloat:

pkg/demoinfocs/demoinfocs_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ func TestEncryptedNetMessages(t *testing.T) {
202202
}
203203

204204
infoF, err := os.Open(csDemosPath + "/match730_003528806449641685104_1453182610_271.dem.info")
205+
assert.NoError(t, err)
205206

206207
b, err := ioutil.ReadAll(infoF)
207208
assert.NoError(t, err)

pkg/demoinfocs/net_messages.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func (p *parser) handlePacketEntities(pe *msg.CSVCMsg_PacketEntities) {
3434
}
3535

3636
p.gameState.entities[currentEntity] = p.stParser.ReadEnterPVS(r, currentEntity)
37-
} else { //nolint:gocritic
37+
} else {
3838
// Delta Update
3939
if entity := p.gameState.entities[currentEntity]; entity != nil {
4040
entity.ApplyUpdate(r)
@@ -141,6 +141,7 @@ func (p *parser) handleEncryptedData(msg *msg.CSVCMsg_EncryptedData) {
141141
}
142142

143143
msgB := br.ReadBytes(int(size))
144+
144145
err := proto.Unmarshal(msgB, m)
145146
if err != nil {
146147
p.setError(err)

pkg/demoinfocs/parsing.go

-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@ func (p *parser) netMessageForCmd(cmd int) proto.Message {
327327
return nil
328328
}
329329

330-
//nolint:funlen
331330
func (p *parser) parsePacket() {
332331
// Booooring
333332
// 152 bytes CommandInfo, 4 bytes SeqNrIn, 4 bytes SeqNrOut

pkg/demoinfocs/sendtables/st_parser.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,9 @@ func (p *SendTableParser) flattenDataTable(serverClassIndex int) {
168168
prop := fProps[cp].prop
169169
if prop.priority == prio || (prio == 64 && prop.flags.hasFlagSet(propFlagChangesOften)) {
170170
if start != cp {
171-
tmp := fProps[start]
172-
fProps[start] = fProps[cp]
173-
fProps[cp] = tmp
171+
fProps[start], fProps[cp] = fProps[cp], fProps[start]
174172
}
173+
175174
start++
176175

177176
break

pkg/demoinfocs/stringtables.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ func (p *parser) parseSingleStringTable(name string) {
8686
panic(errors.Wrap(err, "couldn't parse playerIndex from string"))
8787
}
8888

89-
p.setRawPlayer(int(playerIndex), player)
89+
p.setRawPlayer(playerIndex, player)
9090

9191
case stNameInstanceBaseline:
9292
classID, err := strconv.Atoi(stringName)
9393
if err != nil {
9494
panic(errors.Wrap(err, "couldn't parse serverClassID from string"))
9595
}
9696

97-
p.stParser.SetInstanceBaseline(int(classID), data)
97+
p.stParser.SetInstanceBaseline(classID, data)
9898

9999
case stNameModelPreCache:
100100
p.modelPreCache = append(p.modelPreCache, stringName)

pkg/demoinfocs/user_messages.go

+1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ func (umh userMessageHandler) rankUpdate(um *msg.CSVCMsg_UserMessage) {
135135
for _, v := range st.RankUpdate {
136136
// find player (or old instance if he has disconnected already)
137137
steamID32 := uint32(v.GetAccountId())
138+
138139
player, ok := umh.parser.gameState.playersBySteamID32[steamID32]
139140
if !ok {
140141
errMsg := fmt.Sprintf("rank update for unknown player with SteamID32=%d", steamID32)

0 commit comments

Comments
 (0)