Bugs fixes

Retired-2B-dev-team · Aug 29, 2022 · 9043f3e · 9043f3e
1 parent cbccbeb
commit 9043f3e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/ENIGMA-v0.1-alfa.0/enigma-app.cpp b/ENIGMA-v0.1-alfa.0/enigma-app.cpp
@@ -42,7 +42,7 @@ void load_settings(Enigma* enigma, std::string settings_path)
 		} while (file_name[0] == COMMENT_CHAR);
 
 		file_name = DISKS_PATH + file_name + ".rtr";
-		notches = enigma->load_connections(file_name, connections);
+		notches = enigma->load_connections(file_name, connections, true);
 		enigma->add_disk(connections, notches.x, notches.y);
 	}
 
@@ -107,6 +107,6 @@ int main(int argc, char** argv)
 
 	load_settings(&enigma, SETTINGS_PATH);
 	cmd(argc, argv, &enigma);
-	
+
 	return 0;
-}
+}
diff --git a/ENIGMA-v0.1-alfa.0/libraries/enigma.h b/ENIGMA-v0.1-alfa.0/libraries/enigma.h
@@ -52,17 +52,17 @@ namespace eng
 		int notch_second;
 
 	private: // private methods
-		void __correct_rotation__()
-		{
-			while (Disk::rotation >= Disk::size)
-			{
-				Disk::rotation -= Disk::size;
-			}
-			while (Disk::rotation < 0)
-			{
-				Disk::rotation += Disk::size;
-			}
-		}
+		// void __correct_rotation__()
+		// {
+		// 	while (Disk::rotation >= Disk::size)
+		// 	{
+		// 		Disk::rotation -= Disk::size;
+		// 	}
+		// 	while (Disk::rotation < 0)
+		// 	{
+		// 		Disk::rotation += Disk::size;
+		// 	}
+		// }
 
 	public: // public methods
 		// void load(std::string file_name)
@@ -87,14 +87,14 @@ namespace eng
 		{
 			// function used to rotate disk
 			Disk::rotation += rotation_tiks;
-			__correct_rotation__();
+			rotation = hq::normalize(Disk::rotation, Disk::size);
 		}
 
 		int forward(int index)
 		{
 			// pass signal through disk
 			index = hq::normalize(index + Disk::rotation, Disk::size);
-			return hq::normalize(Disk::connections[index] + Disk::size - Disk::rotation, Disk::size);
+			return hq::normalize(Disk::connections[index] - Disk::rotation, Disk::size);
 		}
 
 		void get_visual()

diff --git a/ENIGMA-v0.1-alfa.0/libraries/headquarters.h b/ENIGMA-v0.1-alfa.0/libraries/headquarters.h
@@ -25,6 +25,11 @@ namespace hq
 
 	int normalize(int value, int max)
 	{
+		while (value < 0)
+		{
+			value += max;
+		}
+
 		return value % max;
 	}