From ef9a7826bb488d2c2a6418f0c8b24ee3036ad2a8 Mon Sep 17 00:00:00 2001
From: Tim Sarbin <tim.sarbin@gmail.com>
Date: Sat, 2 Nov 2019 11:15:02 -0400
Subject: [PATCH] Minor updates. Working on tavis build configs.

---
 .travis.yml             | 28 +++++++++++++++++++++++++---
 Map/Engine.go           | 27 ++++++++++-----------------
 Scenes/MapEngineTest.go |  1 +
 config.json             |  2 +-
 main.go                 |  6 ++----
 5 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e5d8b5e5..038b263b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,32 @@
 language: go
+os:
+  - linux
+  - osx
+  - windows
 go:
   - 1.13.3
-before_install:
-  - sudo apt-get -y install libx11-dev  mesa-common-dev libglfw3-dev libgles2-mesa-dev libasound2-dev
-script: go get && go build .
+addons:
+  apt:
+    packages:
+      - libx11-dev
+      - mesa-common-dev
+      - libglfw3-dev
+      - libgles2-mesa-dev
+      - libasound2-dev
+script:
+  - go get
+  - go build .
 git:
   depth: 1
 notifications:
   email: false
+deploy:
+  provider: releases
+  api_key:
+    secure: "$GithubApi"
+  file_glob: true
+  file: build_artifacts/*
+  skip_cleanup: true
+  name: "OpenDiablo Git Latest ($TRAVIS_OS_NAME)"
+  on:
+    tags: true
diff --git a/Map/Engine.go b/Map/Engine.go
index e5241a59..85480354 100644
--- a/Map/Engine.go
+++ b/Map/Engine.go
@@ -44,7 +44,6 @@ func (v *Engine) GenerateMap(regionType RegionIdType, levelPreset int) {
 }
 
 func (v *Engine) Render(target *ebiten.Image) {
-	// TODO: Temporary hack for testing
 	for y := 0; y < int(v.regions[0].Region.TileHeight); y++ {
 		offX := -(y * 80)
 		offY := y * 40
@@ -84,15 +83,12 @@ func (v *Engine) Render(target *ebiten.Image) {
 		offX := -(y * 80)
 		offY := y * 40
 		for x := 0; x < int(v.regions[0].Region.TileWidth); x++ {
-			sx, sy := Common.IsoToScreen(x, y, int(v.OffsetX), int(v.OffsetY))
-			if sx > -160 && sy > -160 && sx <= 800 && sy <= 1000 {
-				tile := v.regions[0].Region.DS1.Tiles[y][x]
-				for i := range tile.Walls {
-					if tile.Walls[i].Hidden || tile.Walls[i].Orientation == 15 || tile.Walls[i].Orientation == 10 || tile.Walls[i].Orientation == 11 || tile.Walls[i].Orientation == 0 {
-						continue
-					}
-					v.regions[0].Region.RenderTile(offX+int(v.OffsetX), offY+int(v.OffsetY), x, y, RegionLayerTypeWalls, i, target)
+			tile := v.regions[0].Region.DS1.Tiles[y][x]
+			for i := range tile.Walls {
+				if tile.Walls[i].Hidden || tile.Walls[i].Orientation == 15 || tile.Walls[i].Orientation == 10 || tile.Walls[i].Orientation == 11 || tile.Walls[i].Orientation == 0 {
+					continue
 				}
+				v.regions[0].Region.RenderTile(offX+int(v.OffsetX), offY+int(v.OffsetY), x, y, RegionLayerTypeWalls, i, target)
 			}
 			offX += 80
 			offY += 40
@@ -102,15 +98,12 @@ func (v *Engine) Render(target *ebiten.Image) {
 		offX := -(y * 80)
 		offY := y * 40
 		for x := 0; x < int(v.regions[0].Region.TileWidth); x++ {
-			sx, sy := Common.IsoToScreen(x, y, int(v.OffsetX), int(v.OffsetY))
-			if sx > -160 && sy > -160 && sx <= 800 && sy <= 1000 {
-				tile := v.regions[0].Region.DS1.Tiles[y][x]
-				for i := range tile.Walls {
-					if tile.Walls[i].Hidden || tile.Walls[i].Orientation != 15 {
-						continue
-					}
-					v.regions[0].Region.RenderTile(offX+int(v.OffsetX), offY+int(v.OffsetY), x, y, RegionLayerTypeWalls, i, target)
+			tile := v.regions[0].Region.DS1.Tiles[y][x]
+			for i := range tile.Walls {
+				if tile.Walls[i].Hidden || tile.Walls[i].Orientation != 15 {
+					continue
 				}
+				v.regions[0].Region.RenderTile(offX+int(v.OffsetX), offY+int(v.OffsetY), x, y, RegionLayerTypeWalls, i, target)
 			}
 			offX += 80
 			offY += 40
diff --git a/Scenes/MapEngineTest.go b/Scenes/MapEngineTest.go
index 2a3c19f0..68d1162c 100644
--- a/Scenes/MapEngineTest.go
+++ b/Scenes/MapEngineTest.go
@@ -47,6 +47,7 @@ func (v *MapEngineTest) Load() []func() {
 			//v.mapEngine.GenerateMap(Map.RegionAct2Harem, 353)
 			//v.mapEngine.GenerateMap(Map.RegionAct3Town, 529)
 			//v.mapEngine.GenerateMap(Map.RegionAct3Jungle, 574)
+			//v.mapEngine.GenerateMap(Map.RegionAct4Town, 797)
 			//v.mapEngine.GenerateMap(Map.RegonAct5Town, 863)
 			//v.mapEngine.GenerateMap(Map.RegionAct5IceCaves, 1038)
 			//v.mapEngine.GenerateMap(Map.RegionAct5Siege, 879)
diff --git a/config.json b/config.json
index 52573f72..f705afcb 100644
--- a/config.json
+++ b/config.json
@@ -2,7 +2,7 @@
     "Language": "ENG",
     "FullScreen": false,
     "Scale": 1,
-    "TicksPerSecond": 25,
+    "TicksPerSecond": -1,
     "RunInBackground": true,
     "VsyncEnabled": true,
     "SfxVolume": 1.0,
diff --git a/main.go b/main.go
index 5f54d022..cdc4896c 100644
--- a/main.go
+++ b/main.go
@@ -2,9 +2,6 @@ package main
 
 import (
 	"log"
-	"strconv"
-
-	"github.com/hajimehoshi/ebiten/ebitenutil"
 
 	"github.com/essial/OpenDiablo2/Core"
 	"github.com/essial/OpenDiablo2/MPQ"
@@ -14,6 +11,7 @@ import (
 var d2Engine *Core.Engine
 
 func main() {
+	log.SetFlags(log.Ldate | log.LUTC | log.Lmicroseconds | log.Llongfile)
 	log.Println("OpenDiablo2 - Open source Diablo 2 engine")
 	MPQ.InitializeCryptoBuffer()
 	d2Engine = Core.CreateEngine()
@@ -33,6 +31,6 @@ func update(screen *ebiten.Image) error {
 		return nil
 	}
 	d2Engine.Draw(screen)
-	ebitenutil.DebugPrint(screen, "FPS:"+strconv.Itoa(int(ebiten.CurrentFPS())))
+	//ebitenutil.DebugPrint(screen, "FPS:"+strconv.Itoa(int(ebiten.CurrentFPS())))
 	return nil
 }