Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sil-quirk/sil-q
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.5.0
Choose a base ref
...
head repository: sil-quirk/sil-q
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 15 commits
  • 20 files changed
  • 4 contributors

Commits on Oct 11, 2022

  1. macOS: Support retina display (#96)

    Apply angband/angband#416 changes to support retina on macOS.
    motemen authored Oct 11, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    092e187 View commit details

Commits on Oct 12, 2022

  1. Mac: only allow saving from the menu bar when the core game is waitin…

    …g for a player command. That's in line with the Windows front end and prevents saving while at the "You die. [more]" prompt or while at the menu to start the game or enter the tutorial. (#98)
    backwardsEric authored Oct 12, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1f0a0b9 View commit details

Commits on Oct 16, 2022

  1. Updates to tiles and manual.

    sil-quirk committed Oct 16, 2022
    Copy the full SHA
    8c9cd7c View commit details

Commits on Oct 17, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    1ea79d1 View commit details

Commits on Nov 6, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    5c1a5aa View commit details

Commits on Nov 17, 2022

  1. In smithing add flag or ability menus for artefacts, don't add invali…

    …d option if valid option is highlighted and a letter is pressed for an invalid option. Plugs exploit reported here, http://angband.oook.cz/forum/showthread.php?t=11375 . (#102)
    backwardsEric authored Nov 17, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    2710b11 View commit details

Commits on Dec 26, 2022

  1. macOS: only allow changing the graphics mode while waiting for a game…

    … command or while on the splash screen (#103)
    backwardsEric authored Dec 26, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    f6e2d33 View commit details

Commits on Dec 27, 2022

  1. Support for compilation with MSVC 2019.

    sil-quirk committed Dec 27, 2022
    Copy the full SHA
    eb7e396 View commit details

Commits on Jun 5, 2023

  1. Support for MSVC 2019 updated to MSVC 2022.

    sil-quirk committed Jun 5, 2023
    Copy the full SHA
    5cd4b78 View commit details
  2. Uncommenting process_player_name to enable -u.

    sil-quirk committed Jun 5, 2023
    Copy the full SHA
    51fe98d View commit details

Commits on Oct 31, 2023

  1. Copy the full SHA
    e81113f View commit details
  2. Fix for distance_squared.

    sil-quirk committed Oct 31, 2023
    Copy the full SHA
    968f44b View commit details
  3. Fix for riposte not being added to monster lore.

    sil-quirk committed Oct 31, 2023
    Copy the full SHA
    beb980b View commit details

Commits on Sep 15, 2024

  1. Call make_patches_of_sunlight() after placing player (#114)

    Also constrain trial locations for patches of sunlight near player to be within the bounds of the cave.  Resolves #113 .
    backwardsEric authored Sep 15, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    0a87ce3 View commit details

Commits on Oct 2, 2024

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    ace2dc8 View commit details
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -73,6 +73,22 @@ this file for advice on your specific system.

Go back to the Sil folder and run Sil.exe.

### Windows with Visual Studio 2022 (experimental, tested with Sil-Q on MSVC 2022)

1. Acquire Microsoft Visual Studio 2022.

2. Compile Sil-Q:

Assuming you have MSVC 2022, this should be as simple as selecting Debug or
Release, opening sil-q.sln in the msvc2019 directory and selecting Build Solution
from the Build menu.

3. Run Sil-Q:

Go back to the Sil folder and run Sil.exe.

NOTE: This is a very new and very raw port, and requires testing.

### OS X with Xcode (tested with Sil-Q; Xcode 11.6 on OS X 10.15.5)

1. Get Xcode from the app store if not installed:
Binary file modified Sil-Q v1.5.0.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions lib/edit/object.txt
Original file line number Diff line number Diff line change
@@ -1748,7 +1748,7 @@ W:0:1:1:0
P:0:0d0:0:0d0
F:EASY_KNOW
D:Once you have got the items, they will be in your inventory.
D: You inventory is displayed in a window to the right of the main map.
D: Your inventory is displayed in a window to the right of the main map.
D: If you cannot see this window, you can also view inventory
D: by pressing (i).

@@ -1789,7 +1789,7 @@ W:0:1:1:0
P:0:0d0:0:0d0
F:EASY_KNOW
D:To find out everything else you need to know about combat,
D: you should read the appropriate pages in the manual.
D: you should read the appropriate pages in the manual
D: that comes with the game. This is
D: not essential for your first few games, but will
D: help you explore the rich tactical combat system in Sil.
4 changes: 2 additions & 2 deletions lib/pref/flvr-new.prf
Original file line number Diff line number Diff line change
@@ -329,10 +329,10 @@ L:213:0x83/0x93
L:214:0x83/0x94

# Yellow potion
L:215:0x83/0x895
L:215:0x83/0x95

# Sky Blue potion
L:216:0x83/0x896
L:216:0x83/0x96

# Shimmering potion
L:217:0x83/0x97
Binary file modified lib/xtra/graf/16x16.bmp
Binary file not shown.
Binary file modified lib/xtra/graf/16x16_microchasm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions msvc2022/sil-q.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29509.3
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sil-q", "sil-q.vcxproj", "{78AC13C0-E998-463E-8473-EF05CA20C3AD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{78AC13C0-E998-463E-8473-EF05CA20C3AD}.Debug|x64.ActiveCfg = Debug|x64
{78AC13C0-E998-463E-8473-EF05CA20C3AD}.Debug|x64.Build.0 = Debug|x64
{78AC13C0-E998-463E-8473-EF05CA20C3AD}.Debug|x86.ActiveCfg = Debug|Win32
{78AC13C0-E998-463E-8473-EF05CA20C3AD}.Debug|x86.Build.0 = Debug|Win32
{78AC13C0-E998-463E-8473-EF05CA20C3AD}.Release|x64.ActiveCfg = Release|x64
{78AC13C0-E998-463E-8473-EF05CA20C3AD}.Release|x64.Build.0 = Release|x64
{78AC13C0-E998-463E-8473-EF05CA20C3AD}.Release|x86.ActiveCfg = Release|Win32
{78AC13C0-E998-463E-8473-EF05CA20C3AD}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8195BA57-139F-4CFD-909A-2D3DB9713966}
EndGlobalSection
EndGlobal
211 changes: 211 additions & 0 deletions msvc2022/sil-q.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,211 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{78AC13C0-E998-463E-8473-EF05CA20C3AD}</ProjectGuid>
<RootNamespace>silq</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<PreprocessorDefinitions>_MBCS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<AdditionalDependencies>Winmm.lib;Msimg32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>echo on
copy Debug\sil-q.exe ..\sil.exe</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<PreprocessorDefinitions>_MBCS;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>Winmm.lib;Msimg32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>echo on
copy Release\sil-q.exe ..\sil.exe</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\src\angband.h" />
<ClInclude Include="..\src\config.h" />
<ClInclude Include="..\src\defines.h" />
<ClInclude Include="..\src\externs.h" />
<ClInclude Include="..\src\h-basic.h" />
<ClInclude Include="..\src\h-config.h" />
<ClInclude Include="..\src\h-define.h" />
<ClInclude Include="..\src\h-system.h" />
<ClInclude Include="..\src\h-type.h" />
<ClInclude Include="..\src\init.h" />
<ClInclude Include="..\src\maid-x11.h" />
<ClInclude Include="..\src\main.h" />
<ClInclude Include="..\src\readdib.h" />
<ClInclude Include="..\src\types.h" />
<ClInclude Include="..\src\z-form.h" />
<ClInclude Include="..\src\z-rand.h" />
<ClInclude Include="..\src\z-term.h" />
<ClInclude Include="..\src\z-util.h" />
<ClInclude Include="..\src\z-virt.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\birth.c" />
<ClCompile Include="..\src\cave.c" />
<ClCompile Include="..\src\cmd1.c" />
<ClCompile Include="..\src\cmd2.c" />
<ClCompile Include="..\src\cmd3.c" />
<ClCompile Include="..\src\cmd4.c" />
<ClCompile Include="..\src\cmd5.c" />
<ClCompile Include="..\src\cmd6.c" />
<ClCompile Include="..\src\dump_items.c" />
<ClCompile Include="..\src\dungeon.c" />
<ClCompile Include="..\src\files.c" />
<ClCompile Include="..\src\generate.c" />
<ClCompile Include="..\src\init1.c" />
<ClCompile Include="..\src\init2.c" />
<ClCompile Include="..\src\load.c" />
<ClCompile Include="..\src\main-win.c" />
<ClCompile Include="..\src\melee1.c" />
<ClCompile Include="..\src\melee2.c" />
<ClCompile Include="..\src\monster1.c" />
<ClCompile Include="..\src\monster2.c" />
<ClCompile Include="..\src\obj-info.c" />
<ClCompile Include="..\src\object1.c" />
<ClCompile Include="..\src\object2.c" />
<ClCompile Include="..\src\randart.c" />
<ClCompile Include="..\src\readdib.c" />
<ClCompile Include="..\src\save.c" />
<ClCompile Include="..\src\spells1.c" />
<ClCompile Include="..\src\spells2.c" />
<ClCompile Include="..\src\squelch.c" />
<ClCompile Include="..\src\tables.c" />
<ClCompile Include="..\src\use-obj.c" />
<ClCompile Include="..\src\util.c" />
<ClCompile Include="..\src\variable.c" />
<ClCompile Include="..\src\wizard1.c" />
<ClCompile Include="..\src\wizard2.c" />
<ClCompile Include="..\src\xtra1.c" />
<ClCompile Include="..\src\xtra2.c" />
<ClCompile Include="..\src\z-form.c" />
<ClCompile Include="..\src\z-rand.c" />
<ClCompile Include="..\src\z-term.c" />
<ClCompile Include="..\src\z-util.c" />
<ClCompile Include="..\src\z-virt.c" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\src\sil.rc" />
</ItemGroup>
<ItemGroup>
<None Include="..\README.md" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
Loading