From 8f736b5b237715c2d78eb3eb7b5ea40acb6786c1 Mon Sep 17 00:00:00 2001
From: LoveEevee <LoveEevee@users.noreply.github.com>
Date: Mon, 16 Mar 2020 18:34:18 +0300
Subject: [PATCH] Fix weird sound on error and long lines not wrapping

---
 public/src/js/canvasdraw.js | 34 +++++++++++++++++++++++++++++++---
 public/src/js/songselect.js |  3 ++-
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/public/src/js/canvasdraw.js b/public/src/js/canvasdraw.js
index 6da8266..bb38f1b 100644
--- a/public/src/js/canvasdraw.js
+++ b/public/src/js/canvasdraw.js
@@ -927,8 +927,22 @@
 				}
 			}
 		}
+		var search = () => {
+			var end = line.length
+			var dist = end
+			while(dist){
+				dist >>= 1
+				line = words[i].slice(0, end)
+				lastWidth = ctx.measureText(line).width
+				end += lastWidth < config.width ? dist : -dist
+			}
+			if(line !== words[i]){
+				words.splice(i + 1, 0, words[i].slice(line.length))
+				words[i] = line
+			}
+		}
 		
-		for(var i in words){
+		for(var i = 0; i < words.length; i++){
 			var skip = words[i].substitute || words[i] === "\n"
 			if(!skip){
 				var currentWidth = ctx.measureText(line + words[i]).width
@@ -960,8 +974,22 @@
 					recenter()
 					x = 0
 					y += lineHeight
-					line = words[i] === "\n" ? "" : words[i]
-					lastWidth = ctx.measureText(line).width
+					if(words[i] === "\n"){
+						line = ""
+						lastWidth = 0
+					}else{
+						line = words[i]
+						lastWidth = ctx.measureText(line).width
+						if(line.length !== 1 && lastWidth > config.width){
+							search()
+						}
+					}
+				}
+			}else if(!line){
+				line = words[i]
+				lastWidth = ctx.measureText(line).width
+				if(line.length !== 1 && lastWidth > config.width){
+					search()
 				}
 			}else{
 				line += words[i]
diff --git a/public/src/js/songselect.js b/public/src/js/songselect.js
index 78e9659..f2c6c63 100644
--- a/public/src/js/songselect.js
+++ b/public/src/js/songselect.js
@@ -1022,7 +1022,7 @@ class SongSelect{
 			}
 		}
 		
-		if(screen === "song" && (this.showWarning || scoreStorage.scoreSaveFailed) && !p2.session){
+		if(screen === "song" && (this.showWarning && !this.showWarning.shown || scoreStorage.scoreSaveFailed)){
 			if(!this.showWarning){
 				this.showWarning = {name: "scoreSaveFailed"}
 			}
@@ -1032,6 +1032,7 @@ class SongSelect{
 			if(this.showWarning.name === "scoreSaveFailed"){
 				scoreStorage.scoreSaveFailed = false
 			}
+			this.showWarning.shown = true
 			this.state.showWarning = true
 			this.state.locked = true
 			this.playSound("se_pause")