Release bugfixes

rajko-horvat · Mar 20, 2024 · a46893a · a46893a
1 parent bc9f444
commit a46893a
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 32 deletions.
diff --git a/How To Install.txt b/How To Install.txt
diff --git a/README.md b/README.md
@@ -17,22 +17,15 @@
 
 <p>The part of the game assembly code is emulated with Virtual CPU, and the rest of the code has been rewritten from scratch until all of the code is replaced with new copyright free code. The other resources (like graphics, music and text) will also be completely replaced with copyright free resources before publishing the complete game.</p>
 
-## Current status
-<p><b>The game is in working state</b>, but you have to legally own the Original game (the .txt, .pic and .pal files have to be present).<br/><br/>
-Keyboard shortcuts:
+## Dependencies
 <ul>
-<li>Alt + D - Enable / Disable the <b>Debug mode (Shift-56)</b></li>
-<li>Alt + P - Pause / Resume game</li>
-<li>Alt + 1 - Show / Hide Screen 1</li>
-<li>Alt + 2 - Show / Hide Screen 2</li>
-<li>Alt + 3 - Show / Hide Screen 3</li>
-</ul></p>
+<li>.NET 8</li>
+<li>Visual C++ 2015-2019 redistributable (on some Windows machines)</li>
+</ul>
 
 ## How to install release version of OpenCiv1
 <p>The files from the Release should be copied directly into installed and working DOS Civilization game directory.</p>
 
-<p>The only dependency is .NET 8</p>
-
 ## How to compile the code (.NET 8 SDK required)
 If you want to compile the code, it is assumed that:
 <ul>
@@ -49,6 +42,17 @@ Compile with CLI method:
 <li>dotnet build -c Release</li>
 </ul>
 
+## Current status
+<p><b>The game is in working state</b>, but you have to legally own the Original game (the .txt, .pic and .pal files have to be present).<br/><br/>
+Keyboard shortcuts:
+<ul>
+<li>Alt + D - Enable / Disable the <b>Debug mode (Shift-56)</b></li>
+<li>Alt + P - Pause / Resume game</li>
+<li>Alt + 1 - Show / Hide Screen 1</li>
+<li>Alt + 2 - Show / Hide Screen 2</li>
+<li>Alt + 3 - Show / Hide Screen 3</li>
+</ul></p>
+
 ## Help needed
 <p>All contributions are welcome.</p>
 For this stage of code rewrite, the programmings skills needed are:

diff --git a/src/CPU/CPU.cs b/src/CPU/CPU.cs
@@ -86,7 +86,7 @@ static CPU()
 					Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), Path.DirectorySeparatorChar);
 			}
 #else
-			DefaultCIVPath = "";
+			DefaultCIVPath = $"{Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)}{Path.DirectorySeparatorChar}";
 #endif
 		}
 

diff --git a/src/Documentation/CVL and EXE driver overlays.txt b/src/Documentation/CVL and EXE driver overlays.txt
@@ -91,8 +91,8 @@ Sound drivers ASOUND.CVL, ISOUND.CVL, NSOUND.CVL, RSOUND.CVL and TSOUND.CVL (onl
 * jmp instruction at offset 0xa41 is mapped to function 4
 * jmp instruction at offset 0xa48 is mapped to function 5
 * jmp instruction at offset 0xa4f is mapped to function 6
-* jmp instruction at offset 0xa56 is mapped to function 7
-* jmp instruction at offset 0xa5d is mapped to function 8
-* jmp instruction at offset 0xa64 is mapped to function 9
-* jmp instruction at offset 0xa6b is mapped to function 10
-* jmp instruction at offset 0xa72 is mapped to function 11
+* jmp instruction at offset 0xa56 is mapped to function 7 (Not used)
+* jmp instruction at offset 0xa5d is mapped to function 8 (Not used)
+* jmp instruction at offset 0xa64 is mapped to function 9 (Not used)
+* jmp instruction at offset 0xa6b is mapped to function 10 (Not used)
+* jmp instruction at offset 0xa72 is mapped to function 11 (Not used)
diff --git a/src/Game/Game.cs b/src/Game/Game.cs
@@ -177,7 +177,7 @@ public void Start()
 
 				if (!File.Exists(sFilePath))
 				{
-					throw new ResourceMissingException($"Missing resource file {sFilePath}. Plsease ensure that the file exists at specified path.");
+					throw new ResourceMissingException($"Missing resource file {sFilePath}. Please ensure that the file exists at specified path.");
 				}
 			}
 			#endregion

diff --git a/src/OpenCiv1.csproj b/src/OpenCiv1.csproj
@@ -68,15 +68,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="..\How To Install.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="..\LICENSE">
+    <None Remove="..\LICENSE" />
+    <None Remove="..\README.md" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="..\LICENSE">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="..\README.md">
+    </Content>
+    <Content Include="..\README.md">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </Content>
   </ItemGroup>
-
+	
 </Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,7 +86,7 @@ static CPU() @@
     					Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), Path.DirectorySeparatorChar);
     			}
     #else
-    			DefaultCIVPath = "";
+    			DefaultCIVPath = $"{Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)}{Path.DirectorySeparatorChar}";
     #endif
     		}
@@ Expand Down @@