Change .NET Framework back to 4.8

rajko-horvat · Sep 9, 2023 · ddb923a · ddb923a
1 parent 1ddc282
commit ddb923a
Show file tree

Hide file tree

Showing 31 changed files with 31 additions and 52 deletions.
diff --git a/CPU/CPUFlags.cs b/CPU/CPUFlags.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace Disassembler

diff --git a/CPU/CPUMemory.cs b/CPU/CPUMemory.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
 using System.Net;
 using System.Text;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox;

diff --git a/CPU/CPUMemoryRegion.cs b/CPU/CPUMemoryRegion.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace Disassembler

diff --git a/CPU/CPURegister.cs b/CPU/CPURegister.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace Disassembler

diff --git a/CPU/FileStreamItem.cs b/CPU/FileStreamItem.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 
 namespace OpenCiv1

diff --git a/Compression/CRC32.cs b/Compression/CRC32.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
 using System.Net.Sockets;
 using System.Text;
 

diff --git a/Compression/LZW.cs b/Compression/LZW.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 
 namespace OpenCiv1.Compression
 {

diff --git a/Compression/LZWWord.cs b/Compression/LZWWord.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace OpenCiv1.Compression

diff --git a/Compression/RLE.cs b/Compression/RLE.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 
 namespace OpenCiv1.Compression

diff --git a/GPU/CivRectangle.cs b/GPU/CivRectangle.cs
@@ -1,7 +1,6 @@
 using Disassembler;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace OpenCiv1

diff --git a/GPU/Fonts/CivFont.cs b/GPU/Fonts/CivFont.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Xml.Serialization;
 

diff --git a/GPU/Fonts/CivFontCharacter.cs b/GPU/Fonts/CivFontCharacter.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Xml.Serialization;
 

diff --git a/GPU/Fonts/CivFonts.cs b/GPU/Fonts/CivFonts.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
-using System.Linq;
 using System.Text;
 using System.Xml.Serialization;
 

diff --git a/GPU/VGAForm.cs b/GPU/VGAForm.cs
@@ -6,7 +6,6 @@
 using System.ComponentModel;
 using System.Data;
 using System.Drawing;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Windows.Forms;

diff --git a/GameData/City.cs → GameState/City.cs b/GameData/City.cs → GameState/City.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
-namespace OpenCiv1.GameData
+namespace OpenCiv1.GameState
 {
 	public class City
 	{

diff --git a/GameData/GameData.cs → GameState/GameState.cs b/GameData/GameData.cs → GameState/GameState.cs
@@ -1,12 +1,11 @@
 using OpenCiv1.Properties;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
-namespace OpenCiv1.GameData
+namespace OpenCiv1.GameState
 {
-	public class GameData
+	public class GameState
 	{
 		public ushort GameTurnCount = 0;
 		public short Year = 0;
@@ -64,6 +63,5 @@ public class GameData
 		public short PlayerSpaceshipSuccessRate;
 		public short AISpaceshipSuccessRate;
 
-		public GameData() { }
 	}
 }
diff --git a/GameData/Player.cs → GameState/Player.cs b/GameData/Player.cs → GameState/Player.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
-namespace OpenCiv1.GameData
+namespace OpenCiv1.GameState
 {
 	public class Player
 	{

diff --git a/GameData/StrategicLocation.cs → GameState/StrategicLocation.cs b/GameData/StrategicLocation.cs → GameState/StrategicLocation.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
-namespace OpenCiv1.GameData
+namespace OpenCiv1.GameState
 {
 	public class StrategicLocation
 	{

diff --git a/GameData/Unit.cs → GameState/Unit.cs b/GameData/Unit.cs → GameState/Unit.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
-namespace OpenCiv1.GameData
+namespace OpenCiv1.GameState
 {
 	public class Unit
 	{

diff --git a/GameData/UnitDefinition.cs → GameState/UnitDefinition.cs b/GameData/UnitDefinition.cs → GameState/UnitDefinition.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
-namespace OpenCiv1.GameData
+namespace OpenCiv1.GameState
 {
 	public class UnitDefinition
 	{

diff --git a/Helpers/LogWrapper.cs b/Helpers/LogWrapper.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Text;
 
 namespace OpenCiv1

diff --git a/Helpers/StringMatch.cs b/Helpers/StringMatch.cs
@@ -1,7 +1,6 @@
 using Disassembler;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace OpenCiv1

diff --git a/OpenCiv1.cs b/OpenCiv1.cs
@@ -58,7 +58,7 @@ public partial class OpenCiv1
 		private Overlay_17 oOverlay_17;
 		private Overlay_10 oOverlay_10;
 		private Overlay_15 oOverlay_15;
-		private Overlay_16 oOverlay_16;
+		private CivQuiz oOverlay_16;
 		private MSCAPI oMSCAPI;
 		private VGADriver oVGADriver;
 		private NSound oSoundDriver;
@@ -135,7 +135,7 @@ public OpenCiv1()
 			this.oOverlay_17 = new Overlay_17(this);
 			this.oOverlay_10 = new Overlay_10(this);
 			this.oOverlay_15 = new Overlay_15(this);
-			this.oOverlay_16 = new Overlay_16(this);
+			this.oOverlay_16 = new CivQuiz(this);
 			this.oMSCAPI = new MSCAPI(this);
 			this.oVGADriver = new VGADriver(this);
 			this.oSoundDriver = new NSound(this);
@@ -742,7 +742,7 @@ public Overlay_15 Overlay_15
 			get { return this.oOverlay_15; }
 		}
 
-		public Overlay_16 Overlay_16
+		public CivQuiz Overlay_16
 		{
 			get { return this.oOverlay_16; }
 		}

diff --git a/OpenCiv1.csproj b/OpenCiv1.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OpenCiv1</RootNamespace>
     <AssemblyName>OpenCiv1</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -55,12 +55,12 @@
     <Compile Include="Compression\LZW.cs" />
     <Compile Include="Compression\LZWWord.cs" />
     <Compile Include="Compression\RLE.cs" />
-    <Compile Include="GameData\City.cs" />
-    <Compile Include="GameData\Player.cs" />
-    <Compile Include="GameData\GameData.cs" />
-    <Compile Include="GameData\StrategicLocation.cs" />
-    <Compile Include="GameData\Unit.cs" />
-    <Compile Include="GameData\UnitDefinition.cs" />
+    <Compile Include="GameState\City.cs" />
+    <Compile Include="GameState\Player.cs" />
+    <Compile Include="GameState\GameState.cs" />
+    <Compile Include="GameState\StrategicLocation.cs" />
+    <Compile Include="GameState\Unit.cs" />
+    <Compile Include="GameState\UnitDefinition.cs" />
     <Compile Include="OpenCiv1.cs" />
     <Compile Include="Collections\Generic\BDictionary.cs" />
     <Compile Include="Collections\Generic\BHashSet.cs" />
@@ -98,7 +98,7 @@
     <Compile Include="Segments\Overlay_13.cs" />
     <Compile Include="Segments\Overlay_14.cs" />
     <Compile Include="Segments\Overlay_15.cs" />
-    <Compile Include="Segments\Overlay_16.cs" />
+    <Compile Include="Segments\CivQuiz.cs" />
     <Compile Include="Segments\Overlay_17.cs" />
     <Compile Include="Segments\Overlay_18.cs" />
     <Compile Include="Segments\Overlay_19.cs" />

diff --git a/OpenCiv1Globals.cs b/OpenCiv1Globals.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace OpenCiv1

diff --git a/Program.cs b/Program.cs
@@ -1,7 +1,6 @@
 using Disassembler;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading;
 using System.Windows;
 using System.Windows.Forms;
@@ -13,7 +12,7 @@ static class Program
 		/// <summary>
 		/// The main entry point for the application.
 		/// </summary>
-		[MTAThread]
+		[STAThread]
 		static void Main()
 		{
 			OpenCiv1 oGame = null;

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 ## Repository description
-<p>This is a direct re-write of Civilization 1 Game designed by Sid Meier and Bruce Shelley in year 1991.</p>
+<p>This is a direct Source Code re-write of Civilization 1 Game designed by Sid Meier and Bruce Shelley in year 1991.</p>
 <p>The code logic is <b>Based on original DOS CIV I version 475.05</b> disassembly.</p>
 <p>The game is still very popular and easy to play. But the obsoletness of DOS or Windows 16-bit platform 
 and the bugs that have never been fixed are hindering the popularity of the game.<p>
@@ -11,7 +11,7 @@ and the bugs that have never been fixed are hindering the popularity of the game
 If you want to compile the code, it is assumed that:
 <ul>
 <li>You are using VS2022 community version (don't know if this is important).</li>
-<li>You have .NET Framework 3.5 installed.</li>
+<li>You have .NET Framework 4.8 installed.</li>
 <li>You have installed DOS CIV I game at 'c:\dos\civ\'.
 It's where it's home directory resides (Images, palettes, text and save games are loaded/saved there, for now).</li>
 </ul>

diff --git a/Readme.txt b/Readme.txt
@@ -1,6 +1,8 @@
+Alpha Pre-Release
+
 The file OpenCiv1.exe should be copied directly into installed and working DOS Civilization 1 directory.
 The Debug mode can be toggled by pressing Alt + D Key.
 
-The only dependency is .NET Framework 3.5
+The only dependency is .NET Framework 4.8
 
 I hope you enjoy this Alpha Pre-Release!
diff --git a/Segments/Overlay_16.cs → Segments/CivQuiz.cs b/Segments/Overlay_16.cs → Segments/CivQuiz.cs
@@ -2,13 +2,13 @@
 
 namespace OpenCiv1
 {
-	public class Overlay_16
+	public class CivQuiz
 	{
 		private OpenCiv1 oParent;
 		private CPU oCPU;
 		private ushort usSegment = 0;
 
-		public Overlay_16(OpenCiv1 parent)
+		public CivQuiz(OpenCiv1 parent)
 		{
 			this.oParent = parent;
 			this.oCPU = parent.CPU;

diff --git a/Segments/Segment_1238.cs b/Segments/Segment_1238.cs
@@ -570,12 +570,14 @@ public void F0_1238_0092()
 			if (this.oCPU.Flags.NE) goto L0416;
 			this.oCPU.CMPWord(this.oCPU.ReadUInt16(this.oCPU.DS.Word, 0xb220), 0x0);
 			if (this.oCPU.Flags.GE) goto L0416;
+
+			Console.Write("Civilization Quiz");
 			// Call to overlay
-			this.oCPU.PushWord(this.oCPU.CS.Word); // stack management - push return segment
+			/*this.oCPU.PushWord(this.oCPU.CS.Word); // stack management - push return segment
 			this.oCPU.PushWord(0x0416); // stack management - push return offset
 			this.oParent.Overlay_16.F16_0000_0000();
 			this.oCPU.PopDWord(); // stack management - pop return offset and segment
-			this.oCPU.CS.Word = 0x1238; // restore this function segment
+			this.oCPU.CS.Word = 0x1238; // restore this function segment*/
 
 		L0416:
 			this.oCPU.TESTByte(this.oCPU.ReadUInt8(this.oCPU.DS.Word, 0x19c0), 0x2);

diff --git a/app.config b/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-<startup><supportedRuntime version="v2.0.50727"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>