From 78b0cdc40ccee86518fab2ff791e1c553889b220 Mon Sep 17 00:00:00 2001 From: Hugues Valois Date: Tue, 12 Nov 2024 18:10:18 -0800 Subject: [PATCH] Rename the Interpreter project to Engine and adjust all namespaces. --- src/AgiPlayer.sln | 8 +- src/Common/Common.AssemblyInfo.cs | 2 +- src/Directory.Packages.props | 1 - .../Interpreter/KernelUnitTest.cs | 5 +- .../Interpreter/ParserUnitTest.cs | 6 +- .../Interpreter/PriorityTableUnitTest.cs | 4 +- .../Interpreter/ResourceManagerUnitTest.cs | 6 +- .../Interpreter/StringUtilityUnitTest.cs | 4 +- .../Properties/AssemblyInfo.cs | 0 .../Serialization/LzwDecompressUnitTest.cs | 4 +- .../PictureCompressionUnitTest.cs | 4 +- .../Serialization/RleCompressionUnitTest.cs | 4 +- .../Serialization/XorTransformUnitTest.cs | 4 +- .../Woohoo.Agi.Engine.UnitTest.csproj} | 2 +- .../Detection/Database.cs | 4 +- .../Detection/Database.xml | 0 .../Detection/Databases.Designer.cs | 6 +- .../Detection/Databases.resx | 0 .../Detection/DetectByAgiDesignerGameInfo.cs | 4 +- .../Detection/DetectByFileNames.cs | 4 +- .../Detection/DetectByInternalDatabase.cs | 4 +- .../Detection/DetectByWinAgiGameInfo.cs | 4 +- .../Detection/Game.cs | 2 +- .../Detection/GameDetector.cs | 4 +- .../Detection/GameDetectorResult.cs | 2 +- .../Detection/GameFile.cs | 4 +- .../Detection/GameFileCollection.cs | 2 +- .../Detection/GameFinder.cs | 7 +- .../Detection/GameInfoParser.cs | 2 +- .../Detection/IGameDetectorAlgorithm.cs | 4 +- .../Errors.Designer.cs | 6 +- .../Errors.resx | 0 .../GameFolder.cs | 20 +-- .../GameStartInfo.cs | 2 +- .../GameZipArchive.cs | 14 +-- .../IGameContainer.cs | 4 +- .../Interpreter/AgiInterpreter.Kernel.cs | 4 +- .../Interpreter/AgiInterpreter.cs | 8 +- .../Interpreter/Blit.cs | 2 +- .../Interpreter/BorderType.cs | 2 +- .../Interpreter/ClockState.cs | 2 +- .../Interpreter/ComputerType.cs | 2 +- .../Interpreter/ControlEntry.cs | 2 +- .../Interpreter/ControlLine.cs | 2 +- .../Controls/ClassicInputControl.cs | 2 +- .../Interpreter/Controls/GameControl.cs | 2 +- .../Controls/GameSelectionControl.cs | 14 ++- .../Interpreter/Controls/InputBoxControl.cs | 2 +- .../Interpreter/Controls/InputControl.cs | 2 +- .../Interpreter/Controls/InventoryControl.cs | 4 +- .../Controls/InventoryControlItem.cs | 2 +- .../Interpreter/Controls/ListBoxControl.cs | 2 +- .../Interpreter/Controls/MenuControl.cs | 2 +- .../Interpreter/Controls/PopupInputControl.cs | 2 +- .../Interpreter/Controls/PromptControl.cs | 2 +- .../SaveRestoreFolderBrowseControl.cs | 2 +- .../Controls/SaveRestoreGameBrowseControl.cs | 2 +- .../Interpreter/Controls/StatusLineControl.cs | 4 +- .../Interpreter/Controls/TextBoxControl.cs | 2 +- .../Interpreter/Controls/TraceControl.cs | 5 +- .../Controls/WordListInputControl.cs | 2 +- .../Interpreter/CycleMode.cs | 2 +- .../Interpreter/Direction.cs | 2 +- .../Interpreter/DisplayType.cs | 2 +- .../Interpreter/DitheredColor.cs | 2 +- .../Interpreter/EgoControl.cs | 2 +- .../Interpreter/ErrorCodes.cs | 2 +- .../Interpreter/ExecutionException.cs | 2 +- .../Interpreter/ExitException.cs | 2 +- .../Interpreter/Flags.cs | 2 +- .../Interpreter/Font.cs | 2 +- .../Interpreter/FontAmiga8x8.nbf | Bin .../Interpreter/FontAppleIIgs8x8.nbf | Bin .../Interpreter/FontAtariST8x8.nbf | Bin .../Interpreter/FontEga8x8.nbf | Bin .../Interpreter/FontHercules16x16.nbf | Bin .../Interpreter/FontUnknown8x8.nbf | Bin .../Interpreter/GraphicsColor.cs | 2 +- .../Interpreter/GraphicsRenderer.cs | 4 +- .../Interpreter/GraphicsRendererDriver.cs | 2 +- .../GraphicsRendererDriverAmiga1.cs | 4 +- .../GraphicsRendererDriverAmiga2.cs | 4 +- .../GraphicsRendererDriverAmiga3.cs | 4 +- .../GraphicsRendererDriverAppleIIgs.cs | 4 +- .../GraphicsRendererDriverAtariST.cs | 4 +- .../Interpreter/GraphicsRendererDriverCga.cs | 9 +- .../Interpreter/GraphicsRendererDriverCga0.cs | 2 +- .../Interpreter/GraphicsRendererDriverCga1.cs | 2 +- .../Interpreter/GraphicsRendererDriverEga.cs | 4 +- .../Interpreter/GraphicsRendererDriverFull.cs | 6 +- .../GraphicsRendererDriverHercules.cs | 8 +- .../Interpreter/IGraphicsDriver.cs | 2 +- .../Interpreter/IInputDriver.cs | 2 +- .../Interpreter/IKernel.cs | 2 +- .../Interpreter/ISavedGameSerializer.cs | 2 +- .../Interpreter/ISoundDriver.cs | 2 +- .../Interpreter/ISoundPcmDriver.cs | 2 +- .../Interpreter/InputEvent.cs | 2 +- .../Interpreter/InputEventAscii.cs | 2 +- .../Interpreter/InputEventDirection.cs | 2 +- .../Interpreter/InputEventType.cs | 2 +- .../Interpreter/LogicArgumentType.cs | 2 +- .../Interpreter/LogicCommand.cs | 2 +- .../Interpreter/LogicCommandTable.cs | 2 +- .../Interpreter/LogicControlCode.cs | 2 +- .../Interpreter/LogicFunctionCode.cs | 2 +- .../Interpreter/LogicFunctionTable.cs | 2 +- .../Interpreter/LogicInterpreter.cs | 4 +- .../Interpreter/LogicPatch.cs | 2 +- .../Interpreter/LogicPatches.cs | 2 +- .../Interpreter/LogicProcedureCode.cs | 2 +- .../Interpreter/LogicProcedureTable.cs | 2 +- .../Interpreter/LoopUpdate.cs | 2 +- .../Interpreter/Menu.cs | 2 +- .../Interpreter/MenuItem.cs | 2 +- .../Interpreter/MenuParentItem.cs | 2 +- .../Interpreter/MessageState.cs | 2 +- .../Interpreter/Motion.cs | 2 +- .../Interpreter/MouseArea.cs | 2 +- .../Interpreter/MouseAreaPosition.cs | 2 +- .../Interpreter/MouseButton.cs | 2 +- .../Interpreter/MouseDown.cs | 2 +- .../Interpreter/MouseMode.cs | 2 +- .../Interpreter/Palette.cs | 2 +- .../Interpreter/Parser.cs | 4 +- .../Interpreter/ParserResult.cs | 2 +- .../Interpreter/PcmSoundDriver.cs | 2 +- .../Interpreter/PictureBrushPattern.cs | 2 +- .../Interpreter/PictureBrushShape.cs | 2 +- .../Interpreter/PictureBuffer.cs | 4 +- .../Interpreter/PictureCode.cs | 2 +- .../Interpreter/PictureInterpreter.cs | 4 +- .../Interpreter/PicturePoint.cs | 2 +- .../Interpreter/PictureRectangle.cs | 2 +- .../Interpreter/PictureRenderer.cs | 2 +- .../Interpreter/PlayerResources.Designer.cs} | 10 +- .../Interpreter/PlayerResources.resx} | 0 .../Interpreter/Preferences.cs | 2 +- .../Interpreter/PreferencesSerializer.cs | 2 +- .../Interpreter/PriorityTable.cs | 2 +- .../Interpreter/Random.cs | 2 +- .../Interpreter/RenderBuffer.cs | 2 +- .../Interpreter/RenderPoint.cs | 2 +- .../Interpreter/RenderRectangle.cs | 2 +- .../Interpreter/RenderSize.cs | 2 +- .../Interpreter/ResourceManager.cs | 4 +- .../Interpreter/SavedGameManager.cs | 2 +- .../Interpreter/SavedGameXmlSerializer.cs | 4 +- .../Interpreter/ScreenPoint.cs | 2 +- .../Interpreter/ScriptCodes.cs | 2 +- .../Interpreter/ScriptManager.cs | 2 +- .../Interpreter/ShiftDirection.cs | 2 +- .../Interpreter/SoundChannel.cs | 2 +- .../Interpreter/SoundManager.cs | 4 +- .../Interpreter/SoundType.cs | 2 +- .../Interpreter/State.cs | 4 +- .../Interpreter/StringUtility.cs | 2 +- .../Interpreter/TextColor.cs | 2 +- .../Interpreter/TextPosition.cs | 2 +- .../Interpreter/Tone.cs | 2 +- .../Interpreter/ToneChannel.cs | 2 +- .../Interpreter/ToneChannelNoise.cs | 2 +- .../Interpreter/TraceState.cs | 2 +- .../Interpreter/UserInputMode.cs | 2 +- .../Interpreter/UserInterface.cs | 114 +++++++++--------- .../Interpreter/UserInterfaceTheme.cs | 2 +- .../Interpreter/Variables.cs | 2 +- .../Interpreter/ViewObject.cs | 4 +- .../Interpreter/ViewObjectFlags.cs | 2 +- .../Interpreter/ViewObjectManager.cs | 4 +- .../Interpreter/ViewObjectTable.cs | 2 +- .../Interpreter/WalkMode.cs | 2 +- .../Interpreter/WindowManager.cs | 2 +- .../InterpreterMajorVersion.cs | 2 +- .../InterpreterVersion.cs | 2 +- .../Platform.cs | 2 +- .../Properties/AssemblyInfo.cs | 0 .../Resources/InventoryItem.cs | 2 +- .../Resources/InventoryResource.cs | 2 +- .../Resources/LogicResource.cs | 2 +- .../Resources/PictureResource.cs | 2 +- .../Serialization/GameNotFoundException.cs | 2 +- .../Resources/Serialization/IVolumeDecoder.cs | 4 +- .../Serialization/InventoryDecoder.cs | 4 +- .../Resources/Serialization/LogicDecoder.cs | 4 +- .../Resources/Serialization/LzwDecompress.cs | 2 +- .../Serialization/PictureCompression.cs | 2 +- .../Resources/Serialization/PictureDecoder.cs | 4 +- .../Resources/Serialization/ResourceLoader.cs | 4 +- .../Resources/Serialization/RleCompression.cs | 2 +- ...eCompressionInvalidRepeatCountException.cs | 2 +- .../Resources/Serialization/SoundDecoder.cs | 4 +- .../Resources/Serialization/StringDecoder.cs | 2 +- .../Resources/Serialization/ViewDecoder.cs | 4 +- .../Serialization/VocabularyDecoder.cs | 4 +- .../VocabularyInvalidRepeatCountException.cs | 2 +- .../Resources/Serialization/VolumeDecoder.cs | 2 +- ...meDecoderInvalidResourceOffsetException.cs | 2 +- ...ecoderInvalidResourceSignatureException.cs | 2 +- .../Serialization/VolumeDecoderV2.cs | 4 +- .../Serialization/VolumeDecoderV3.cs | 4 +- .../VolumeFilesNotFoundException.cs | 2 +- .../Serialization/VolumeResourceMap.cs | 2 +- .../Serialization/VolumeResourceMapEntry.cs | 2 +- .../VolumeResourceMapEntryCollection.cs | 2 +- .../Resources/Serialization/XorTransform.cs | 2 +- .../Resources/SoundResource.cs | 2 +- .../Resources/ViewCel.cs | 2 +- .../Resources/ViewLoop.cs | 2 +- .../Resources/ViewResource.cs | 2 +- .../Resources/VocabularyResource.cs | 2 +- .../Resources/VocabularyWordFamily.cs | 2 +- .../Woohoo.Agi.Engine.csproj} | 14 +-- .../Interpreter/GameStartInfoComparer.cs | 35 ------ src/Woohoo.Agi.Player/AgiPlayer.cs | 5 +- .../Backend/Sdl/SdlGraphicsDriver.cs | 2 +- .../Backend/Sdl/SdlInputDriver.cs | 2 +- .../Backend/Sdl/SdlPlayer.cs | 2 +- .../Backend/Sdl/SdlSoundChannel.cs | 2 +- .../Backend/Sdl/SdlSoundPcmDriver.cs | 2 +- .../Backend/Sdl2/Sdl2GraphicsDriver.cs | 2 +- .../Backend/Sdl2/Sdl2InputDriver.cs | 2 +- .../Backend/Sdl2/Sdl2Player.cs | 2 +- .../Backend/Sdl2/Sdl2SoundChannel.cs | 2 +- .../Backend/Sdl2/Sdl2SoundPcmDriver.cs | 2 +- .../Woohoo.Agi.Player.csproj | 2 +- 226 files changed, 372 insertions(+), 411 deletions(-) rename src/{Woohoo.Agi.Interpreter.UnitTest => Woohoo.Agi.Engine.UnitTest}/Interpreter/KernelUnitTest.cs (99%) rename src/{Woohoo.Agi.Interpreter.UnitTest => Woohoo.Agi.Engine.UnitTest}/Interpreter/ParserUnitTest.cs (96%) rename src/{Woohoo.Agi.Interpreter.UnitTest => Woohoo.Agi.Engine.UnitTest}/Interpreter/PriorityTableUnitTest.cs (97%) rename src/{Woohoo.Agi.Interpreter.UnitTest => Woohoo.Agi.Engine.UnitTest}/Interpreter/ResourceManagerUnitTest.cs (94%) rename src/{Woohoo.Agi.Interpreter.UnitTest => Woohoo.Agi.Engine.UnitTest}/Interpreter/StringUtilityUnitTest.cs (91%) rename src/{Woohoo.Agi.Interpreter.UnitTest => Woohoo.Agi.Engine.UnitTest}/Properties/AssemblyInfo.cs (100%) rename src/{Woohoo.Agi.Interpreter.UnitTest => Woohoo.Agi.Engine.UnitTest}/Resources/Serialization/LzwDecompressUnitTest.cs (91%) rename src/{Woohoo.Agi.Interpreter.UnitTest => Woohoo.Agi.Engine.UnitTest}/Resources/Serialization/PictureCompressionUnitTest.cs (93%) rename src/{Woohoo.Agi.Interpreter.UnitTest => Woohoo.Agi.Engine.UnitTest}/Resources/Serialization/RleCompressionUnitTest.cs (89%) rename src/{Woohoo.Agi.Interpreter.UnitTest => Woohoo.Agi.Engine.UnitTest}/Resources/Serialization/XorTransformUnitTest.cs (91%) rename src/{Woohoo.Agi.Interpreter.UnitTest/Woohoo.Agi.Interpreter.UnitTest.csproj => Woohoo.Agi.Engine.UnitTest/Woohoo.Agi.Engine.UnitTest.csproj} (94%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/Database.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/Database.xml (100%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/Databases.Designer.cs (94%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/Databases.resx (100%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/DetectByAgiDesignerGameInfo.cs (97%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/DetectByFileNames.cs (97%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/DetectByInternalDatabase.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/DetectByWinAgiGameInfo.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/Game.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/GameDetector.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/GameDetectorResult.cs (97%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/GameFile.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/GameFileCollection.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/GameFinder.cs (93%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/GameInfoParser.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Detection/IGameDetectorAlgorithm.cs (89%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Errors.Designer.cs (94%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Errors.resx (100%) rename src/{Woohoo.Agi.Interpreter/Interpreter => Woohoo.Agi.Engine}/GameFolder.cs (74%) rename src/{Woohoo.Agi.Interpreter/Interpreter => Woohoo.Agi.Engine}/GameStartInfo.cs (98%) rename src/{Woohoo.Agi.Interpreter/Interpreter => Woohoo.Agi.Engine}/GameZipArchive.cs (89%) rename src/{Woohoo.Agi.Interpreter/Interpreter => Woohoo.Agi.Engine}/IGameContainer.cs (89%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/AgiInterpreter.Kernel.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/AgiInterpreter.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Blit.cs (94%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/BorderType.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ClockState.cs (92%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ComputerType.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ControlEntry.cs (93%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ControlLine.cs (94%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/ClassicInputControl.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/GameControl.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/GameSelectionControl.cs (83%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/InputBoxControl.cs (97%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/InputControl.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/InventoryControl.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/InventoryControlItem.cs (94%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/ListBoxControl.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/MenuControl.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/PopupInputControl.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/PromptControl.cs (94%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/SaveRestoreFolderBrowseControl.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/SaveRestoreGameBrowseControl.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/StatusLineControl.cs (97%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/TextBoxControl.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/TraceControl.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Controls/WordListInputControl.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/CycleMode.cs (93%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Direction.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/DisplayType.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/DitheredColor.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/EgoControl.cs (91%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ErrorCodes.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ExecutionException.cs (97%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ExitException.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Flags.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Font.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/FontAmiga8x8.nbf (100%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/FontAppleIIgs8x8.nbf (100%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/FontAtariST8x8.nbf (100%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/FontEga8x8.nbf (100%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/FontHercules16x16.nbf (100%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/FontUnknown8x8.nbf (100%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/GraphicsColor.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/GraphicsRenderer.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/GraphicsRendererDriver.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/GraphicsRendererDriverAmiga1.cs (93%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/GraphicsRendererDriverAmiga2.cs (93%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/GraphicsRendererDriverAmiga3.cs (93%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/GraphicsRendererDriverAppleIIgs.cs (93%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/GraphicsRendererDriverAtariST.cs (93%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/GraphicsRendererDriverCga.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/GraphicsRendererDriverCga0.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/GraphicsRendererDriverCga1.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/GraphicsRendererDriverEga.cs (92%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/GraphicsRendererDriverFull.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/GraphicsRendererDriverHercules.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/IGraphicsDriver.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/IInputDriver.cs (94%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/IKernel.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ISavedGameSerializer.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ISoundDriver.cs (89%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ISoundPcmDriver.cs (92%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/InputEvent.cs (88%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/InputEventAscii.cs (90%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/InputEventDirection.cs (92%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/InputEventType.cs (89%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/LogicArgumentType.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/LogicCommand.cs (93%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/LogicCommandTable.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/LogicControlCode.cs (94%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/LogicFunctionCode.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/LogicFunctionTable.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/LogicInterpreter.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/LogicPatch.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/LogicPatches.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/LogicProcedureCode.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/LogicProcedureTable.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/LoopUpdate.cs (84%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Menu.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/MenuItem.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/MenuParentItem.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/MessageState.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Motion.cs (87%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/MouseArea.cs (93%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/MouseAreaPosition.cs (93%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/MouseButton.cs (88%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/MouseDown.cs (91%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/MouseMode.cs (84%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Palette.cs (86%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Parser.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ParserResult.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/PcmSoundDriver.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/PictureBrushPattern.cs (90%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/PictureBrushShape.cs (90%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/PictureBuffer.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/PictureCode.cs (97%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/PictureInterpreter.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/PicturePoint.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/PictureRectangle.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/PictureRenderer.cs (98%) rename src/{Woohoo.Agi.Interpreter/Interpreter/Resources.Designer.cs => Woohoo.Agi.Engine/Interpreter/PlayerResources.Designer.cs} (98%) rename src/{Woohoo.Agi.Interpreter/Interpreter/Resources.resx => Woohoo.Agi.Engine/Interpreter/PlayerResources.resx} (100%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Preferences.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/PreferencesSerializer.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/PriorityTable.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Random.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/RenderBuffer.cs (92%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/RenderPoint.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/RenderRectangle.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/RenderSize.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ResourceManager.cs (97%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/SavedGameManager.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/SavedGameXmlSerializer.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ScreenPoint.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ScriptCodes.cs (93%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ScriptManager.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ShiftDirection.cs (85%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/SoundChannel.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/SoundManager.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/SoundType.cs (92%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/State.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/StringUtility.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/TextColor.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/TextPosition.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Tone.cs (88%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ToneChannel.cs (94%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ToneChannelNoise.cs (91%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/TraceState.cs (85%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/UserInputMode.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/UserInterface.cs (53%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/UserInterfaceTheme.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/Variables.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ViewObject.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ViewObjectFlags.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ViewObjectManager.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/ViewObjectTable.cs (97%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/WalkMode.cs (91%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Interpreter/WindowManager.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/InterpreterMajorVersion.cs (94%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/InterpreterVersion.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Platform.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Properties/AssemblyInfo.cs (100%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/InventoryItem.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/InventoryResource.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/LogicResource.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/PictureResource.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/GameNotFoundException.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/IVolumeDecoder.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/InventoryDecoder.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/LogicDecoder.cs (97%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/LzwDecompress.cs (99%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/PictureCompression.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/PictureDecoder.cs (88%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/ResourceLoader.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/RleCompression.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/RleCompressionInvalidRepeatCountException.cs (97%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/SoundDecoder.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/StringDecoder.cs (95%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/ViewDecoder.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/VocabularyDecoder.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/VocabularyInvalidRepeatCountException.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/VolumeDecoder.cs (97%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/VolumeDecoderInvalidResourceOffsetException.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/VolumeDecoderInvalidResourceSignatureException.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/VolumeDecoderV2.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/VolumeDecoderV3.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/VolumeFilesNotFoundException.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/VolumeResourceMap.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/VolumeResourceMapEntry.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/VolumeResourceMapEntryCollection.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/Serialization/XorTransform.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/SoundResource.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/ViewCel.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/ViewLoop.cs (96%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/ViewResource.cs (97%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/VocabularyResource.cs (98%) rename src/{Woohoo.Agi.Interpreter => Woohoo.Agi.Engine}/Resources/VocabularyWordFamily.cs (95%) rename src/{Woohoo.Agi.Interpreter/Woohoo.Agi.Interpreter.csproj => Woohoo.Agi.Engine/Woohoo.Agi.Engine.csproj} (81%) delete mode 100644 src/Woohoo.Agi.Interpreter/Interpreter/GameStartInfoComparer.cs diff --git a/src/AgiPlayer.sln b/src/AgiPlayer.sln index dadf2e6..2afa26c 100644 --- a/src/AgiPlayer.sln +++ b/src/AgiPlayer.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31019.35 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35506.116 d17.12 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Woohoo.Agi.Interpreter", "Woohoo.Agi.Interpreter\Woohoo.Agi.Interpreter.csproj", "{BA23E0E2-17B6-40DE-83E7-FA0C3B0F6176}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Woohoo.Agi.Engine", "Woohoo.Agi.Engine\Woohoo.Agi.Engine.csproj", "{BA23E0E2-17B6-40DE-83E7-FA0C3B0F6176}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Woohoo.Agi.Interpreter.UnitTest", "Woohoo.Agi.Interpreter.UnitTest\Woohoo.Agi.Interpreter.UnitTest.csproj", "{885A2FFF-D23E-46FA-B6DD-B172D60F275E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Woohoo.Agi.Engine.UnitTest", "Woohoo.Agi.Engine.UnitTest\Woohoo.Agi.Engine.UnitTest.csproj", "{885A2FFF-D23E-46FA-B6DD-B172D60F275E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Woohoo.Agi.Player", "Woohoo.Agi.Player\Woohoo.Agi.Player.csproj", "{BF1EFBAF-D0C5-48B6-83CF-6E7238D52029}" EndProject diff --git a/src/Common/Common.AssemblyInfo.cs b/src/Common/Common.AssemblyInfo.cs index 8c75f8b..6afaf87 100644 --- a/src/Common/Common.AssemblyInfo.cs +++ b/src/Common/Common.AssemblyInfo.cs @@ -3,7 +3,7 @@ [assembly: AssemblyCompany("Hugues Valois")] [assembly: AssemblyProduct("Agi Player")] -[assembly: AssemblyCopyright("2003-2021")] +[assembly: AssemblyCopyright("2003-2024")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("1.1.0.0")] diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 2429630..3129e02 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -10,7 +10,6 @@ - \ No newline at end of file diff --git a/src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/KernelUnitTest.cs b/src/Woohoo.Agi.Engine.UnitTest/Interpreter/KernelUnitTest.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/KernelUnitTest.cs rename to src/Woohoo.Agi.Engine.UnitTest/Interpreter/KernelUnitTest.cs index ab7e0f9..15a52b6 100644 --- a/src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/KernelUnitTest.cs +++ b/src/Woohoo.Agi.Engine.UnitTest/Interpreter/KernelUnitTest.cs @@ -1,9 +1,10 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.UnitTest; +namespace Woohoo.Agi.Engine.UnitTest.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Interpreter; +using Woohoo.Agi.Engine.Resources; [TestClass] public class KernelUnitTest diff --git a/src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/ParserUnitTest.cs b/src/Woohoo.Agi.Engine.UnitTest/Interpreter/ParserUnitTest.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/ParserUnitTest.cs rename to src/Woohoo.Agi.Engine.UnitTest/Interpreter/ParserUnitTest.cs index c5259cc..f6e4c7f 100644 --- a/src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/ParserUnitTest.cs +++ b/src/Woohoo.Agi.Engine.UnitTest/Interpreter/ParserUnitTest.cs @@ -1,10 +1,10 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.UnitTest; +namespace Woohoo.Agi.Engine.UnitTest.Interpreter; -using Woohoo.Agi.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Interpreter; +using Woohoo.Agi.Engine.Resources; [TestClass] public class ParserUnitTest diff --git a/src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/PriorityTableUnitTest.cs b/src/Woohoo.Agi.Engine.UnitTest/Interpreter/PriorityTableUnitTest.cs similarity index 97% rename from src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/PriorityTableUnitTest.cs rename to src/Woohoo.Agi.Engine.UnitTest/Interpreter/PriorityTableUnitTest.cs index b177fbf..82b7de7 100644 --- a/src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/PriorityTableUnitTest.cs +++ b/src/Woohoo.Agi.Engine.UnitTest/Interpreter/PriorityTableUnitTest.cs @@ -1,9 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.UnitTest; +namespace Woohoo.Agi.Engine.UnitTest.Interpreter; -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine.Interpreter; [TestClass] public class PriorityTableUnitTest diff --git a/src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/ResourceManagerUnitTest.cs b/src/Woohoo.Agi.Engine.UnitTest/Interpreter/ResourceManagerUnitTest.cs similarity index 94% rename from src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/ResourceManagerUnitTest.cs rename to src/Woohoo.Agi.Engine.UnitTest/Interpreter/ResourceManagerUnitTest.cs index 2f932c4..4269826 100644 --- a/src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/ResourceManagerUnitTest.cs +++ b/src/Woohoo.Agi.Engine.UnitTest/Interpreter/ResourceManagerUnitTest.cs @@ -1,10 +1,10 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.UnitTest; +namespace Woohoo.Agi.Engine.UnitTest.Interpreter; -using Woohoo.Agi.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Interpreter; +using Woohoo.Agi.Engine.Resources; [TestClass] public class ResourceManagerUnitTest diff --git a/src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/StringUtilityUnitTest.cs b/src/Woohoo.Agi.Engine.UnitTest/Interpreter/StringUtilityUnitTest.cs similarity index 91% rename from src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/StringUtilityUnitTest.cs rename to src/Woohoo.Agi.Engine.UnitTest/Interpreter/StringUtilityUnitTest.cs index b9d7734..ee47c64 100644 --- a/src/Woohoo.Agi.Interpreter.UnitTest/Interpreter/StringUtilityUnitTest.cs +++ b/src/Woohoo.Agi.Engine.UnitTest/Interpreter/StringUtilityUnitTest.cs @@ -1,9 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.UnitTest; +namespace Woohoo.Agi.Engine.UnitTest.Interpreter; -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine.Interpreter; [TestClass] public class StringUtilityUnitTest diff --git a/src/Woohoo.Agi.Interpreter.UnitTest/Properties/AssemblyInfo.cs b/src/Woohoo.Agi.Engine.UnitTest/Properties/AssemblyInfo.cs similarity index 100% rename from src/Woohoo.Agi.Interpreter.UnitTest/Properties/AssemblyInfo.cs rename to src/Woohoo.Agi.Engine.UnitTest/Properties/AssemblyInfo.cs diff --git a/src/Woohoo.Agi.Interpreter.UnitTest/Resources/Serialization/LzwDecompressUnitTest.cs b/src/Woohoo.Agi.Engine.UnitTest/Resources/Serialization/LzwDecompressUnitTest.cs similarity index 91% rename from src/Woohoo.Agi.Interpreter.UnitTest/Resources/Serialization/LzwDecompressUnitTest.cs rename to src/Woohoo.Agi.Engine.UnitTest/Resources/Serialization/LzwDecompressUnitTest.cs index 9998a1e..a5c94e8 100644 --- a/src/Woohoo.Agi.Interpreter.UnitTest/Resources/Serialization/LzwDecompressUnitTest.cs +++ b/src/Woohoo.Agi.Engine.UnitTest/Resources/Serialization/LzwDecompressUnitTest.cs @@ -1,7 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Resources.Serialization.UnitTest; +namespace Woohoo.Agi.Engine.UnitTest.Resources.Serialization; + +using Woohoo.Agi.Engine.Resources.Serialization; [TestClass] public class LzwDecompressUnitTest diff --git a/src/Woohoo.Agi.Interpreter.UnitTest/Resources/Serialization/PictureCompressionUnitTest.cs b/src/Woohoo.Agi.Engine.UnitTest/Resources/Serialization/PictureCompressionUnitTest.cs similarity index 93% rename from src/Woohoo.Agi.Interpreter.UnitTest/Resources/Serialization/PictureCompressionUnitTest.cs rename to src/Woohoo.Agi.Engine.UnitTest/Resources/Serialization/PictureCompressionUnitTest.cs index 8175b0d..6d43e5b 100644 --- a/src/Woohoo.Agi.Interpreter.UnitTest/Resources/Serialization/PictureCompressionUnitTest.cs +++ b/src/Woohoo.Agi.Engine.UnitTest/Resources/Serialization/PictureCompressionUnitTest.cs @@ -1,9 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Resources.Serialization.UnitTest; +namespace Woohoo.Agi.Engine.UnitTest.Resources.Serialization; -using Woohoo.Agi.Resources.Serialization; +using Woohoo.Agi.Engine.Resources.Serialization; [TestClass] public class PictureCompressionUnitTest diff --git a/src/Woohoo.Agi.Interpreter.UnitTest/Resources/Serialization/RleCompressionUnitTest.cs b/src/Woohoo.Agi.Engine.UnitTest/Resources/Serialization/RleCompressionUnitTest.cs similarity index 89% rename from src/Woohoo.Agi.Interpreter.UnitTest/Resources/Serialization/RleCompressionUnitTest.cs rename to src/Woohoo.Agi.Engine.UnitTest/Resources/Serialization/RleCompressionUnitTest.cs index 5f770e1..a28965c 100644 --- a/src/Woohoo.Agi.Interpreter.UnitTest/Resources/Serialization/RleCompressionUnitTest.cs +++ b/src/Woohoo.Agi.Engine.UnitTest/Resources/Serialization/RleCompressionUnitTest.cs @@ -1,7 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Resources.Serialization.UnitTest; +namespace Woohoo.Agi.Engine.UnitTest.Resources.Serialization; + +using Woohoo.Agi.Engine.Resources.Serialization; [TestClass] public class RleCompressionUnitTest diff --git a/src/Woohoo.Agi.Interpreter.UnitTest/Resources/Serialization/XorTransformUnitTest.cs b/src/Woohoo.Agi.Engine.UnitTest/Resources/Serialization/XorTransformUnitTest.cs similarity index 91% rename from src/Woohoo.Agi.Interpreter.UnitTest/Resources/Serialization/XorTransformUnitTest.cs rename to src/Woohoo.Agi.Engine.UnitTest/Resources/Serialization/XorTransformUnitTest.cs index 502c5d9..30a308a 100644 --- a/src/Woohoo.Agi.Interpreter.UnitTest/Resources/Serialization/XorTransformUnitTest.cs +++ b/src/Woohoo.Agi.Engine.UnitTest/Resources/Serialization/XorTransformUnitTest.cs @@ -1,7 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Resources.Serialization.UnitTest; +namespace Woohoo.Agi.Engine.UnitTest.Resources.Serialization; + +using Woohoo.Agi.Engine.Resources.Serialization; [TestClass] public class XorTransformUnitTest diff --git a/src/Woohoo.Agi.Interpreter.UnitTest/Woohoo.Agi.Interpreter.UnitTest.csproj b/src/Woohoo.Agi.Engine.UnitTest/Woohoo.Agi.Engine.UnitTest.csproj similarity index 94% rename from src/Woohoo.Agi.Interpreter.UnitTest/Woohoo.Agi.Interpreter.UnitTest.csproj rename to src/Woohoo.Agi.Engine.UnitTest/Woohoo.Agi.Engine.UnitTest.csproj index a50d60e..84bf025 100644 --- a/src/Woohoo.Agi.Interpreter.UnitTest/Woohoo.Agi.Interpreter.UnitTest.csproj +++ b/src/Woohoo.Agi.Engine.UnitTest/Woohoo.Agi.Engine.UnitTest.csproj @@ -40,7 +40,7 @@ - + diff --git a/src/Woohoo.Agi.Interpreter/Detection/Database.cs b/src/Woohoo.Agi.Engine/Detection/Database.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Detection/Database.cs rename to src/Woohoo.Agi.Engine/Detection/Database.cs index 542723f..edcefe2 100644 --- a/src/Woohoo.Agi.Interpreter/Detection/Database.cs +++ b/src/Woohoo.Agi.Engine/Detection/Database.cs @@ -3,9 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Detection; - -using Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Detection; /// /// Game library database. diff --git a/src/Woohoo.Agi.Interpreter/Detection/Database.xml b/src/Woohoo.Agi.Engine/Detection/Database.xml similarity index 100% rename from src/Woohoo.Agi.Interpreter/Detection/Database.xml rename to src/Woohoo.Agi.Engine/Detection/Database.xml diff --git a/src/Woohoo.Agi.Interpreter/Detection/Databases.Designer.cs b/src/Woohoo.Agi.Engine/Detection/Databases.Designer.cs similarity index 94% rename from src/Woohoo.Agi.Interpreter/Detection/Databases.Designer.cs rename to src/Woohoo.Agi.Engine/Detection/Databases.Designer.cs index 8c9fa0a..40aaa85 100644 --- a/src/Woohoo.Agi.Interpreter/Detection/Databases.Designer.cs +++ b/src/Woohoo.Agi.Engine/Detection/Databases.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Woohoo.Agi.Detection { +namespace Woohoo.Agi.Engine.Detection { using System; @@ -19,7 +19,7 @@ namespace Woohoo.Agi.Detection { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Databases { @@ -39,7 +39,7 @@ internal Databases() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Woohoo.Agi.Interpreter.Detection.Databases", typeof(Databases).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Woohoo.Agi.Engine.Detection.Databases", typeof(Databases).Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/Woohoo.Agi.Interpreter/Detection/Databases.resx b/src/Woohoo.Agi.Engine/Detection/Databases.resx similarity index 100% rename from src/Woohoo.Agi.Interpreter/Detection/Databases.resx rename to src/Woohoo.Agi.Engine/Detection/Databases.resx diff --git a/src/Woohoo.Agi.Interpreter/Detection/DetectByAgiDesignerGameInfo.cs b/src/Woohoo.Agi.Engine/Detection/DetectByAgiDesignerGameInfo.cs similarity index 97% rename from src/Woohoo.Agi.Interpreter/Detection/DetectByAgiDesignerGameInfo.cs rename to src/Woohoo.Agi.Engine/Detection/DetectByAgiDesignerGameInfo.cs index ac8fcb5..aebda85 100644 --- a/src/Woohoo.Agi.Interpreter/Detection/DetectByAgiDesignerGameInfo.cs +++ b/src/Woohoo.Agi.Engine/Detection/DetectByAgiDesignerGameInfo.cs @@ -3,9 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Detection; - -using Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Detection; /// /// Game detection algorithm which uses an XML game information file diff --git a/src/Woohoo.Agi.Interpreter/Detection/DetectByFileNames.cs b/src/Woohoo.Agi.Engine/Detection/DetectByFileNames.cs similarity index 97% rename from src/Woohoo.Agi.Interpreter/Detection/DetectByFileNames.cs rename to src/Woohoo.Agi.Engine/Detection/DetectByFileNames.cs index 0f2437f..74a0e8b 100644 --- a/src/Woohoo.Agi.Interpreter/Detection/DetectByFileNames.cs +++ b/src/Woohoo.Agi.Engine/Detection/DetectByFileNames.cs @@ -3,9 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Detection; - -using Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Detection; /// /// Game detection algorithm which uses the file names only. diff --git a/src/Woohoo.Agi.Interpreter/Detection/DetectByInternalDatabase.cs b/src/Woohoo.Agi.Engine/Detection/DetectByInternalDatabase.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Detection/DetectByInternalDatabase.cs rename to src/Woohoo.Agi.Engine/Detection/DetectByInternalDatabase.cs index 05d4e10..2376650 100644 --- a/src/Woohoo.Agi.Interpreter/Detection/DetectByInternalDatabase.cs +++ b/src/Woohoo.Agi.Engine/Detection/DetectByInternalDatabase.cs @@ -3,9 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Detection; - -using Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Detection; /// /// Game detection algorithm which uses MD5 checksum to identify diff --git a/src/Woohoo.Agi.Interpreter/Detection/DetectByWinAgiGameInfo.cs b/src/Woohoo.Agi.Engine/Detection/DetectByWinAgiGameInfo.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Detection/DetectByWinAgiGameInfo.cs rename to src/Woohoo.Agi.Engine/Detection/DetectByWinAgiGameInfo.cs index faea662..ab39f68 100644 --- a/src/Woohoo.Agi.Interpreter/Detection/DetectByWinAgiGameInfo.cs +++ b/src/Woohoo.Agi.Engine/Detection/DetectByWinAgiGameInfo.cs @@ -3,9 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Detection; - -using Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Detection; /// /// Game detection algorithm which uses a text file diff --git a/src/Woohoo.Agi.Interpreter/Detection/Game.cs b/src/Woohoo.Agi.Engine/Detection/Game.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Detection/Game.cs rename to src/Woohoo.Agi.Engine/Detection/Game.cs index 642ae26..8a9816a 100644 --- a/src/Woohoo.Agi.Interpreter/Detection/Game.cs +++ b/src/Woohoo.Agi.Engine/Detection/Game.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Detection; +namespace Woohoo.Agi.Engine.Detection; /// /// Game information. diff --git a/src/Woohoo.Agi.Interpreter/Detection/GameDetector.cs b/src/Woohoo.Agi.Engine/Detection/GameDetector.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Detection/GameDetector.cs rename to src/Woohoo.Agi.Engine/Detection/GameDetector.cs index b5a5075..01668e3 100644 --- a/src/Woohoo.Agi.Interpreter/Detection/GameDetector.cs +++ b/src/Woohoo.Agi.Engine/Detection/GameDetector.cs @@ -3,9 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Detection; - -using Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Detection; /// /// Game detection. diff --git a/src/Woohoo.Agi.Interpreter/Detection/GameDetectorResult.cs b/src/Woohoo.Agi.Engine/Detection/GameDetectorResult.cs similarity index 97% rename from src/Woohoo.Agi.Interpreter/Detection/GameDetectorResult.cs rename to src/Woohoo.Agi.Engine/Detection/GameDetectorResult.cs index 50ab05f..533bb47 100644 --- a/src/Woohoo.Agi.Interpreter/Detection/GameDetectorResult.cs +++ b/src/Woohoo.Agi.Engine/Detection/GameDetectorResult.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Detection; +namespace Woohoo.Agi.Engine.Detection; /// /// Result from game detection. diff --git a/src/Woohoo.Agi.Interpreter/Detection/GameFile.cs b/src/Woohoo.Agi.Engine/Detection/GameFile.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Detection/GameFile.cs rename to src/Woohoo.Agi.Engine/Detection/GameFile.cs index dcc7d83..1395866 100644 --- a/src/Woohoo.Agi.Interpreter/Detection/GameFile.cs +++ b/src/Woohoo.Agi.Engine/Detection/GameFile.cs @@ -3,9 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Detection; - -using Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Detection; /// /// CRC file information. diff --git a/src/Woohoo.Agi.Interpreter/Detection/GameFileCollection.cs b/src/Woohoo.Agi.Engine/Detection/GameFileCollection.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Detection/GameFileCollection.cs rename to src/Woohoo.Agi.Engine/Detection/GameFileCollection.cs index d7cb194..f8dae81 100644 --- a/src/Woohoo.Agi.Interpreter/Detection/GameFileCollection.cs +++ b/src/Woohoo.Agi.Engine/Detection/GameFileCollection.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Detection; +namespace Woohoo.Agi.Engine.Detection; /// /// Collection of FileCrc objects. diff --git a/src/Woohoo.Agi.Interpreter/Detection/GameFinder.cs b/src/Woohoo.Agi.Engine/Detection/GameFinder.cs similarity index 93% rename from src/Woohoo.Agi.Interpreter/Detection/GameFinder.cs rename to src/Woohoo.Agi.Engine/Detection/GameFinder.cs index 1addf84..8ad9fbe 100644 --- a/src/Woohoo.Agi.Interpreter/Detection/GameFinder.cs +++ b/src/Woohoo.Agi.Engine/Detection/GameFinder.cs @@ -3,10 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Detection; - -using Woohoo.Agi.Interpreter; -using Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Detection; public class GameFinder { @@ -64,7 +61,7 @@ public static GameStartInfo[] FindGames(GameDetector detector, string folder, bo var result = detector.Detect(container); if (result is not null) { - string id = ResourceLoader.GetGameId(container); + string id = container.GetGameId(); startInfo = new GameStartInfo(container, id, result.Platform, result.Interpreter, result.Name ?? string.Empty, result.Version ?? string.Empty); } diff --git a/src/Woohoo.Agi.Interpreter/Detection/GameInfoParser.cs b/src/Woohoo.Agi.Engine/Detection/GameInfoParser.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Detection/GameInfoParser.cs rename to src/Woohoo.Agi.Engine/Detection/GameInfoParser.cs index 01a1b99..91b5af8 100644 --- a/src/Woohoo.Agi.Interpreter/Detection/GameInfoParser.cs +++ b/src/Woohoo.Agi.Engine/Detection/GameInfoParser.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Detection; +namespace Woohoo.Agi.Engine.Detection; internal static class GameInfoParser { diff --git a/src/Woohoo.Agi.Interpreter/Detection/IGameDetectorAlgorithm.cs b/src/Woohoo.Agi.Engine/Detection/IGameDetectorAlgorithm.cs similarity index 89% rename from src/Woohoo.Agi.Interpreter/Detection/IGameDetectorAlgorithm.cs rename to src/Woohoo.Agi.Engine/Detection/IGameDetectorAlgorithm.cs index 000e6b5..f7e6ee5 100644 --- a/src/Woohoo.Agi.Interpreter/Detection/IGameDetectorAlgorithm.cs +++ b/src/Woohoo.Agi.Engine/Detection/IGameDetectorAlgorithm.cs @@ -3,9 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Detection; - -using Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Detection; /// /// Game detection algorithm interface. diff --git a/src/Woohoo.Agi.Interpreter/Errors.Designer.cs b/src/Woohoo.Agi.Engine/Errors.Designer.cs similarity index 94% rename from src/Woohoo.Agi.Interpreter/Errors.Designer.cs rename to src/Woohoo.Agi.Engine/Errors.Designer.cs index 19cf041..ffe412b 100644 --- a/src/Woohoo.Agi.Interpreter/Errors.Designer.cs +++ b/src/Woohoo.Agi.Engine/Errors.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Woohoo.Agi.Interpreter { +namespace Woohoo.Agi.Engine { using System; @@ -19,7 +19,7 @@ namespace Woohoo.Agi.Interpreter { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Errors { @@ -39,7 +39,7 @@ internal Errors() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Woohoo.Agi.Interpreter.Errors", typeof(Errors).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Woohoo.Agi.Engine.Errors", typeof(Errors).Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/Woohoo.Agi.Interpreter/Errors.resx b/src/Woohoo.Agi.Engine/Errors.resx similarity index 100% rename from src/Woohoo.Agi.Interpreter/Errors.resx rename to src/Woohoo.Agi.Engine/Errors.resx diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GameFolder.cs b/src/Woohoo.Agi.Engine/GameFolder.cs similarity index 74% rename from src/Woohoo.Agi.Interpreter/Interpreter/GameFolder.cs rename to src/Woohoo.Agi.Engine/GameFolder.cs index 5d4f4c2..396f8be 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GameFolder.cs +++ b/src/Woohoo.Agi.Engine/GameFolder.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine; -public sealed class GameFolder : IGameContainer +internal sealed class GameFolder : IGameContainer { private readonly string folderPath; @@ -28,12 +28,12 @@ public bool Exists(string file) public string GetGameId() { - string id = string.Empty; + var id = string.Empty; - string[] files = Directory.GetFiles(this.folderPath, "*vol.0"); + var files = Directory.GetFiles(this.folderPath, "*vol.0"); if (files.Length > 0) { - string name = Path.GetFileNameWithoutExtension(files[0]); + var name = Path.GetFileNameWithoutExtension(files[0]); if (name.Length >= 3 && name.EndsWith("vol", StringComparison.InvariantCultureIgnoreCase)) { id = name[..^3]; @@ -58,13 +58,13 @@ public string[] GetGameFiles() ]; // Get the list of files to include - foreach (string pattern in includePatterns) + foreach (var pattern in includePatterns) { - string[] files = Directory.GetFiles(this.folderPath, pattern, SearchOption.TopDirectoryOnly); - foreach (string file in files) + var files = Directory.GetFiles(this.folderPath, pattern, SearchOption.TopDirectoryOnly); + foreach (var file in files) { // File name only, no path - string filename = Path.GetFileName(file).ToUpper(CultureInfo.InvariantCulture); + var filename = Path.GetFileName(file).ToUpper(CultureInfo.InvariantCulture); // Put the file in the dictionary, this ensures the file is present only once filesTable[filename] = Path.GetFileName(file); @@ -72,7 +72,7 @@ public string[] GetGameFiles() } var gameFiles = new List(); - foreach (string gameFile in filesTable.Values) + foreach (var gameFile in filesTable.Values) { gameFiles.Add(gameFile); } diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GameStartInfo.cs b/src/Woohoo.Agi.Engine/GameStartInfo.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/GameStartInfo.cs rename to src/Woohoo.Agi.Engine/GameStartInfo.cs index 4d8c816..a9b5126 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GameStartInfo.cs +++ b/src/Woohoo.Agi.Engine/GameStartInfo.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine; /// /// Game start information. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GameZipArchive.cs b/src/Woohoo.Agi.Engine/GameZipArchive.cs similarity index 89% rename from src/Woohoo.Agi.Interpreter/Interpreter/GameZipArchive.cs rename to src/Woohoo.Agi.Engine/GameZipArchive.cs index 562fb46..c10cab2 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GameZipArchive.cs +++ b/src/Woohoo.Agi.Engine/GameZipArchive.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine; using System.IO.Compression; @@ -27,7 +27,7 @@ public byte[] Read(string file) var entry = this.GetEntryOrdinalIgnoreCase(file); if (entry is not null) { - using (Stream stream = entry.Open()) + using (var stream = entry.Open()) { data = new byte[entry.Length]; stream.ReadExactly(data, 0, data.Length); @@ -44,14 +44,14 @@ public bool Exists(string file) public string GetGameId() { - string id = string.Empty; + var id = string.Empty; foreach (var entry in this.archive.Entries) { if (entry.Length > 0) { - string fileName = Path.GetFileNameWithoutExtension(entry.Name); - string ext = Path.GetExtension(entry.Name); + var fileName = Path.GetFileNameWithoutExtension(entry.Name); + var ext = Path.GetExtension(entry.Name); if (fileName.EndsWith("vol", StringComparison.OrdinalIgnoreCase) && ext == ".0" && fileName.Length > 3) { @@ -84,8 +84,8 @@ public string[] GetGameFiles() } else { - string fileName = Path.GetFileNameWithoutExtension(entry.Name); - string ext = Path.GetExtension(entry.Name); + var fileName = Path.GetFileNameWithoutExtension(entry.Name); + var ext = Path.GetExtension(entry.Name); if (fileName.EndsWith("vol", StringComparison.OrdinalIgnoreCase) && int.TryParse(ext[1..], out _)) { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/IGameContainer.cs b/src/Woohoo.Agi.Engine/IGameContainer.cs similarity index 89% rename from src/Woohoo.Agi.Interpreter/Interpreter/IGameContainer.cs rename to src/Woohoo.Agi.Engine/IGameContainer.cs index 6b0d750..74c639a 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/IGameContainer.cs +++ b/src/Woohoo.Agi.Engine/IGameContainer.cs @@ -1,7 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +#nullable enable + +namespace Woohoo.Agi.Engine; public interface IGameContainer { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/AgiInterpreter.Kernel.cs b/src/Woohoo.Agi.Engine/Interpreter/AgiInterpreter.Kernel.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/AgiInterpreter.Kernel.cs rename to src/Woohoo.Agi.Engine/Interpreter/AgiInterpreter.Kernel.cs index 90e770a..c2c1b92 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/AgiInterpreter.Kernel.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/AgiInterpreter.Kernel.cs @@ -1,9 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; public partial class AgiInterpreter : IKernel { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/AgiInterpreter.cs b/src/Woohoo.Agi.Engine/Interpreter/AgiInterpreter.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/AgiInterpreter.cs rename to src/Woohoo.Agi.Engine/Interpreter/AgiInterpreter.cs index 01c5cbb..48b8a3d 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/AgiInterpreter.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/AgiInterpreter.cs @@ -1,11 +1,11 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Interpreter.Controls; -using Woohoo.Agi.Resources; -using Woohoo.Agi.Resources.Serialization; +using Woohoo.Agi.Engine.Interpreter.Controls; +using Woohoo.Agi.Engine.Resources; +using Woohoo.Agi.Engine.Resources.Serialization; public sealed partial class AgiInterpreter { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Blit.cs b/src/Woohoo.Agi.Engine/Interpreter/Blit.cs similarity index 94% rename from src/Woohoo.Agi.Interpreter/Interpreter/Blit.cs rename to src/Woohoo.Agi.Engine/Interpreter/Blit.cs index 0c6b88a..9306cd6 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Blit.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Blit.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class Blit { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/BorderType.cs b/src/Woohoo.Agi.Engine/Interpreter/BorderType.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/BorderType.cs rename to src/Woohoo.Agi.Engine/Interpreter/BorderType.cs index fbd0c7d..3a18531 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/BorderType.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/BorderType.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Constants for the object border state variable. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ClockState.cs b/src/Woohoo.Agi.Engine/Interpreter/ClockState.cs similarity index 92% rename from src/Woohoo.Agi.Interpreter/Interpreter/ClockState.cs rename to src/Woohoo.Agi.Engine/Interpreter/ClockState.cs index e56112b..b121bdd 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ClockState.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ClockState.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// State of the internal clock. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ComputerType.cs b/src/Woohoo.Agi.Engine/Interpreter/ComputerType.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/ComputerType.cs rename to src/Woohoo.Agi.Engine/Interpreter/ComputerType.cs index ea0b5db..59579c1 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ComputerType.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ComputerType.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Computer hardware constants used by the ComputerType state variable. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ControlEntry.cs b/src/Woohoo.Agi.Engine/Interpreter/ControlEntry.cs similarity index 93% rename from src/Woohoo.Agi.Interpreter/Interpreter/ControlEntry.cs rename to src/Woohoo.Agi.Engine/Interpreter/ControlEntry.cs index c5b6174..7dd10cf 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ControlEntry.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ControlEntry.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Mapping of a key and a controller. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ControlLine.cs b/src/Woohoo.Agi.Engine/Interpreter/ControlLine.cs similarity index 94% rename from src/Woohoo.Agi.Interpreter/Interpreter/ControlLine.cs rename to src/Woohoo.Agi.Engine/Interpreter/ControlLine.cs index 53d84f3..129e593 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ControlLine.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ControlLine.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Control line enumeration. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/ClassicInputControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/ClassicInputControl.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/ClassicInputControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/ClassicInputControl.cs index b718437..a585574 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/ClassicInputControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/ClassicInputControl.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; public class ClassicInputControl : InputControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/GameControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/GameControl.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/GameControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/GameControl.cs index 8c6a25f..54921c4 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/GameControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/GameControl.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; public class GameControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/GameSelectionControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/GameSelectionControl.cs similarity index 83% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/GameSelectionControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/GameSelectionControl.cs index aadf58c..c3f58a3 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/GameSelectionControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/GameSelectionControl.cs @@ -1,7 +1,11 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +#nullable enable + +namespace Woohoo.Agi.Engine.Interpreter.Controls; + +using Woohoo.Agi.Engine; public class GameSelectionControl { @@ -19,9 +23,9 @@ public GameSelectionControl(AgiInterpreter interpreter) protected IInputDriver InputDriver => this.Interpreter.InputDriver; - public GameStartInfo DoModal(GameStartInfo[] startInfos) + public GameStartInfo? DoModal(GameStartInfo[] startInfos) { - GameStartInfo gameInfo = null; + GameStartInfo? gameInfo = null; this.WindowManager.InitializeText(); @@ -32,7 +36,7 @@ public GameStartInfo DoModal(GameStartInfo[] startInfos) if (startInfos.Length > 0) { - Array.Sort(startInfos, new GameStartInfoComparer()); + Array.Sort(startInfos, (x, y) => (x.Name + x.Version).CompareTo(y.Name + y.Version)); gameInfo = this.SelectGame(startInfos); } @@ -46,7 +50,7 @@ public GameStartInfo DoModal(GameStartInfo[] startInfos) return gameInfo; } - private GameStartInfo SelectGame(GameStartInfo[] startInfos) + private GameStartInfo? SelectGame(GameStartInfo[] startInfos) { var items = new List(); diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/InputBoxControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/InputBoxControl.cs similarity index 97% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/InputBoxControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/InputBoxControl.cs index 706f57e..f83a655 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/InputBoxControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/InputBoxControl.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; public class InputBoxControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/InputControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/InputControl.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/InputControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/InputControl.cs index a4f8d7a..769b4ed 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/InputControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/InputControl.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; public abstract class InputControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/InventoryControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/InventoryControl.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/InventoryControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/InventoryControl.cs index 3ced29d..fee5072 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/InventoryControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/InventoryControl.cs @@ -1,9 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; public class InventoryControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/InventoryControlItem.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/InventoryControlItem.cs similarity index 94% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/InventoryControlItem.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/InventoryControlItem.cs index f6df8e5..72328ec 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/InventoryControlItem.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/InventoryControlItem.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; /// /// Inventory item in the inventory screen. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/ListBoxControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/ListBoxControl.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/ListBoxControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/ListBoxControl.cs index 1f872a1..1a24cfc 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/ListBoxControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/ListBoxControl.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; public class ListBoxControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/MenuControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/MenuControl.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/MenuControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/MenuControl.cs index c05e0b9..d2fd094 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/MenuControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/MenuControl.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; public class MenuControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/PopupInputControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/PopupInputControl.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/PopupInputControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/PopupInputControl.cs index 057464b..e301591 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/PopupInputControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/PopupInputControl.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; public class PopupInputControl : InputControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/PromptControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/PromptControl.cs similarity index 94% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/PromptControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/PromptControl.cs index e58c71d..6d830bf 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/PromptControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/PromptControl.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; public class PromptControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/SaveRestoreFolderBrowseControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/SaveRestoreFolderBrowseControl.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/SaveRestoreFolderBrowseControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/SaveRestoreFolderBrowseControl.cs index 43470c9..6eeea34 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/SaveRestoreFolderBrowseControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/SaveRestoreFolderBrowseControl.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; public class SaveRestoreFolderBrowseControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/SaveRestoreGameBrowseControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/SaveRestoreGameBrowseControl.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/SaveRestoreGameBrowseControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/SaveRestoreGameBrowseControl.cs index 8ed9e5f..c8847d7 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/SaveRestoreGameBrowseControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/SaveRestoreGameBrowseControl.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; public class SaveRestoreGameBrowseControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/StatusLineControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/StatusLineControl.cs similarity index 97% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/StatusLineControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/StatusLineControl.cs index 92e3c8c..228bf2b 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/StatusLineControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/StatusLineControl.cs @@ -1,7 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; + +using Woohoo.Agi.Engine; public class StatusLineControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/TextBoxControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/TextBoxControl.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/TextBoxControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/TextBoxControl.cs index 3d467d1..03348f5 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/TextBoxControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/TextBoxControl.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; public class TextBoxControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/TraceControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/TraceControl.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/TraceControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/TraceControl.cs index 1ba2a71..c0a990c 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/TraceControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/TraceControl.cs @@ -1,9 +1,10 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Interpreter; +using Woohoo.Agi.Engine.Resources; public class TraceControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/WordListInputControl.cs b/src/Woohoo.Agi.Engine/Interpreter/Controls/WordListInputControl.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/Controls/WordListInputControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/Controls/WordListInputControl.cs index c0c3a71..1e26c5e 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Controls/WordListInputControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Controls/WordListInputControl.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter.Controls; +namespace Woohoo.Agi.Engine.Interpreter.Controls; public class WordListInputControl : ClassicInputControl { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/CycleMode.cs b/src/Woohoo.Agi.Engine/Interpreter/CycleMode.cs similarity index 93% rename from src/Woohoo.Agi.Interpreter/Interpreter/CycleMode.cs rename to src/Woohoo.Agi.Engine/Interpreter/CycleMode.cs index 1e42778..56b1ccd 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/CycleMode.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/CycleMode.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// View cycling mode. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Direction.cs b/src/Woohoo.Agi.Engine/Interpreter/Direction.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/Direction.cs rename to src/Woohoo.Agi.Engine/Interpreter/Direction.cs index e9455a8..6a96803 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Direction.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Direction.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Direction in which a view is moving. Used for the state variable diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/DisplayType.cs b/src/Woohoo.Agi.Engine/Interpreter/DisplayType.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/DisplayType.cs rename to src/Woohoo.Agi.Engine/Interpreter/DisplayType.cs index 155637b..295e2a3 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/DisplayType.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/DisplayType.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Display hardware type used by the DisplayType state variable. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/DitheredColor.cs b/src/Woohoo.Agi.Engine/Interpreter/DitheredColor.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/DitheredColor.cs rename to src/Woohoo.Agi.Engine/Interpreter/DitheredColor.cs index 62722f6..001436f 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/DitheredColor.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/DitheredColor.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// A dithered AGI pixel is made of 2 pixels of 2 different colors. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/EgoControl.cs b/src/Woohoo.Agi.Engine/Interpreter/EgoControl.cs similarity index 91% rename from src/Woohoo.Agi.Interpreter/Interpreter/EgoControl.cs rename to src/Woohoo.Agi.Engine/Interpreter/EgoControl.cs index 107cbfd..f8e841d 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/EgoControl.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/EgoControl.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Modes which the ego can be controlled. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ErrorCodes.cs b/src/Woohoo.Agi.Engine/Interpreter/ErrorCodes.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/ErrorCodes.cs rename to src/Woohoo.Agi.Engine/Interpreter/ErrorCodes.cs index 66cc08b..fd0f54e 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ErrorCodes.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ErrorCodes.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Constants for the interpreter error code. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ExecutionException.cs b/src/Woohoo.Agi.Engine/Interpreter/ExecutionException.cs similarity index 97% rename from src/Woohoo.Agi.Interpreter/Interpreter/ExecutionException.cs rename to src/Woohoo.Agi.Engine/Interpreter/ExecutionException.cs index 3267dc5..e7aee08 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ExecutionException.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ExecutionException.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; [Serializable] public class ExecutionException : Exception diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ExitException.cs b/src/Woohoo.Agi.Engine/Interpreter/ExitException.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/ExitException.cs rename to src/Woohoo.Agi.Engine/Interpreter/ExitException.cs index 9616ef6..e898eb4 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ExitException.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ExitException.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; [Serializable] public class ExitException : Exception diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Flags.cs b/src/Woohoo.Agi.Engine/Interpreter/Flags.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/Flags.cs rename to src/Woohoo.Agi.Engine/Interpreter/Flags.cs index 60eee74..8ebac74 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Flags.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Flags.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Constants for the state flags. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Font.cs b/src/Woohoo.Agi.Engine/Interpreter/Font.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/Font.cs rename to src/Woohoo.Agi.Engine/Interpreter/Font.cs index 6bc29ae..55afd1c 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Font.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Font.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Text font. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/FontAmiga8x8.nbf b/src/Woohoo.Agi.Engine/Interpreter/FontAmiga8x8.nbf similarity index 100% rename from src/Woohoo.Agi.Interpreter/Interpreter/FontAmiga8x8.nbf rename to src/Woohoo.Agi.Engine/Interpreter/FontAmiga8x8.nbf diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/FontAppleIIgs8x8.nbf b/src/Woohoo.Agi.Engine/Interpreter/FontAppleIIgs8x8.nbf similarity index 100% rename from src/Woohoo.Agi.Interpreter/Interpreter/FontAppleIIgs8x8.nbf rename to src/Woohoo.Agi.Engine/Interpreter/FontAppleIIgs8x8.nbf diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/FontAtariST8x8.nbf b/src/Woohoo.Agi.Engine/Interpreter/FontAtariST8x8.nbf similarity index 100% rename from src/Woohoo.Agi.Interpreter/Interpreter/FontAtariST8x8.nbf rename to src/Woohoo.Agi.Engine/Interpreter/FontAtariST8x8.nbf diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/FontEga8x8.nbf b/src/Woohoo.Agi.Engine/Interpreter/FontEga8x8.nbf similarity index 100% rename from src/Woohoo.Agi.Interpreter/Interpreter/FontEga8x8.nbf rename to src/Woohoo.Agi.Engine/Interpreter/FontEga8x8.nbf diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/FontHercules16x16.nbf b/src/Woohoo.Agi.Engine/Interpreter/FontHercules16x16.nbf similarity index 100% rename from src/Woohoo.Agi.Interpreter/Interpreter/FontHercules16x16.nbf rename to src/Woohoo.Agi.Engine/Interpreter/FontHercules16x16.nbf diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/FontUnknown8x8.nbf b/src/Woohoo.Agi.Engine/Interpreter/FontUnknown8x8.nbf similarity index 100% rename from src/Woohoo.Agi.Interpreter/Interpreter/FontUnknown8x8.nbf rename to src/Woohoo.Agi.Engine/Interpreter/FontUnknown8x8.nbf diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsColor.cs b/src/Woohoo.Agi.Engine/Interpreter/GraphicsColor.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/GraphicsColor.cs rename to src/Woohoo.Agi.Engine/Interpreter/GraphicsColor.cs index 7cb9ffa..7a24e1d 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsColor.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/GraphicsColor.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Represents a 24-bit color. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRenderer.cs b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRenderer.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRenderer.cs rename to src/Woohoo.Agi.Engine/Interpreter/GraphicsRenderer.cs index 9485485..52626dd 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRenderer.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRenderer.cs @@ -1,9 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; public class GraphicsRenderer { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriver.cs b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriver.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriver.cs rename to src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriver.cs index 2052e06..1d9bf4c 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriver.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriver.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public abstract class GraphicsRendererDriver { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAmiga1.cs b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAmiga1.cs similarity index 93% rename from src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAmiga1.cs rename to src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAmiga1.cs index 5e43b63..ed78d3d 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAmiga1.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAmiga1.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public sealed class GraphicsRendererDriverAmiga1 : GraphicsRendererDriverFull { @@ -45,6 +45,6 @@ public override GraphicsColor[] GetPaletteColors(bool textMode) public override Font GetFont() { - return new Font(Resources.FontAmiga8x8); + return new Font(PlayerResources.FontAmiga8x8); } } diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAmiga2.cs b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAmiga2.cs similarity index 93% rename from src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAmiga2.cs rename to src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAmiga2.cs index 2915702..a3a658d 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAmiga2.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAmiga2.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public sealed class GraphicsRendererDriverAmiga2 : GraphicsRendererDriverFull { @@ -45,6 +45,6 @@ public override GraphicsColor[] GetPaletteColors(bool textMode) public override Font GetFont() { - return new Font(Resources.FontAmiga8x8); + return new Font(PlayerResources.FontAmiga8x8); } } diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAmiga3.cs b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAmiga3.cs similarity index 93% rename from src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAmiga3.cs rename to src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAmiga3.cs index fcb5c6e..2ff8904 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAmiga3.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAmiga3.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public sealed class GraphicsRendererDriverAmiga3 : GraphicsRendererDriverFull { @@ -45,6 +45,6 @@ public override GraphicsColor[] GetPaletteColors(bool textMode) public override Font GetFont() { - return new Font(Resources.FontAmiga8x8); + return new Font(PlayerResources.FontAmiga8x8); } } diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAppleIIgs.cs b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAppleIIgs.cs similarity index 93% rename from src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAppleIIgs.cs rename to src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAppleIIgs.cs index 168d129..667711a 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAppleIIgs.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAppleIIgs.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public sealed class GraphicsRendererDriverAppleIIgs : GraphicsRendererDriverFull { @@ -41,6 +41,6 @@ public override GraphicsColor[] GetPaletteColors(bool textMode) public override Font GetFont() { - return new Font(Resources.FontAppleIIgs8x8); + return new Font(PlayerResources.FontAppleIIgs8x8); } } diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAtariST.cs b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAtariST.cs similarity index 93% rename from src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAtariST.cs rename to src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAtariST.cs index bcf066c..a8045e5 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverAtariST.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverAtariST.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public sealed class GraphicsRendererDriverAtariST : GraphicsRendererDriverFull { @@ -41,6 +41,6 @@ public override GraphicsColor[] GetPaletteColors(bool textMode) public override Font GetFont() { - return new Font(Resources.FontAtariST8x8); + return new Font(PlayerResources.FontAtariST8x8); } } diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga.cs b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverCga.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga.cs rename to src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverCga.cs index 35e8cd4..5fd93b5 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverCga.cs @@ -3,9 +3,10 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Interpreter; +using Woohoo.Agi.Engine.Resources; public abstract class GraphicsRendererDriverCga : GraphicsRendererDriver { @@ -33,7 +34,7 @@ protected GraphicsRendererDriverCga() this.CreateRenderBuffer(320, 168); } - public override byte DisplayType => Woohoo.Agi.Interpreter.DisplayType.Cga; + public override byte DisplayType => Woohoo.Agi.Engine.Interpreter.DisplayType.Cga; public override int Width => 320; @@ -49,7 +50,7 @@ protected GraphicsRendererDriverCga() public override Font GetFont() { - return new Font(Resources.FontEga8x8); + return new Font(PlayerResources.FontEga8x8); } public override byte CombineTextColors(byte fg, byte bg, bool textMode) diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga0.cs b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverCga0.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga0.cs rename to src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverCga0.cs index 3a52c0e..2fbad79 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga0.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverCga0.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public sealed class GraphicsRendererDriverCga0 : GraphicsRendererDriverCga { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga1.cs b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverCga1.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga1.cs rename to src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverCga1.cs index 81f6032..0fbdb60 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverCga1.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverCga1.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public sealed class GraphicsRendererDriverCga1 : GraphicsRendererDriverCga { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverEga.cs b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverEga.cs similarity index 92% rename from src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverEga.cs rename to src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverEga.cs index 93cf522..5f32bc1 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverEga.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverEga.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public sealed class GraphicsRendererDriverEga : GraphicsRendererDriverFull { @@ -41,6 +41,6 @@ public override GraphicsColor[] GetPaletteColors(bool textMode) public override Font GetFont() { - return new Font(Resources.FontEga8x8); + return new Font(PlayerResources.FontEga8x8); } } diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverFull.cs b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverFull.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverFull.cs rename to src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverFull.cs index f642ad4..43cb110 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverFull.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverFull.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; public abstract class GraphicsRendererDriverFull : GraphicsRendererDriver { @@ -14,7 +14,7 @@ protected GraphicsRendererDriverFull() this.CreateRenderBuffer(320, 168); } - public override byte DisplayType => Woohoo.Agi.Interpreter.DisplayType.Ega; + public override byte DisplayType => Woohoo.Agi.Engine.Interpreter.DisplayType.Ega; public override Palette Palette => Palette.Ega; diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverHercules.cs b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverHercules.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverHercules.cs rename to src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverHercules.cs index 80edaca..37f2a10 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GraphicsRendererDriverHercules.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/GraphicsRendererDriverHercules.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; public sealed class GraphicsRendererDriverHercules : GraphicsRendererDriver { @@ -177,7 +177,7 @@ public GraphicsRendererDriverHercules(GraphicsColor whiteColor) this.CreateRenderBuffer(640, 336); } - public override byte DisplayType => Woohoo.Agi.Interpreter.DisplayType.Hercules; + public override byte DisplayType => Woohoo.Agi.Engine.Interpreter.DisplayType.Hercules; public override Palette Palette => Palette.BlackWhite; @@ -195,7 +195,7 @@ public GraphicsRendererDriverHercules(GraphicsColor whiteColor) public override Font GetFont() { - return new Font(Resources.FontHercules16x16); + return new Font(PlayerResources.FontHercules16x16); } public override byte CombineTextColors(byte fg, byte bg, bool textMode) diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/IGraphicsDriver.cs b/src/Woohoo.Agi.Engine/Interpreter/IGraphicsDriver.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/IGraphicsDriver.cs rename to src/Woohoo.Agi.Engine/Interpreter/IGraphicsDriver.cs index 938a5f3..c3f3d48 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/IGraphicsDriver.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/IGraphicsDriver.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public interface IGraphicsDriver { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/IInputDriver.cs b/src/Woohoo.Agi.Engine/Interpreter/IInputDriver.cs similarity index 94% rename from src/Woohoo.Agi.Interpreter/Interpreter/IInputDriver.cs rename to src/Woohoo.Agi.Engine/Interpreter/IInputDriver.cs index 0a2d316..120c3fc 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/IInputDriver.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/IInputDriver.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public interface IInputDriver { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/IKernel.cs b/src/Woohoo.Agi.Engine/Interpreter/IKernel.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/IKernel.cs rename to src/Woohoo.Agi.Engine/Interpreter/IKernel.cs index f9a1c4f..fafa2cc 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/IKernel.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/IKernel.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Kernal API used by logic scripts. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ISavedGameSerializer.cs b/src/Woohoo.Agi.Engine/Interpreter/ISavedGameSerializer.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/ISavedGameSerializer.cs rename to src/Woohoo.Agi.Engine/Interpreter/ISavedGameSerializer.cs index 483a314..1566d08 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ISavedGameSerializer.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ISavedGameSerializer.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Save/restore game functionality. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ISoundDriver.cs b/src/Woohoo.Agi.Engine/Interpreter/ISoundDriver.cs similarity index 89% rename from src/Woohoo.Agi.Interpreter/Interpreter/ISoundDriver.cs rename to src/Woohoo.Agi.Engine/Interpreter/ISoundDriver.cs index 198f428..6f90b0c 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ISoundDriver.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ISoundDriver.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public interface ISoundDriver { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ISoundPcmDriver.cs b/src/Woohoo.Agi.Engine/Interpreter/ISoundPcmDriver.cs similarity index 92% rename from src/Woohoo.Agi.Interpreter/Interpreter/ISoundPcmDriver.cs rename to src/Woohoo.Agi.Engine/Interpreter/ISoundPcmDriver.cs index acd5f05..b1137b7 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ISoundPcmDriver.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ISoundPcmDriver.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public delegate int AudioCallback(ToneChannel ch, short[] buffer, int count); diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/InputEvent.cs b/src/Woohoo.Agi.Engine/Interpreter/InputEvent.cs similarity index 88% rename from src/Woohoo.Agi.Interpreter/Interpreter/InputEvent.cs rename to src/Woohoo.Agi.Engine/Interpreter/InputEvent.cs index b1ee014..227b98a 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/InputEvent.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/InputEvent.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class InputEvent { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/InputEventAscii.cs b/src/Woohoo.Agi.Engine/Interpreter/InputEventAscii.cs similarity index 90% rename from src/Woohoo.Agi.Interpreter/Interpreter/InputEventAscii.cs rename to src/Woohoo.Agi.Engine/Interpreter/InputEventAscii.cs index b7799d3..bfc6aea 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/InputEventAscii.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/InputEventAscii.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public static class InputEventAscii { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/InputEventDirection.cs b/src/Woohoo.Agi.Engine/Interpreter/InputEventDirection.cs similarity index 92% rename from src/Woohoo.Agi.Interpreter/Interpreter/InputEventDirection.cs rename to src/Woohoo.Agi.Engine/Interpreter/InputEventDirection.cs index 0b35a31..3cc56e2 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/InputEventDirection.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/InputEventDirection.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public static class InputEventDirection { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/InputEventType.cs b/src/Woohoo.Agi.Engine/Interpreter/InputEventType.cs similarity index 89% rename from src/Woohoo.Agi.Interpreter/Interpreter/InputEventType.cs rename to src/Woohoo.Agi.Engine/Interpreter/InputEventType.cs index 86e68d6..ca0a6ef 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/InputEventType.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/InputEventType.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public static class InputEventType { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/LogicArgumentType.cs b/src/Woohoo.Agi.Engine/Interpreter/LogicArgumentType.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/LogicArgumentType.cs rename to src/Woohoo.Agi.Engine/Interpreter/LogicArgumentType.cs index de031bf..bb7c14c 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/LogicArgumentType.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/LogicArgumentType.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Logic argument type. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/LogicCommand.cs b/src/Woohoo.Agi.Engine/Interpreter/LogicCommand.cs similarity index 93% rename from src/Woohoo.Agi.Interpreter/Interpreter/LogicCommand.cs rename to src/Woohoo.Agi.Engine/Interpreter/LogicCommand.cs index b53b7a4..a593555 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/LogicCommand.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/LogicCommand.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class LogicCommand { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/LogicCommandTable.cs b/src/Woohoo.Agi.Engine/Interpreter/LogicCommandTable.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/LogicCommandTable.cs rename to src/Woohoo.Agi.Engine/Interpreter/LogicCommandTable.cs index f98115a..7c46350 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/LogicCommandTable.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/LogicCommandTable.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public static class LogicCommandTable { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/LogicControlCode.cs b/src/Woohoo.Agi.Engine/Interpreter/LogicControlCode.cs similarity index 94% rename from src/Woohoo.Agi.Interpreter/Interpreter/LogicControlCode.cs rename to src/Woohoo.Agi.Engine/Interpreter/LogicControlCode.cs index 6e749bd..53a704f 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/LogicControlCode.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/LogicControlCode.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Logic resource control codes. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/LogicFunctionCode.cs b/src/Woohoo.Agi.Engine/Interpreter/LogicFunctionCode.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/LogicFunctionCode.cs rename to src/Woohoo.Agi.Engine/Interpreter/LogicFunctionCode.cs index aeb7de0..9348e79 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/LogicFunctionCode.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/LogicFunctionCode.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Function code. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/LogicFunctionTable.cs b/src/Woohoo.Agi.Engine/Interpreter/LogicFunctionTable.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/LogicFunctionTable.cs rename to src/Woohoo.Agi.Engine/Interpreter/LogicFunctionTable.cs index 9abcd3f..e2d5ac3 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/LogicFunctionTable.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/LogicFunctionTable.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class LogicFunctionTable { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/LogicInterpreter.cs b/src/Woohoo.Agi.Engine/Interpreter/LogicInterpreter.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/LogicInterpreter.cs rename to src/Woohoo.Agi.Engine/Interpreter/LogicInterpreter.cs index 562116d..ef05e72 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/LogicInterpreter.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/LogicInterpreter.cs @@ -1,9 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; /// /// Error handler. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/LogicPatch.cs b/src/Woohoo.Agi.Engine/Interpreter/LogicPatch.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/LogicPatch.cs rename to src/Woohoo.Agi.Engine/Interpreter/LogicPatch.cs index 4c37799..18eca39 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/LogicPatch.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/LogicPatch.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class LogicPatch { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/LogicPatches.cs b/src/Woohoo.Agi.Engine/Interpreter/LogicPatches.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/LogicPatches.cs rename to src/Woohoo.Agi.Engine/Interpreter/LogicPatches.cs index f308797..341c74a 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/LogicPatches.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/LogicPatches.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public static class LogicPatches { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/LogicProcedureCode.cs b/src/Woohoo.Agi.Engine/Interpreter/LogicProcedureCode.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/LogicProcedureCode.cs rename to src/Woohoo.Agi.Engine/Interpreter/LogicProcedureCode.cs index 0ab7e54..d6e3584 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/LogicProcedureCode.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/LogicProcedureCode.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Procedure code. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/LogicProcedureTable.cs b/src/Woohoo.Agi.Engine/Interpreter/LogicProcedureTable.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/LogicProcedureTable.cs rename to src/Woohoo.Agi.Engine/Interpreter/LogicProcedureTable.cs index 114cdad..956f9fa 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/LogicProcedureTable.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/LogicProcedureTable.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class LogicProcedureTable { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/LoopUpdate.cs b/src/Woohoo.Agi.Engine/Interpreter/LoopUpdate.cs similarity index 84% rename from src/Woohoo.Agi.Interpreter/Interpreter/LoopUpdate.cs rename to src/Woohoo.Agi.Engine/Interpreter/LoopUpdate.cs index 46ea5fc..292eb03 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/LoopUpdate.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/LoopUpdate.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public enum LoopUpdate { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Menu.cs b/src/Woohoo.Agi.Engine/Interpreter/Menu.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/Menu.cs rename to src/Woohoo.Agi.Engine/Interpreter/Menu.cs index e3d5786..afa0c89 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Menu.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Menu.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Menu hierarchical structure. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/MenuItem.cs b/src/Woohoo.Agi.Engine/Interpreter/MenuItem.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/MenuItem.cs rename to src/Woohoo.Agi.Engine/Interpreter/MenuItem.cs index 78331d0..a9d9885 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/MenuItem.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/MenuItem.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Menu item. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/MenuParentItem.cs b/src/Woohoo.Agi.Engine/Interpreter/MenuParentItem.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/MenuParentItem.cs rename to src/Woohoo.Agi.Engine/Interpreter/MenuParentItem.cs index 0826a3a..2df1499 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/MenuParentItem.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/MenuParentItem.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Top level menu item. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/MessageState.cs b/src/Woohoo.Agi.Engine/Interpreter/MessageState.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/MessageState.cs rename to src/Woohoo.Agi.Engine/Interpreter/MessageState.cs index 0e1abb1..6e88639 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/MessageState.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/MessageState.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class MessageState { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Motion.cs b/src/Woohoo.Agi.Engine/Interpreter/Motion.cs similarity index 87% rename from src/Woohoo.Agi.Interpreter/Interpreter/Motion.cs rename to src/Woohoo.Agi.Engine/Interpreter/Motion.cs index f3fe049..fe4ff76 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Motion.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Motion.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// View motion type. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/MouseArea.cs b/src/Woohoo.Agi.Engine/Interpreter/MouseArea.cs similarity index 93% rename from src/Woohoo.Agi.Interpreter/Interpreter/MouseArea.cs rename to src/Woohoo.Agi.Engine/Interpreter/MouseArea.cs index ec4d080..7864410 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/MouseArea.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/MouseArea.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Mouse screen area. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/MouseAreaPosition.cs b/src/Woohoo.Agi.Engine/Interpreter/MouseAreaPosition.cs similarity index 93% rename from src/Woohoo.Agi.Interpreter/Interpreter/MouseAreaPosition.cs rename to src/Woohoo.Agi.Engine/Interpreter/MouseAreaPosition.cs index 321e886..b6e12bc 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/MouseAreaPosition.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/MouseAreaPosition.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class MouseAreaPosition { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/MouseButton.cs b/src/Woohoo.Agi.Engine/Interpreter/MouseButton.cs similarity index 88% rename from src/Woohoo.Agi.Interpreter/Interpreter/MouseButton.cs rename to src/Woohoo.Agi.Engine/Interpreter/MouseButton.cs index eadb636..60c1d05 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/MouseButton.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/MouseButton.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public static class MouseButton { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/MouseDown.cs b/src/Woohoo.Agi.Engine/Interpreter/MouseDown.cs similarity index 91% rename from src/Woohoo.Agi.Interpreter/Interpreter/MouseDown.cs rename to src/Woohoo.Agi.Engine/Interpreter/MouseDown.cs index 4ab366a..1063b25 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/MouseDown.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/MouseDown.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class MouseDown { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/MouseMode.cs b/src/Woohoo.Agi.Engine/Interpreter/MouseMode.cs similarity index 84% rename from src/Woohoo.Agi.Interpreter/Interpreter/MouseMode.cs rename to src/Woohoo.Agi.Engine/Interpreter/MouseMode.cs index 60e359e..c77268a 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/MouseMode.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/MouseMode.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public enum MouseMode { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Palette.cs b/src/Woohoo.Agi.Engine/Interpreter/Palette.cs similarity index 86% rename from src/Woohoo.Agi.Interpreter/Interpreter/Palette.cs rename to src/Woohoo.Agi.Engine/Interpreter/Palette.cs index 766bd52..83be86e 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Palette.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Palette.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public enum Palette { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Parser.cs b/src/Woohoo.Agi.Engine/Interpreter/Parser.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/Parser.cs rename to src/Woohoo.Agi.Engine/Interpreter/Parser.cs index 8581107..aa63615 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Parser.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Parser.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; /// /// The parser matches the words entered by the user with family ids diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ParserResult.cs b/src/Woohoo.Agi.Engine/Interpreter/ParserResult.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/ParserResult.cs rename to src/Woohoo.Agi.Engine/Interpreter/ParserResult.cs index e3f2d35..efd8094 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ParserResult.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ParserResult.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Parser result. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/PcmSoundDriver.cs b/src/Woohoo.Agi.Engine/Interpreter/PcmSoundDriver.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/PcmSoundDriver.cs rename to src/Woohoo.Agi.Engine/Interpreter/PcmSoundDriver.cs index 4d7254b..52262a3 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/PcmSoundDriver.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/PcmSoundDriver.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public sealed class PcmSoundDriver : ISoundDriver { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/PictureBrushPattern.cs b/src/Woohoo.Agi.Engine/Interpreter/PictureBrushPattern.cs similarity index 90% rename from src/Woohoo.Agi.Interpreter/Interpreter/PictureBrushPattern.cs rename to src/Woohoo.Agi.Engine/Interpreter/PictureBrushPattern.cs index 46fce14..28ebb15 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/PictureBrushPattern.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/PictureBrushPattern.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Represents the brush patterns. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/PictureBrushShape.cs b/src/Woohoo.Agi.Engine/Interpreter/PictureBrushShape.cs similarity index 90% rename from src/Woohoo.Agi.Interpreter/Interpreter/PictureBrushShape.cs rename to src/Woohoo.Agi.Engine/Interpreter/PictureBrushShape.cs index fbca629..80a60a4 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/PictureBrushShape.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/PictureBrushShape.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Represents the brush shapes. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/PictureBuffer.cs b/src/Woohoo.Agi.Engine/Interpreter/PictureBuffer.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/PictureBuffer.cs rename to src/Woohoo.Agi.Engine/Interpreter/PictureBuffer.cs index 7f8f7dd..3d2cd80 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/PictureBuffer.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/PictureBuffer.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; public class PictureBuffer { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/PictureCode.cs b/src/Woohoo.Agi.Engine/Interpreter/PictureCode.cs similarity index 97% rename from src/Woohoo.Agi.Interpreter/Interpreter/PictureCode.cs rename to src/Woohoo.Agi.Engine/Interpreter/PictureCode.cs index ec91c7d..a3b6e45 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/PictureCode.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/PictureCode.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Picture codec codes. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/PictureInterpreter.cs b/src/Woohoo.Agi.Engine/Interpreter/PictureInterpreter.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/PictureInterpreter.cs rename to src/Woohoo.Agi.Engine/Interpreter/PictureInterpreter.cs index 1314fe3..1220d87 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/PictureInterpreter.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/PictureInterpreter.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; /// /// Picture byte code interpreter. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/PicturePoint.cs b/src/Woohoo.Agi.Engine/Interpreter/PicturePoint.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/PicturePoint.cs rename to src/Woohoo.Agi.Engine/Interpreter/PicturePoint.cs index c21ef6c..bc6937b 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/PicturePoint.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/PicturePoint.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Coordinates (x, y) in the native picture/view system (x = 0 to 160, y = 0 to 168). diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/PictureRectangle.cs b/src/Woohoo.Agi.Engine/Interpreter/PictureRectangle.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/PictureRectangle.cs rename to src/Woohoo.Agi.Engine/Interpreter/PictureRectangle.cs index 688a521..1437c06 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/PictureRectangle.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/PictureRectangle.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Rectangle in the native picture/view system (x = 0 to 160, y = 0 to 168). diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/PictureRenderer.cs b/src/Woohoo.Agi.Engine/Interpreter/PictureRenderer.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/PictureRenderer.cs rename to src/Woohoo.Agi.Engine/Interpreter/PictureRenderer.cs index bbeb386..cbf922d 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/PictureRenderer.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/PictureRenderer.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class PictureRenderer { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Resources.Designer.cs b/src/Woohoo.Agi.Engine/Interpreter/PlayerResources.Designer.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/Resources.Designer.cs rename to src/Woohoo.Agi.Engine/Interpreter/PlayerResources.Designer.cs index 02c80ff..cf58c8e 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Resources.Designer.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/PlayerResources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Woohoo.Agi.Interpreter { +namespace Woohoo.Agi.Engine.Interpreter { using System; @@ -19,17 +19,17 @@ namespace Woohoo.Agi.Interpreter { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { + internal class PlayerResources { private static global::System.Resources.ResourceManager resourceMan; private static global::System.Globalization.CultureInfo resourceCulture; [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { + internal PlayerResources() { } /// @@ -39,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Woohoo.Agi.Interpreter.Interpreter.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Woohoo.Agi.Engine.Interpreter.PlayerResources", typeof(PlayerResources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Resources.resx b/src/Woohoo.Agi.Engine/Interpreter/PlayerResources.resx similarity index 100% rename from src/Woohoo.Agi.Interpreter/Interpreter/Resources.resx rename to src/Woohoo.Agi.Engine/Interpreter/PlayerResources.resx diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Preferences.cs b/src/Woohoo.Agi.Engine/Interpreter/Preferences.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/Preferences.cs rename to src/Woohoo.Agi.Engine/Interpreter/Preferences.cs index 2bfe456..401a336 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Preferences.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Preferences.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Interpreter preferences. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/PreferencesSerializer.cs b/src/Woohoo.Agi.Engine/Interpreter/PreferencesSerializer.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/PreferencesSerializer.cs rename to src/Woohoo.Agi.Engine/Interpreter/PreferencesSerializer.cs index d0729c5..b488b69 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/PreferencesSerializer.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/PreferencesSerializer.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public static class PreferencesSerializer { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/PriorityTable.cs b/src/Woohoo.Agi.Engine/Interpreter/PriorityTable.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/PriorityTable.cs rename to src/Woohoo.Agi.Engine/Interpreter/PriorityTable.cs index f6a0a1f..22eaed4 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/PriorityTable.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/PriorityTable.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Priority table contains the priority for each vertical position in the picture. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Random.cs b/src/Woohoo.Agi.Engine/Interpreter/Random.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/Random.cs rename to src/Woohoo.Agi.Engine/Interpreter/Random.cs index 043b075..464ca8e 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Random.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Random.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Random number generator. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/RenderBuffer.cs b/src/Woohoo.Agi.Engine/Interpreter/RenderBuffer.cs similarity index 92% rename from src/Woohoo.Agi.Interpreter/Interpreter/RenderBuffer.cs rename to src/Woohoo.Agi.Engine/Interpreter/RenderBuffer.cs index e04c81f..0dc032c 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/RenderBuffer.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/RenderBuffer.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class RenderBuffer { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/RenderPoint.cs b/src/Woohoo.Agi.Engine/Interpreter/RenderPoint.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/RenderPoint.cs rename to src/Woohoo.Agi.Engine/Interpreter/RenderPoint.cs index 57e7e81..45403ea 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/RenderPoint.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/RenderPoint.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Rectangle point in the render buffer system (x = 0 to 320/640, y = 0 to 200/400). diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/RenderRectangle.cs b/src/Woohoo.Agi.Engine/Interpreter/RenderRectangle.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/RenderRectangle.cs rename to src/Woohoo.Agi.Engine/Interpreter/RenderRectangle.cs index ef44fef..0526e62 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/RenderRectangle.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/RenderRectangle.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Rectangle in the render buffer system (x = 0 to 320/640, y = 0 to 200/400). diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/RenderSize.cs b/src/Woohoo.Agi.Engine/Interpreter/RenderSize.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/RenderSize.cs rename to src/Woohoo.Agi.Engine/Interpreter/RenderSize.cs index 2c79cba..934a072 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/RenderSize.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/RenderSize.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Size in the render buffer system (x = 0 to 320/640, y = 0 to 200/400). diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ResourceManager.cs b/src/Woohoo.Agi.Engine/Interpreter/ResourceManager.cs similarity index 97% rename from src/Woohoo.Agi.Interpreter/Interpreter/ResourceManager.cs rename to src/Woohoo.Agi.Engine/Interpreter/ResourceManager.cs index 751a5de..ec3c755 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ResourceManager.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ResourceManager.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; /// /// Manages the currently loaded game resources. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/SavedGameManager.cs b/src/Woohoo.Agi.Engine/Interpreter/SavedGameManager.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/SavedGameManager.cs rename to src/Woohoo.Agi.Engine/Interpreter/SavedGameManager.cs index aceaf23..e9699a8 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/SavedGameManager.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/SavedGameManager.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class SavedGameManager { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/SavedGameXmlSerializer.cs b/src/Woohoo.Agi.Engine/Interpreter/SavedGameXmlSerializer.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/SavedGameXmlSerializer.cs rename to src/Woohoo.Agi.Engine/Interpreter/SavedGameXmlSerializer.cs index 5eaf101..22089c0 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/SavedGameXmlSerializer.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/SavedGameXmlSerializer.cs @@ -1,9 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; /// /// Saved game serializer which uses xml text format. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ScreenPoint.cs b/src/Woohoo.Agi.Engine/Interpreter/ScreenPoint.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/ScreenPoint.cs rename to src/Woohoo.Agi.Engine/Interpreter/ScreenPoint.cs index c5bffae..6fd1475 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ScreenPoint.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ScreenPoint.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Coordinates (x, y) in the screen system (display scaling applied). diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ScriptCodes.cs b/src/Woohoo.Agi.Engine/Interpreter/ScriptCodes.cs similarity index 93% rename from src/Woohoo.Agi.Interpreter/Interpreter/ScriptCodes.cs rename to src/Woohoo.Agi.Engine/Interpreter/ScriptCodes.cs index d7900df..12cd7f6 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ScriptCodes.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ScriptCodes.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public static class ScriptCodes { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ScriptManager.cs b/src/Woohoo.Agi.Engine/Interpreter/ScriptManager.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/ScriptManager.cs rename to src/Woohoo.Agi.Engine/Interpreter/ScriptManager.cs index c0af086..a75ee2f 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ScriptManager.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ScriptManager.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class ScriptManager { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ShiftDirection.cs b/src/Woohoo.Agi.Engine/Interpreter/ShiftDirection.cs similarity index 85% rename from src/Woohoo.Agi.Interpreter/Interpreter/ShiftDirection.cs rename to src/Woohoo.Agi.Engine/Interpreter/ShiftDirection.cs index 87dbce8..d10da46 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ShiftDirection.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ShiftDirection.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public enum ShiftDirection { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/SoundChannel.cs b/src/Woohoo.Agi.Engine/Interpreter/SoundChannel.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/SoundChannel.cs rename to src/Woohoo.Agi.Engine/Interpreter/SoundChannel.cs index 00af530..01df4b0 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/SoundChannel.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/SoundChannel.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class SoundChannel { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/SoundManager.cs b/src/Woohoo.Agi.Engine/Interpreter/SoundManager.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/SoundManager.cs rename to src/Woohoo.Agi.Engine/Interpreter/SoundManager.cs index 102083c..2123ada 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/SoundManager.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/SoundManager.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; public class SoundManager { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/SoundType.cs b/src/Woohoo.Agi.Engine/Interpreter/SoundType.cs similarity index 92% rename from src/Woohoo.Agi.Interpreter/Interpreter/SoundType.cs rename to src/Woohoo.Agi.Engine/Interpreter/SoundType.cs index d5c8605..ebe982a 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/SoundType.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/SoundType.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Sound hardware constants used by the SoundType state variable. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/State.cs b/src/Woohoo.Agi.Engine/Interpreter/State.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/State.cs rename to src/Woohoo.Agi.Engine/Interpreter/State.cs index 061a9d2..596950e 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/State.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/State.cs @@ -3,9 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; - -using System; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Interpreter state, this is serialized in saved games. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/StringUtility.cs b/src/Woohoo.Agi.Engine/Interpreter/StringUtility.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/StringUtility.cs rename to src/Woohoo.Agi.Engine/Interpreter/StringUtility.cs index 441e210..e729817 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/StringUtility.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/StringUtility.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Helper class to serialize agi strings into binary format. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/TextColor.cs b/src/Woohoo.Agi.Engine/Interpreter/TextColor.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/TextColor.cs rename to src/Woohoo.Agi.Engine/Interpreter/TextColor.cs index f421ba0..38ce721 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/TextColor.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/TextColor.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Text color components. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/TextPosition.cs b/src/Woohoo.Agi.Engine/Interpreter/TextPosition.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/TextPosition.cs rename to src/Woohoo.Agi.Engine/Interpreter/TextPosition.cs index 163f13c..7bf47c3 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/TextPosition.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/TextPosition.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Character position in text coordinates (row, column) = (0, 0). diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Tone.cs b/src/Woohoo.Agi.Engine/Interpreter/Tone.cs similarity index 88% rename from src/Woohoo.Agi.Interpreter/Interpreter/Tone.cs rename to src/Woohoo.Agi.Engine/Interpreter/Tone.cs index c197a5e..c257c39 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Tone.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Tone.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class Tone { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ToneChannel.cs b/src/Woohoo.Agi.Engine/Interpreter/ToneChannel.cs similarity index 94% rename from src/Woohoo.Agi.Interpreter/Interpreter/ToneChannel.cs rename to src/Woohoo.Agi.Engine/Interpreter/ToneChannel.cs index df609b9..64e5567 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ToneChannel.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ToneChannel.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class ToneChannel { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ToneChannelNoise.cs b/src/Woohoo.Agi.Engine/Interpreter/ToneChannelNoise.cs similarity index 91% rename from src/Woohoo.Agi.Interpreter/Interpreter/ToneChannelNoise.cs rename to src/Woohoo.Agi.Engine/Interpreter/ToneChannelNoise.cs index e6f7baa..c5eb04e 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ToneChannelNoise.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ToneChannelNoise.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class ToneChannelNoise { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/TraceState.cs b/src/Woohoo.Agi.Engine/Interpreter/TraceState.cs similarity index 85% rename from src/Woohoo.Agi.Interpreter/Interpreter/TraceState.cs rename to src/Woohoo.Agi.Engine/Interpreter/TraceState.cs index f5d6d5a..ee8d003 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/TraceState.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/TraceState.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public enum TraceState { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/UserInputMode.cs b/src/Woohoo.Agi.Engine/Interpreter/UserInputMode.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/UserInputMode.cs rename to src/Woohoo.Agi.Engine/Interpreter/UserInputMode.cs index f288aeb..5c914e5 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/UserInputMode.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/UserInputMode.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public enum UserInputMode { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/UserInterface.cs b/src/Woohoo.Agi.Engine/Interpreter/UserInterface.cs similarity index 53% rename from src/Woohoo.Agi.Interpreter/Interpreter/UserInterface.cs rename to src/Woohoo.Agi.Engine/Interpreter/UserInterface.cs index b04b907..18e89ca 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/UserInterface.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/UserInterface.cs @@ -3,122 +3,122 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public static class UserInterface { - public static string PlayerName => StringUtility.ConvertSystemResourceText(Resources.PlayerName); + public static string PlayerName => StringUtility.ConvertSystemResourceText(PlayerResources.PlayerName); - public static string PlayerVersion => StringUtility.ConvertSystemResourceText(Resources.PlayerVersion); + public static string PlayerVersion => StringUtility.ConvertSystemResourceText(PlayerResources.PlayerVersion); - public static string KernelVersion1 => StringUtility.ConvertSystemResourceText(string.Format(CultureInfo.CurrentUICulture, Resources.KernelVersion1, PlayerName, PlayerVersion)); + public static string KernelVersion1 => StringUtility.ConvertSystemResourceText(string.Format(CultureInfo.CurrentUICulture, PlayerResources.KernelVersion1, PlayerName, PlayerVersion)); - public static string RestartQuery => StringUtility.ConvertSystemResourceText(Resources.RestartQueryPC); + public static string RestartQuery => StringUtility.ConvertSystemResourceText(PlayerResources.RestartQueryPC); - public static string SaveQuery => StringUtility.ConvertSystemResourceText(Resources.SaveQuery); + public static string SaveQuery => StringUtility.ConvertSystemResourceText(PlayerResources.SaveQuery); - public static string SaveDone => StringUtility.ConvertSystemResourceText(Resources.SaveDone); + public static string SaveDone => StringUtility.ConvertSystemResourceText(PlayerResources.SaveDone); - public static string RestoreQuery => StringUtility.ConvertSystemResourceText(Resources.RestoreQuery); + public static string RestoreQuery => StringUtility.ConvertSystemResourceText(PlayerResources.RestoreQuery); - public static string RestoreNoGameAvailable => StringUtility.ConvertSystemResourceText(Resources.RestoreNoGameAvailable); + public static string RestoreNoGameAvailable => StringUtility.ConvertSystemResourceText(PlayerResources.RestoreNoGameAvailable); - public static string ListBoxItemTooLong => StringUtility.ConvertSystemResourceText(Resources.ListBoxItemTooLong); + public static string ListBoxItemTooLong => StringUtility.ConvertSystemResourceText(PlayerResources.ListBoxItemTooLong); - public static string ListBoxItemFormat => StringUtility.ConvertSystemResourceText(Resources.ListBoxItemFormat); + public static string ListBoxItemFormat => StringUtility.ConvertSystemResourceText(PlayerResources.ListBoxItemFormat); - public static string ListBoxScrollbarUp => StringUtility.ConvertSystemResourceText(Resources.ListBoxScrollbarUp); + public static string ListBoxScrollbarUp => StringUtility.ConvertSystemResourceText(PlayerResources.ListBoxScrollbarUp); - public static string ListBoxScrollbarUpHidden => StringUtility.ConvertSystemResourceText(Resources.ListBoxScrollbarUpHidden); + public static string ListBoxScrollbarUpHidden => StringUtility.ConvertSystemResourceText(PlayerResources.ListBoxScrollbarUpHidden); - public static string ListBoxScrollbarDown => StringUtility.ConvertSystemResourceText(Resources.ListBoxScrollbarDown); + public static string ListBoxScrollbarDown => StringUtility.ConvertSystemResourceText(PlayerResources.ListBoxScrollbarDown); - public static string ListBoxScrollbarDownHidden => StringUtility.ConvertSystemResourceText(Resources.ListBoxScrollbarDownHidden); + public static string ListBoxScrollbarDownHidden => StringUtility.ConvertSystemResourceText(PlayerResources.ListBoxScrollbarDownHidden); - public static string GameSelectionHeader => StringUtility.ConvertSystemResourceText(Resources.GameSelectionHeader); + public static string GameSelectionHeader => StringUtility.ConvertSystemResourceText(PlayerResources.GameSelectionHeader); - public static string GameSelectionNoGameFound => StringUtility.ConvertSystemResourceText(Resources.GameSelectionNoGameFound); + public static string GameSelectionNoGameFound => StringUtility.ConvertSystemResourceText(PlayerResources.GameSelectionNoGameFound); - public static string QuitQuery => StringUtility.ConvertSystemResourceText(Resources.QuitQueryPC); + public static string QuitQuery => StringUtility.ConvertSystemResourceText(PlayerResources.QuitQueryPC); - public static string Pause => StringUtility.ConvertSystemResourceText(Resources.PausePC); + public static string Pause => StringUtility.ConvertSystemResourceText(PlayerResources.PausePC); - public static string NotNow => StringUtility.ConvertSystemResourceText(Resources.NotNow); + public static string NotNow => StringUtility.ConvertSystemResourceText(PlayerResources.NotNow); - public static string InventoryCarrying => StringUtility.ConvertSystemResourceText(Resources.InventoryCarrying); + public static string InventoryCarrying => StringUtility.ConvertSystemResourceText(PlayerResources.InventoryCarrying); - public static string InventoryNothing => StringUtility.ConvertSystemResourceText(Resources.InventoryNothing); + public static string InventoryNothing => StringUtility.ConvertSystemResourceText(PlayerResources.InventoryNothing); - public static string InventoryStatusForItems => StringUtility.ConvertSystemResourceText(Resources.InventoryStatusForItemsPC); + public static string InventoryStatusForItems => StringUtility.ConvertSystemResourceText(PlayerResources.InventoryStatusForItemsPC); - public static string InventoryStatusNoItems => StringUtility.ConvertSystemResourceText(Resources.InventoryStatusNoItemsPC); + public static string InventoryStatusNoItems => StringUtility.ConvertSystemResourceText(PlayerResources.InventoryStatusNoItemsPC); - public static string MessageTooVerboseFormat => StringUtility.ConvertSystemResourceText(Resources.MessageTooVerboseFormat); + public static string MessageTooVerboseFormat => StringUtility.ConvertSystemResourceText(PlayerResources.MessageTooVerboseFormat); - public static string ScoreStatusOld => StringUtility.ConvertSystemResourceText(Resources.ScoreStatusOld); + public static string ScoreStatusOld => StringUtility.ConvertSystemResourceText(PlayerResources.ScoreStatusOld); - public static string ScoreStatusNew => StringUtility.ConvertSystemResourceText(Resources.ScoreStatusNew); + public static string ScoreStatusNew => StringUtility.ConvertSystemResourceText(PlayerResources.ScoreStatusNew); - public static string SoundOff => StringUtility.ConvertSystemResourceText(Resources.SoundOff); + public static string SoundOff => StringUtility.ConvertSystemResourceText(PlayerResources.SoundOff); - public static string SoundOn => StringUtility.ConvertSystemResourceText(Resources.SoundOn); + public static string SoundOn => StringUtility.ConvertSystemResourceText(PlayerResources.SoundOn); - public static string SoundStatusNew => StringUtility.ConvertSystemResourceText(Resources.SoundStatusNew); + public static string SoundStatusNew => StringUtility.ConvertSystemResourceText(PlayerResources.SoundStatusNew); - public static string SoundStatusOld => StringUtility.ConvertSystemResourceText(Resources.SoundStatusOld); + public static string SoundStatusOld => StringUtility.ConvertSystemResourceText(PlayerResources.SoundStatusOld); - public static string InputBox => StringUtility.ConvertSystemResourceText(Resources.InputBox); + public static string InputBox => StringUtility.ConvertSystemResourceText(PlayerResources.InputBox); - public static string TypelessBox => StringUtility.ConvertSystemResourceText(Resources.TypelessBox); + public static string TypelessBox => StringUtility.ConvertSystemResourceText(PlayerResources.TypelessBox); - public static string TraceSeparatorLine => StringUtility.ConvertSystemResourceText(Resources.TraceSeparatorLine); + public static string TraceSeparatorLine => StringUtility.ConvertSystemResourceText(PlayerResources.TraceSeparatorLine); - public static string SavePathDoesNotExistFormat => StringUtility.ConvertSystemResourceText(Resources.SavePathDoesNotExistFormat); + public static string SavePathDoesNotExistFormat => StringUtility.ConvertSystemResourceText(PlayerResources.SavePathDoesNotExistFormat); - public static string RestorePathPromptFormat => StringUtility.ConvertSystemResourceText(Resources.RestorePathPromptFormat); + public static string RestorePathPromptFormat => StringUtility.ConvertSystemResourceText(PlayerResources.RestorePathPromptFormat); - public static string RestoreNoGamesInFolderFormat => StringUtility.ConvertSystemResourceText(Resources.RestoreNoGamesInFolderFormat); + public static string RestoreNoGamesInFolderFormat => StringUtility.ConvertSystemResourceText(PlayerResources.RestoreNoGamesInFolderFormat); - public static string SavePathPromptFormat => StringUtility.ConvertSystemResourceText(Resources.SavePathPromptFormat); + public static string SavePathPromptFormat => StringUtility.ConvertSystemResourceText(PlayerResources.SavePathPromptFormat); - public static string SaveDescriptionPrompt => StringUtility.ConvertSystemResourceText(Resources.SaveDescriptionPrompt); + public static string SaveDescriptionPrompt => StringUtility.ConvertSystemResourceText(PlayerResources.SaveDescriptionPrompt); - public static string PathExample => StringUtility.ConvertSystemResourceText(Resources.PathExample); + public static string PathExample => StringUtility.ConvertSystemResourceText(PlayerResources.PathExample); - public static string SaveSelectSlot => StringUtility.ConvertSystemResourceText(Resources.SaveSelectSlot); + public static string SaveSelectSlot => StringUtility.ConvertSystemResourceText(PlayerResources.SaveSelectSlot); - public static string RestoreSelectSlot => StringUtility.ConvertSystemResourceText(Resources.RestoreSelectSlot); + public static string RestoreSelectSlot => StringUtility.ConvertSystemResourceText(PlayerResources.RestoreSelectSlot); - public static string SaveDiskFull => StringUtility.ConvertSystemResourceText(Resources.SaveDiskFull); + public static string SaveDiskFull => StringUtility.ConvertSystemResourceText(PlayerResources.SaveDiskFull); - public static string SaveRestoreSelectName => StringUtility.ConvertSystemResourceText(Resources.SaveRestoreSelectName); + public static string SaveRestoreSelectName => StringUtility.ConvertSystemResourceText(PlayerResources.SaveRestoreSelectName); - public static string TraceProcedureNumber => StringUtility.ConvertSystemResourceText(Resources.TraceProcedureNumber); + public static string TraceProcedureNumber => StringUtility.ConvertSystemResourceText(PlayerResources.TraceProcedureNumber); - public static string TraceProcedureText => StringUtility.ConvertSystemResourceText(Resources.TraceProcedureText); + public static string TraceProcedureText => StringUtility.ConvertSystemResourceText(PlayerResources.TraceProcedureText); - public static string TraceFunctionNumber => StringUtility.ConvertSystemResourceText(Resources.TraceFunctionNumber); + public static string TraceFunctionNumber => StringUtility.ConvertSystemResourceText(PlayerResources.TraceFunctionNumber); - public static string TraceFunctionResult => StringUtility.ConvertSystemResourceText(Resources.TraceFunctionResult); + public static string TraceFunctionResult => StringUtility.ConvertSystemResourceText(PlayerResources.TraceFunctionResult); - public static string TraceFunctionResultTrue => StringUtility.ConvertSystemResourceText(Resources.TraceFunctionResultTrue); + public static string TraceFunctionResultTrue => StringUtility.ConvertSystemResourceText(PlayerResources.TraceFunctionResultTrue); - public static string TraceFunctionResultFalse => StringUtility.ConvertSystemResourceText(Resources.TraceFunctionResultFalse); + public static string TraceFunctionResultFalse => StringUtility.ConvertSystemResourceText(PlayerResources.TraceFunctionResultFalse); - public static string TraceProcedureReturn => StringUtility.ConvertSystemResourceText(Resources.TraceProcedureReturn); + public static string TraceProcedureReturn => StringUtility.ConvertSystemResourceText(PlayerResources.TraceProcedureReturn); - public static string TraceParameterStart => StringUtility.ConvertSystemResourceText(Resources.TraceParameterStart); + public static string TraceParameterStart => StringUtility.ConvertSystemResourceText(PlayerResources.TraceParameterStart); - public static string TraceParameterEnd => StringUtility.ConvertSystemResourceText(Resources.TraceParameterEnd); + public static string TraceParameterEnd => StringUtility.ConvertSystemResourceText(PlayerResources.TraceParameterEnd); - public static string TraceParameterSeparator => StringUtility.ConvertSystemResourceText(Resources.TraceParameterSeparator); + public static string TraceParameterSeparator => StringUtility.ConvertSystemResourceText(PlayerResources.TraceParameterSeparator); - public static string TraceParameterSigned => StringUtility.ConvertSystemResourceText(Resources.TraceParameterSigned); + public static string TraceParameterSigned => StringUtility.ConvertSystemResourceText(PlayerResources.TraceParameterSigned); - public static string TraceParameterUnsigned => StringUtility.ConvertSystemResourceText(Resources.TraceParameterUnsigned); + public static string TraceParameterUnsigned => StringUtility.ConvertSystemResourceText(PlayerResources.TraceParameterUnsigned); public static string KernelVersion2(string name, string version, string id, string platform, string interpreter) { - return StringUtility.ConvertSystemResourceText(string.Format(CultureInfo.CurrentUICulture, Resources.KernelVersion2, name, version, id, platform, interpreter)); + return StringUtility.ConvertSystemResourceText(string.Format(CultureInfo.CurrentUICulture, PlayerResources.KernelVersion2, name, version, id, platform, interpreter)); } } diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/UserInterfaceTheme.cs b/src/Woohoo.Agi.Engine/Interpreter/UserInterfaceTheme.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Interpreter/UserInterfaceTheme.cs rename to src/Woohoo.Agi.Engine/Interpreter/UserInterfaceTheme.cs index bb34c13..d0b29f7 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/UserInterfaceTheme.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/UserInterfaceTheme.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Operating system. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/Variables.cs b/src/Woohoo.Agi.Engine/Interpreter/Variables.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/Variables.cs rename to src/Woohoo.Agi.Engine/Interpreter/Variables.cs index 621b3ee..623f32a 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/Variables.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/Variables.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Constants for the state variables. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ViewObject.cs b/src/Woohoo.Agi.Engine/Interpreter/ViewObject.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Interpreter/ViewObject.cs rename to src/Woohoo.Agi.Engine/Interpreter/ViewObject.cs index 4a16eb1..5d2315d 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ViewObject.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ViewObject.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; public class ViewObject { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ViewObjectFlags.cs b/src/Woohoo.Agi.Engine/Interpreter/ViewObjectFlags.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Interpreter/ViewObjectFlags.cs rename to src/Woohoo.Agi.Engine/Interpreter/ViewObjectFlags.cs index ca8c5b6..d5550cb 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ViewObjectFlags.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ViewObjectFlags.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// View object flags. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ViewObjectManager.cs b/src/Woohoo.Agi.Engine/Interpreter/ViewObjectManager.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/ViewObjectManager.cs rename to src/Woohoo.Agi.Engine/Interpreter/ViewObjectManager.cs index 20ecfb3..ab7804e 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ViewObjectManager.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ViewObjectManager.cs @@ -1,9 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; public class ViewObjectManager { diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/ViewObjectTable.cs b/src/Woohoo.Agi.Engine/Interpreter/ViewObjectTable.cs similarity index 97% rename from src/Woohoo.Agi.Interpreter/Interpreter/ViewObjectTable.cs rename to src/Woohoo.Agi.Engine/Interpreter/ViewObjectTable.cs index c08400d..5974e21 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/ViewObjectTable.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/ViewObjectTable.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Table of view objects. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/WalkMode.cs b/src/Woohoo.Agi.Engine/Interpreter/WalkMode.cs similarity index 91% rename from src/Woohoo.Agi.Interpreter/Interpreter/WalkMode.cs rename to src/Woohoo.Agi.Engine/Interpreter/WalkMode.cs index 2940aec..da12613 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/WalkMode.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/WalkMode.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; /// /// Mode used to control ego. diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/WindowManager.cs b/src/Woohoo.Agi.Engine/Interpreter/WindowManager.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Interpreter/WindowManager.cs rename to src/Woohoo.Agi.Engine/Interpreter/WindowManager.cs index 71a64b6..427c611 100644 --- a/src/Woohoo.Agi.Interpreter/Interpreter/WindowManager.cs +++ b/src/Woohoo.Agi.Engine/Interpreter/WindowManager.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Interpreter; +namespace Woohoo.Agi.Engine.Interpreter; public class WindowManager { diff --git a/src/Woohoo.Agi.Interpreter/InterpreterMajorVersion.cs b/src/Woohoo.Agi.Engine/InterpreterMajorVersion.cs similarity index 94% rename from src/Woohoo.Agi.Interpreter/InterpreterMajorVersion.cs rename to src/Woohoo.Agi.Engine/InterpreterMajorVersion.cs index f430a8f..2412cf6 100644 --- a/src/Woohoo.Agi.Interpreter/InterpreterMajorVersion.cs +++ b/src/Woohoo.Agi.Engine/InterpreterMajorVersion.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi; +namespace Woohoo.Agi.Engine; /// /// Agi interpreter major version. diff --git a/src/Woohoo.Agi.Interpreter/InterpreterVersion.cs b/src/Woohoo.Agi.Engine/InterpreterVersion.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/InterpreterVersion.cs rename to src/Woohoo.Agi.Engine/InterpreterVersion.cs index 63c3999..87cada1 100644 --- a/src/Woohoo.Agi.Interpreter/InterpreterVersion.cs +++ b/src/Woohoo.Agi.Engine/InterpreterVersion.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi; +namespace Woohoo.Agi.Engine; /// /// Version of the interpreter, based on the PC interpreter version. diff --git a/src/Woohoo.Agi.Interpreter/Platform.cs b/src/Woohoo.Agi.Engine/Platform.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Platform.cs rename to src/Woohoo.Agi.Engine/Platform.cs index 675bbdd..df65d13 100644 --- a/src/Woohoo.Agi.Interpreter/Platform.cs +++ b/src/Woohoo.Agi.Engine/Platform.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi; +namespace Woohoo.Agi.Engine; /// /// Operating system. diff --git a/src/Woohoo.Agi.Interpreter/Properties/AssemblyInfo.cs b/src/Woohoo.Agi.Engine/Properties/AssemblyInfo.cs similarity index 100% rename from src/Woohoo.Agi.Interpreter/Properties/AssemblyInfo.cs rename to src/Woohoo.Agi.Engine/Properties/AssemblyInfo.cs diff --git a/src/Woohoo.Agi.Interpreter/Resources/InventoryItem.cs b/src/Woohoo.Agi.Engine/Resources/InventoryItem.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Resources/InventoryItem.cs rename to src/Woohoo.Agi.Engine/Resources/InventoryItem.cs index fe49c9f..f5ad102 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/InventoryItem.cs +++ b/src/Woohoo.Agi.Engine/Resources/InventoryItem.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources; +namespace Woohoo.Agi.Engine.Resources; /// /// Represents an inventory object. diff --git a/src/Woohoo.Agi.Interpreter/Resources/InventoryResource.cs b/src/Woohoo.Agi.Engine/Resources/InventoryResource.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Resources/InventoryResource.cs rename to src/Woohoo.Agi.Engine/Resources/InventoryResource.cs index 9ca06c8..ced2f85 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/InventoryResource.cs +++ b/src/Woohoo.Agi.Engine/Resources/InventoryResource.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources; +namespace Woohoo.Agi.Engine.Resources; /// /// Represents the set of inventory objects. diff --git a/src/Woohoo.Agi.Interpreter/Resources/LogicResource.cs b/src/Woohoo.Agi.Engine/Resources/LogicResource.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Resources/LogicResource.cs rename to src/Woohoo.Agi.Engine/Resources/LogicResource.cs index 3e8ef57..76e55af 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/LogicResource.cs +++ b/src/Woohoo.Agi.Engine/Resources/LogicResource.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources; +namespace Woohoo.Agi.Engine.Resources; /// /// Represents a logic resource. diff --git a/src/Woohoo.Agi.Interpreter/Resources/PictureResource.cs b/src/Woohoo.Agi.Engine/Resources/PictureResource.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Resources/PictureResource.cs rename to src/Woohoo.Agi.Engine/Resources/PictureResource.cs index a91a524..f3d2464 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/PictureResource.cs +++ b/src/Woohoo.Agi.Engine/Resources/PictureResource.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources; +namespace Woohoo.Agi.Engine.Resources; /// /// Represents a picture resource, which is a vector image. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/GameNotFoundException.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/GameNotFoundException.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/GameNotFoundException.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/GameNotFoundException.cs index 0c06cab..9c34f51 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/GameNotFoundException.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/GameNotFoundException.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// An AGI game was not found. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/IVolumeDecoder.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/IVolumeDecoder.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/IVolumeDecoder.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/IVolumeDecoder.cs index e230342..915d16f 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/IVolumeDecoder.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/IVolumeDecoder.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine; /// /// Supports decoding of a volume file. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/InventoryDecoder.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/InventoryDecoder.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/InventoryDecoder.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/InventoryDecoder.cs index bd9e7b3..afdf6f9 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/InventoryDecoder.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/InventoryDecoder.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; /// /// Inventory resource decoder. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/LogicDecoder.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/LogicDecoder.cs similarity index 97% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/LogicDecoder.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/LogicDecoder.cs index 9a6e336..41513dd 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/LogicDecoder.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/LogicDecoder.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; /// /// Logic resource decoder. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/LzwDecompress.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/LzwDecompress.cs similarity index 99% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/LzwDecompress.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/LzwDecompress.cs index 406a152..c01d3bf 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/LzwDecompress.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/LzwDecompress.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// LZW decompression class. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/PictureCompression.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/PictureCompression.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/PictureCompression.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/PictureCompression.cs index 0a3e73d..7924f0d 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/PictureCompression.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/PictureCompression.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// Performs Agi version 3 picture resource decompression. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/PictureDecoder.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/PictureDecoder.cs similarity index 88% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/PictureDecoder.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/PictureDecoder.cs index b2aa5b5..7c777f1 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/PictureDecoder.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/PictureDecoder.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; /// /// Picture resource decoder. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/ResourceLoader.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/ResourceLoader.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/ResourceLoader.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/ResourceLoader.cs index f4a1ba8..c815ef7 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/ResourceLoader.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/ResourceLoader.cs @@ -1,9 +1,9 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine; /// /// Loads game resources for an AGI game. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/RleCompression.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/RleCompression.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/RleCompression.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/RleCompression.cs index 8fc2a8c..58245ee 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/RleCompression.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/RleCompression.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// Performs Rle decompression on an array of bytes (bitmap). diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/RleCompressionInvalidRepeatCountException.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/RleCompressionInvalidRepeatCountException.cs similarity index 97% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/RleCompressionInvalidRepeatCountException.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/RleCompressionInvalidRepeatCountException.cs index fdc9392..1a2738d 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/RleCompressionInvalidRepeatCountException.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/RleCompressionInvalidRepeatCountException.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// The exception that is thrown when the pixel color repeat count is invalid. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/SoundDecoder.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/SoundDecoder.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/SoundDecoder.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/SoundDecoder.cs index 9c5fb66..f302772 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/SoundDecoder.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/SoundDecoder.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; /// /// Sound resource decoder. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/StringDecoder.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/StringDecoder.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/StringDecoder.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/StringDecoder.cs index ca69ab8..ba42775 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/StringDecoder.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/StringDecoder.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// Decoding of binary data into strings. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/ViewDecoder.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/ViewDecoder.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/ViewDecoder.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/ViewDecoder.cs index 6bfde96..08c2bb8 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/ViewDecoder.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/ViewDecoder.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; /// /// View resource decoder. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VocabularyDecoder.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/VocabularyDecoder.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/VocabularyDecoder.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/VocabularyDecoder.cs index 42e480e..6877317 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VocabularyDecoder.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/VocabularyDecoder.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; -using Woohoo.Agi.Resources; +using Woohoo.Agi.Engine.Resources; /// /// Vocabulary resource decoder. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VocabularyInvalidRepeatCountException.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/VocabularyInvalidRepeatCountException.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/VocabularyInvalidRepeatCountException.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/VocabularyInvalidRepeatCountException.cs index 60981be..8681221 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VocabularyInvalidRepeatCountException.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/VocabularyInvalidRepeatCountException.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// The exception that is thrown when the character repeat count is invalid. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoder.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoder.cs similarity index 97% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoder.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoder.cs index f10fbee..8d24739 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoder.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoder.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// Volume file decoding class. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoderInvalidResourceOffsetException.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoderInvalidResourceOffsetException.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoderInvalidResourceOffsetException.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoderInvalidResourceOffsetException.cs index 7b7b4ea..8e8eb0f 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoderInvalidResourceOffsetException.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoderInvalidResourceOffsetException.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// The exception that is thrown when the resource offset, as specified in the resource map entry, goes past the end of the volume binary data. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoderInvalidResourceSignatureException.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoderInvalidResourceSignatureException.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoderInvalidResourceSignatureException.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoderInvalidResourceSignatureException.cs index c66dd2a..d05286e 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoderInvalidResourceSignatureException.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoderInvalidResourceSignatureException.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// The exception that is thrown when the resource signature (magic number) is incorrect. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoderV2.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoderV2.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoderV2.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoderV2.cs index 06ea1ed..52b6853 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoderV2.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoderV2.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine; /// /// Volume file decoding for AGI version 2. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoderV3.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoderV3.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoderV3.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoderV3.cs index 4925ded..ed7b2e1 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeDecoderV3.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeDecoderV3.cs @@ -3,9 +3,9 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine; /// /// Volume file decoding for AGI version 3. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeFilesNotFoundException.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeFilesNotFoundException.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeFilesNotFoundException.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/VolumeFilesNotFoundException.cs index 725fdaa..65b6467 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeFilesNotFoundException.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeFilesNotFoundException.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// The exception that is thrown when the volume files are not found in the game folder. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeResourceMap.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeResourceMap.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeResourceMap.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/VolumeResourceMap.cs index 922de19..109531f 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeResourceMap.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeResourceMap.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// The resource map contains the location (in the volumes) of all the game resources. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeResourceMapEntry.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeResourceMapEntry.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeResourceMapEntry.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/VolumeResourceMapEntry.cs index c203e1e..cfa9d8c 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeResourceMapEntry.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeResourceMapEntry.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// The resource map entry contains the location of a resource (in the volumes). diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeResourceMapEntryCollection.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeResourceMapEntryCollection.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeResourceMapEntryCollection.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/VolumeResourceMapEntryCollection.cs index 51f9885..c2f9ad8 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/VolumeResourceMapEntryCollection.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/VolumeResourceMapEntryCollection.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// Collection of resource map entries. diff --git a/src/Woohoo.Agi.Interpreter/Resources/Serialization/XorTransform.cs b/src/Woohoo.Agi.Engine/Resources/Serialization/XorTransform.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Resources/Serialization/XorTransform.cs rename to src/Woohoo.Agi.Engine/Resources/Serialization/XorTransform.cs index 525e4c0..e7a3247 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/Serialization/XorTransform.cs +++ b/src/Woohoo.Agi.Engine/Resources/Serialization/XorTransform.cs @@ -1,7 +1,7 @@ // Copyright (c) Hugues Valois. All rights reserved. // Licensed under the X11 license. See LICENSE in the project root for license information. -namespace Woohoo.Agi.Resources.Serialization; +namespace Woohoo.Agi.Engine.Resources.Serialization; /// /// Performs an XOR transformation on an input buffer. diff --git a/src/Woohoo.Agi.Interpreter/Resources/SoundResource.cs b/src/Woohoo.Agi.Engine/Resources/SoundResource.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Resources/SoundResource.cs rename to src/Woohoo.Agi.Engine/Resources/SoundResource.cs index a34e401..55fa527 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/SoundResource.cs +++ b/src/Woohoo.Agi.Engine/Resources/SoundResource.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources; +namespace Woohoo.Agi.Engine.Resources; /// /// Represents a sound resource. diff --git a/src/Woohoo.Agi.Interpreter/Resources/ViewCel.cs b/src/Woohoo.Agi.Engine/Resources/ViewCel.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Resources/ViewCel.cs rename to src/Woohoo.Agi.Engine/Resources/ViewCel.cs index 3879942..7c53cb5 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/ViewCel.cs +++ b/src/Woohoo.Agi.Engine/Resources/ViewCel.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources; +namespace Woohoo.Agi.Engine.Resources; /// /// Represents an animation cel. diff --git a/src/Woohoo.Agi.Interpreter/Resources/ViewLoop.cs b/src/Woohoo.Agi.Engine/Resources/ViewLoop.cs similarity index 96% rename from src/Woohoo.Agi.Interpreter/Resources/ViewLoop.cs rename to src/Woohoo.Agi.Engine/Resources/ViewLoop.cs index 28f68fa..4e9b4cb 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/ViewLoop.cs +++ b/src/Woohoo.Agi.Engine/Resources/ViewLoop.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources; +namespace Woohoo.Agi.Engine.Resources; /// /// Represents an animation loop, which is a made of cels displayed in a 'loop'. diff --git a/src/Woohoo.Agi.Interpreter/Resources/ViewResource.cs b/src/Woohoo.Agi.Engine/Resources/ViewResource.cs similarity index 97% rename from src/Woohoo.Agi.Interpreter/Resources/ViewResource.cs rename to src/Woohoo.Agi.Engine/Resources/ViewResource.cs index 91ab922..99d927f 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/ViewResource.cs +++ b/src/Woohoo.Agi.Engine/Resources/ViewResource.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources; +namespace Woohoo.Agi.Engine.Resources; /// /// Represents a view resource. The view resource contains multiple related loops of animation. diff --git a/src/Woohoo.Agi.Interpreter/Resources/VocabularyResource.cs b/src/Woohoo.Agi.Engine/Resources/VocabularyResource.cs similarity index 98% rename from src/Woohoo.Agi.Interpreter/Resources/VocabularyResource.cs rename to src/Woohoo.Agi.Engine/Resources/VocabularyResource.cs index 9d28592..0f3027a 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/VocabularyResource.cs +++ b/src/Woohoo.Agi.Engine/Resources/VocabularyResource.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources; +namespace Woohoo.Agi.Engine.Resources; /// /// Represents a vocabulary resource. diff --git a/src/Woohoo.Agi.Interpreter/Resources/VocabularyWordFamily.cs b/src/Woohoo.Agi.Engine/Resources/VocabularyWordFamily.cs similarity index 95% rename from src/Woohoo.Agi.Interpreter/Resources/VocabularyWordFamily.cs rename to src/Woohoo.Agi.Engine/Resources/VocabularyWordFamily.cs index d3afc0d..0696c91 100644 --- a/src/Woohoo.Agi.Interpreter/Resources/VocabularyWordFamily.cs +++ b/src/Woohoo.Agi.Engine/Resources/VocabularyWordFamily.cs @@ -3,7 +3,7 @@ #nullable enable -namespace Woohoo.Agi.Resources; +namespace Woohoo.Agi.Engine.Resources; /// /// Represents a family of words (synonyms). diff --git a/src/Woohoo.Agi.Interpreter/Woohoo.Agi.Interpreter.csproj b/src/Woohoo.Agi.Engine/Woohoo.Agi.Engine.csproj similarity index 81% rename from src/Woohoo.Agi.Interpreter/Woohoo.Agi.Interpreter.csproj rename to src/Woohoo.Agi.Engine/Woohoo.Agi.Engine.csproj index 022c11e..86b92be 100644 --- a/src/Woohoo.Agi.Interpreter/Woohoo.Agi.Interpreter.csproj +++ b/src/Woohoo.Agi.Engine/Woohoo.Agi.Engine.csproj @@ -1,4 +1,4 @@ - + net9.0 @@ -31,7 +31,7 @@ ResXFileCodeGenerator Databases.Designer.cs - Woohoo.Agi.Detection + Woohoo.Agi.Engine.Detection True @@ -47,13 +47,13 @@ True Errors.resx - + ResXFileCodeGenerator - Resources.Designer.cs - Woohoo.Agi.Interpreter + PlayerResources.Designer.cs + Woohoo.Agi.Engine.Interpreter - - Resources.resx + + PlayerResources.resx True True diff --git a/src/Woohoo.Agi.Interpreter/Interpreter/GameStartInfoComparer.cs b/src/Woohoo.Agi.Interpreter/Interpreter/GameStartInfoComparer.cs deleted file mode 100644 index 731271b..0000000 --- a/src/Woohoo.Agi.Interpreter/Interpreter/GameStartInfoComparer.cs +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) Hugues Valois. All rights reserved. -// Licensed under the X11 license. See LICENSE in the project root for license information. - -#nullable enable - -namespace Woohoo.Agi.Interpreter; - -/// -/// Comparer for alphabetical sorting of games. -/// -public sealed class GameStartInfoComparer : IComparer -{ - int IComparer.Compare(GameStartInfo? x, GameStartInfo? y) - { - if (x is null && y is null) - { - return 0; - } - - if (x is null) - { - return 1; - } - - if (y is null) - { - return -1; - } - - string nameX = x.Name + x.Version; - string nameY = y.Name + y.Version; - - return nameX.CompareTo(nameY); - } -} diff --git a/src/Woohoo.Agi.Player/AgiPlayer.cs b/src/Woohoo.Agi.Player/AgiPlayer.cs index acfdc25..2da06fa 100644 --- a/src/Woohoo.Agi.Player/AgiPlayer.cs +++ b/src/Woohoo.Agi.Player/AgiPlayer.cs @@ -3,8 +3,9 @@ namespace Woohoo.Agi.Player; -using Woohoo.Agi.Detection; -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine; +using Woohoo.Agi.Engine.Detection; +using Woohoo.Agi.Engine.Interpreter; internal abstract class AgiPlayer { diff --git a/src/Woohoo.Agi.Player/Backend/Sdl/SdlGraphicsDriver.cs b/src/Woohoo.Agi.Player/Backend/Sdl/SdlGraphicsDriver.cs index ae52e5c..2cccbea 100644 --- a/src/Woohoo.Agi.Player/Backend/Sdl/SdlGraphicsDriver.cs +++ b/src/Woohoo.Agi.Player/Backend/Sdl/SdlGraphicsDriver.cs @@ -4,7 +4,7 @@ namespace Woohoo.Agi.Player.Backend.Sdl; #if USE_SDL -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine.Interpreter; using static Woohoo.Agi.Player.Backend.Sdl.NativeMethods; internal sealed class SdlGraphicsDriver : IGraphicsDriver diff --git a/src/Woohoo.Agi.Player/Backend/Sdl/SdlInputDriver.cs b/src/Woohoo.Agi.Player/Backend/Sdl/SdlInputDriver.cs index eb22aaf..67f0bfb 100644 --- a/src/Woohoo.Agi.Player/Backend/Sdl/SdlInputDriver.cs +++ b/src/Woohoo.Agi.Player/Backend/Sdl/SdlInputDriver.cs @@ -6,7 +6,7 @@ namespace Woohoo.Agi.Player.Backend.Sdl; using System.Diagnostics.CodeAnalysis; #if USE_SDL -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine.Interpreter; using static Woohoo.Agi.Player.Backend.Sdl.NativeMethods; internal class SdlInputDriver : IInputDriver diff --git a/src/Woohoo.Agi.Player/Backend/Sdl/SdlPlayer.cs b/src/Woohoo.Agi.Player/Backend/Sdl/SdlPlayer.cs index b9bfbba..666077a 100644 --- a/src/Woohoo.Agi.Player/Backend/Sdl/SdlPlayer.cs +++ b/src/Woohoo.Agi.Player/Backend/Sdl/SdlPlayer.cs @@ -4,7 +4,7 @@ namespace Woohoo.Agi.Player.Backend.Sdl; #if USE_SDL -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine.Interpreter; using static Woohoo.Agi.Player.Backend.Sdl.NativeMethods; internal class SdlPlayer : AgiPlayer diff --git a/src/Woohoo.Agi.Player/Backend/Sdl/SdlSoundChannel.cs b/src/Woohoo.Agi.Player/Backend/Sdl/SdlSoundChannel.cs index 5ce93f2..848eeaf 100644 --- a/src/Woohoo.Agi.Player/Backend/Sdl/SdlSoundChannel.cs +++ b/src/Woohoo.Agi.Player/Backend/Sdl/SdlSoundChannel.cs @@ -4,7 +4,7 @@ namespace Woohoo.Agi.Player.Backend.Sdl; #if USE_SDL -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine.Interpreter; internal class SdlSoundChannel { diff --git a/src/Woohoo.Agi.Player/Backend/Sdl/SdlSoundPcmDriver.cs b/src/Woohoo.Agi.Player/Backend/Sdl/SdlSoundPcmDriver.cs index 0352323..6f893c2 100644 --- a/src/Woohoo.Agi.Player/Backend/Sdl/SdlSoundPcmDriver.cs +++ b/src/Woohoo.Agi.Player/Backend/Sdl/SdlSoundPcmDriver.cs @@ -4,7 +4,7 @@ namespace Woohoo.Agi.Player.Backend.Sdl; #if USE_SDL -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine.Interpreter; using static Woohoo.Agi.Player.Backend.Sdl.NativeMethods; internal sealed class SdlSoundPcmDriver : ISoundPcmDriver diff --git a/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2GraphicsDriver.cs b/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2GraphicsDriver.cs index ba75df0..2d23024 100644 --- a/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2GraphicsDriver.cs +++ b/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2GraphicsDriver.cs @@ -4,7 +4,7 @@ namespace Woohoo.Agi.Player.Backend.Sdl2; #if USE_SDL2 -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine; using static Woohoo.Agi.Player.Backend.Sdl2.NativeMethods; internal sealed class Sdl2GraphicsDriver : IGraphicsDriver diff --git a/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2InputDriver.cs b/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2InputDriver.cs index c061528..6d1a7e5 100644 --- a/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2InputDriver.cs +++ b/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2InputDriver.cs @@ -4,7 +4,7 @@ namespace Woohoo.Agi.Player.Backend.Sdl2; #if USE_SDL2 -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine; using static Woohoo.Agi.Player.Backend.Sdl2.NativeMethods; internal class Sdl2InputDriver : IInputDriver diff --git a/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2Player.cs b/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2Player.cs index 73abb0e..e2dc133 100644 --- a/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2Player.cs +++ b/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2Player.cs @@ -4,7 +4,7 @@ namespace Woohoo.Agi.Player.Backend.Sdl2; #if USE_SDL2 -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine; using static Woohoo.Agi.Player.Backend.Sdl2.NativeMethods; internal class Sdl2Player : AgiPlayer diff --git a/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2SoundChannel.cs b/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2SoundChannel.cs index 63eabc8..79db78d 100644 --- a/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2SoundChannel.cs +++ b/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2SoundChannel.cs @@ -4,7 +4,7 @@ namespace Woohoo.Agi.Player.Backend.Sdl2; #if USE_SDL2 -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine; internal class Sdl2SoundChannel { diff --git a/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2SoundPcmDriver.cs b/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2SoundPcmDriver.cs index fcf595c..1b219da 100644 --- a/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2SoundPcmDriver.cs +++ b/src/Woohoo.Agi.Player/Backend/Sdl2/Sdl2SoundPcmDriver.cs @@ -4,7 +4,7 @@ namespace Woohoo.Agi.Player.Backend.Sdl2; #if USE_SDL2 -using Woohoo.Agi.Interpreter; +using Woohoo.Agi.Engine; using static Woohoo.Agi.Player.Backend.Sdl2.NativeMethods; internal sealed class Sdl2SoundPcmDriver : ISoundPcmDriver diff --git a/src/Woohoo.Agi.Player/Woohoo.Agi.Player.csproj b/src/Woohoo.Agi.Player/Woohoo.Agi.Player.csproj index 45e2115..d9cbe62 100644 --- a/src/Woohoo.Agi.Player/Woohoo.Agi.Player.csproj +++ b/src/Woohoo.Agi.Player/Woohoo.Agi.Player.csproj @@ -67,7 +67,7 @@ - +