Package: performous / 1.1+git20190701.9928c27-3

spelling.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
Description: lintian found spelling mistakes
Author: mirabilos <tg@debian.org>
Forwarded: https://github.com/performous/performous/pull/479
Applied-Upstream: master, commit:329344b75

--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -57,7 +57,7 @@ yum install git cmake gcc-c++ gettext ca
 
 ### MacOS
 
-These instructions will walk you through building Performous for macOS (10.9+) and bundling and packaging it inside a DMG ready to install. By default these instructions build the internal webserver, the extra tools (such as Singstar extractor; note, not all are currently working in macOS, even if they all do build succesfully), and support for webcam (via OpenCV)
+These instructions will walk you through building Performous for macOS (10.9+) and bundling and packaging it inside a DMG ready to install. By default these instructions build the internal webserver, the extra tools (such as Singstar extractor; note, not all are currently working in macOS, even if they all do build successfully), and support for webcam (via OpenCV)
 
 * These instruction have been tested with macOS 10.12.5 and XCode 8.3.3.
 
--- a/game/color.cc
+++ b/game/color.cc
@@ -51,7 +51,7 @@ Color::Color(std::string const& str) {
 	}
 	ColorNames::Map::const_iterator it = colors.m.find(str);
 	if (it != colors.m.end()) { *this = it->second; return; }
-	std::clog << "color/warning: Unknown color: " << str << " (using magenta to hilight)" << std::endl;
+	std::clog << "color/warning: Unknown color: " << str << " (using magenta to highlight)" << std::endl;
 	*this = Color(1.0, 0.0, 1.0, 1.0);
 }
 
--- a/game/platform/fs_paths.unix.inc
+++ b/game/platform/fs_paths.unix.inc
@@ -101,7 +101,7 @@
 					}
 					}
 				}
-				if (didMigrateConfig) { std::clog << "fs/info: Succesfully moved configuration files to their new location: " << conf.string() << std::endl; }
+				if (didMigrateConfig) { std::clog << "fs/info: Successfully moved configuration files to their new location: " << conf.string() << std::endl; }
 				}
 			// Data dirs
 			std::string logmsg = "fs/info: Determining data dirs (search path):\n";
--- a/game/screen_songs.cc
+++ b/game/screen_songs.cc
@@ -360,17 +360,17 @@ void ScreenSongs::drawCovers() {
 		Texture& s = getCover(song);
 		// Calculate dimensions for cover and instrument markers
 		double pos = i - shift;
-		// Function for hilight effect (offset = 0 for current cover), returns 0..1 hilight level
-		auto hilightf = [=](double offset) { return smoothstep(3.5, 0.0, std::abs(pos + offset)); };
+		// Function for highlight effect (offset = 0 for current cover), returns 0..1 highlight level
+		auto highlightf = [=](double offset) { return smoothstep(3.5, 0.0, std::abs(pos + offset)); };
 		// Coordinate translations (pos and offset in cover units to z and x in OpenGL space)
-		auto ztrans = [=](double offset) { return -0.5 + 0.3 * hilightf(offset); };
+		auto ztrans = [=](double offset) { return -0.5 + 0.3 * highlightf(offset); };
 		auto xtrans = [=](double offset) { return -0.2 + 0.20 * (pos + offset); };
 		// A cover is angled to a line between the surrounding gaps (offset +- 0.5 covers)
 		double angle = -std::atan2(ztrans(0.5) - ztrans(-0.5), xtrans(0.5) - xtrans(-0.5));
 		double y = 0.5 * virtH();
 		double x = xtrans(0.0);
 		double z = ztrans(0.0);
-		double c = 0.4 + 0.6 * hilightf(0.0);
+		double c = 0.4 + 0.6 * highlightf(0.0);
 		if (m_menuPos == 1 /* Cover browser */ && baseidx + i == currentId) c = beat;
 		using namespace glmath;
 		Transform trans(translate(vec3(x, y, z)) * rotate(angle, vec3(0.0, 1.0, 0.0)));