385/lintissues (OpenDiablo2#391)

* camera offset for ui panels :

added maprenderer viewport to be aligned left or right

calling alignement on keyPress in game_controls

* check if already aligned

* fix bugs

-forgot to assign alignement
-defaultScreenRect instead of screenRect because of issue mentionned in original comment

* remove config.json and replace go.mod line

* removing duplicate import of d2common

replacing all dh to d2common

* remove useless breaks from switch statement

* better range when value unused + prettying import

* item_affix rewrite

using return values instead of pointer references in arguments

* ebiten deprecated calls

* small fixes

Author: Haashi

d2common/d2data/d2compression/huffman.go

@@ -246,7 +246,7 @@ func adjustTree(newNode *linkedNode) {
 		var prev *linkedNode
 		// Go backwards thru the list looking for the insertion point
 		insertpoint = current
-		for true {
+		for {
 			prev = insertpoint.Prev
 			if prev == nil {
 				break
@@ -347,23 +347,19 @@ func HuffmanDecompress(data []byte) []byte {
 	outputstream := d2common.CreateStreamWriter()
 	bitstream := d2common.CreateBitStream(data[1:])
 	var decoded int
-	for true {
+Loop:
+	for {
 		node := decode(bitstream, head)
 		decoded = node.DecompressedValue
 		switch decoded {
 		case 256:
-			break
+			break Loop
 		case 257:
 			newvalue := bitstream.ReadBits(8)
 			outputstream.PushByte(byte(newvalue))
 			tail = insertNode(tail, newvalue)
-			break
 		default:
 			outputstream.PushByte(byte(decoded))
-			break
-		}
-		if decoded == 256 {
-			break
 		}
 	}
 

d2common/d2data/d2compression/wav.go

@@ -57,7 +57,6 @@ func WavDecompress(data []byte, channelCount int) []byte {
 					Array1[channel]--
 				}
 				output.PushInt16(int16(Array2[channel]))
-				break
 			case 1:
 				Array1[channel] += 8
 				if Array1[channel] > 0x58 {
@@ -66,9 +65,7 @@ func WavDecompress(data []byte, channelCount int) []byte {
 				if channelCount == 2 {
 					channel = 1 - channel
 				}
-				break
 			case 2:
-				break
 			default:
 				Array1[channel] -= 8
 				if Array1[channel] < 0 {
@@ -77,7 +74,6 @@ func WavDecompress(data []byte, channelCount int) []byte {
 				if channelCount == 2 {
 					channel = 1 - channel
 				}
-				break
 			}
 		} else {
 			temp1 := sLookup[Array1[channel]]

d2common/d2data/d2datadict/charstats.go

@@ -92,7 +92,7 @@ func LoadCharStats(file []byte) {
 	d := d2common.LoadDataDictionary(string(file))
 	CharStats = make(map[d2enum.Hero]*CharStatsRecord, len(d.Data))
 
-	for idx, _ := range d.Data {
+	for idx := range d.Data {
 		record := &CharStatsRecord{
 			Class: charStringMap[d.GetString("class", idx)],
 

d2common/d2data/d2datadict/difficultylevels.go

@@ -95,7 +95,7 @@ func LoadDifficultyLevels(file []byte) {
 
 	DifficultyLevels = make(map[string]*DifficultyLevelRecord, numRows)
 
-	for idx, _ := range dict.Data {
+	for idx := range dict.Data {
 		record := &DifficultyLevelRecord{
 			Name:                   dict.GetString("Name", idx),
 			ResistancePenalty:      dict.GetNumber("ResistPenalty", idx),

d2common/d2data/d2datadict/experience.go

@@ -77,7 +77,7 @@ func LoadExperienceBreakpoints(file []byte) {
 	// we skip the second row because that describes max level of char classes
 	ExperienceBreakpoints = make([]*ExperienceBreakpointsRecord, len(d.Data)-1)
 
-	for idx, _ := range d.Data {
+	for idx := range d.Data {
 		if idx == 0 {
 			// max levels are a special case
 			maxLevels = map[d2enum.Hero]int{

d2common/d2data/d2datadict/gems.go

@@ -1,8 +1,9 @@
 package d2datadict
 
 import (
-	"github.com/OpenDiablo2/OpenDiablo2/d2common"
 	"log"
+
+	"github.com/OpenDiablo2/OpenDiablo2/d2common"
 )
 
 type GemsRecord struct {
@@ -52,7 +53,7 @@ type GemsRecord struct {
 func LoadGems(file []byte) {
 	d := d2common.LoadDataDictionary(string(file))
 	var Gems []*GemsRecord
-	for idx, _ := range d.Data {
+	for idx := range d.Data {
 		if d.GetString("name", idx) != "Expansion" {
 			/*
 				"Expansion" is the only field in line 36 of /data/global/excel/gems.txt and is only used to visually

d2common/d2data/d2datadict/hireling.go

@@ -1,8 +1,9 @@
 package d2datadict
 
 import (
-	"github.com/OpenDiablo2/OpenDiablo2/d2common"
 	"log"
+
+	"github.com/OpenDiablo2/OpenDiablo2/d2common"
 )
 
 type HirelingRecord struct {
@@ -83,7 +84,7 @@ type HirelingRecord struct {
 func LoadHireling(file []byte) {
 	d := d2common.LoadDataDictionary(string(file))
 	var Hirelings []*HirelingRecord
-	for idx, _ := range d.Data {
+	for idx := range d.Data {
 		hireling := &HirelingRecord{
 			Hireling:        d.GetString("Hireling", idx),
 			SubType:         d.GetString("SubType", idx),

d2common/d2data/d2datadict/item_affix.go

@@ -22,13 +22,13 @@ var subType d2enum.ItemAffixSubType
 func LoadMagicPrefix(file []byte) {
 	superType = d2enum.ItemAffixPrefix
 	subType = d2enum.ItemAffixMagic
-	loadDictionary(file, MagicPrefixDictionary, superType, subType)
+	MagicPrefixDictionary, MagicPrefixRecords = loadDictionary(file, superType, subType)
 }
 
 func LoadMagicSuffix(file []byte) {
 	superType = d2enum.ItemAffixSuffix
 	subType = d2enum.ItemAffixMagic
-	loadDictionary(file, MagicSuffixDictionary, superType, subType)
+	MagicSuffixDictionary, MagicSuffixRecords = loadDictionary(file, superType, subType)
 }
 
 func getAffixString(t1 d2enum.ItemAffixSuperType, t2 d2enum.ItemAffixSubType) string {
@@ -52,16 +52,14 @@ func getAffixString(t1 d2enum.ItemAffixSuperType, t2 d2enum.ItemAffixSubType) st
 
 func loadDictionary(
 	file []byte,
-	dict *d2common.DataDictionary,
 	superType d2enum.ItemAffixSuperType,
 	subType d2enum.ItemAffixSubType,
-) {
-	dict = d2common.LoadDataDictionary(string(file))
-	records := make([]*ItemAffixCommonRecord, 0)
-
-	createItemAffixRecords(dict, records, superType, subType)
+) (*d2common.DataDictionary, []*ItemAffixCommonRecord) {
+	dict := d2common.LoadDataDictionary(string(file))
+	records := createItemAffixRecords(dict, superType, subType)
 	name := getAffixString(superType, subType)
 	log.Printf("Loaded %d %s records", len(dict.Data), name)
+	return dict, records
 }
 
 // --- column names from d2exp.mpq:/data/globa/excel/MagicPrefix.txt
@@ -109,11 +107,11 @@ func loadDictionary(
 
 func createItemAffixRecords(
 	d *d2common.DataDictionary,
-	r []*ItemAffixCommonRecord,
 	superType d2enum.ItemAffixSuperType,
 	subType d2enum.ItemAffixSubType,
-) {
-	for index, _ := range d.Data {
+) []*ItemAffixCommonRecord {
+	records := make([]*ItemAffixCommonRecord, 0)
+	for index := range d.Data {
 
 		affix := &ItemAffixCommonRecord{
 			Name:           d.GetString("Name", index),
@@ -179,8 +177,9 @@ func createItemAffixRecords(
 		group := ItemAffixGroups[affix.GroupID]
 		group.AddMember(affix)
 
-		r = append(r, affix)
+		records = append(records, affix)
 	}
+	return records
 }
 
 var ItemAffixGroups map[int]*ItemAffixCommonGroup

d2common/d2data/d2datadict/itemstatcost.go

@@ -1,9 +1,10 @@
 package d2datadict
 
 import (
+	"log"
+
 	"github.com/OpenDiablo2/OpenDiablo2/d2common"
 	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2enum"
-	"log"
 )
 
 // refer to https://d2mods.info/forum/kb/viewarticle?a=448
@@ -245,7 +246,7 @@ func LoadItemStatCosts(file []byte) {
 	numRecords := len(d.Data)
 	ItemStatCosts = make(map[string]*ItemStatCostRecord, numRecords)
 
-	for idx, _ := range d.Data {
+	for idx := range d.Data {
 		record := &ItemStatCostRecord{
 			Name:  d.GetString("Stat", idx),
 			Index: d.GetNumber("ID", idx),

d2common/d2data/d2datadict/level_maze.go

@@ -40,7 +40,7 @@ func LoadLevelMazeDetails(file []byte) {
 	dict := d2common.LoadDataDictionary(string(file))
 	numRecords := len(dict.Data)
 	LevelMazeDetails = make(map[int]*LevelMazeDetailsRecord, numRecords)
-	for idx, _ := range dict.Data {
+	for idx := range dict.Data {
 		record := &LevelMazeDetailsRecord{
 			Name:              dict.GetString("Name", idx),
 			LevelId:           dict.GetNumber("Level", idx),