OSDN Git Service

hengbandforosx/hengbandosx.git
22 months agoBackport change from 3.0.0: GCU: use waddnstr() in the text hook rather than using...
Eric Branlund [Tue, 21 Jun 2022 16:09:49 +0000 (10:09 -0600)]
Backport change from 3.0.0: GCU: use waddnstr() in the text hook rather than using a fixed size temporary buffer to insert a terminating null character

22 months agoBackport change from 3.0.0: GCU: remove assumed window width of 80 columns in wipe...
Eric Branlund [Tue, 21 Jun 2022 16:01:55 +0000 (10:01 -0600)]
Backport change from 3.0.0: GCU: remove assumed window width of 80 columns in wipe hook

2 years agoEnglish: remove duplicated letter in birth screen reroll prompt.
Eric Branlund [Thu, 28 Apr 2022 22:51:09 +0000 (16:51 -0600)]
English: remove duplicated letter in birth screen reroll prompt.

2 years agomac workflow: for universal builds, include what configure would normally set for...
Eric Branlund [Tue, 8 Feb 2022 20:05:50 +0000 (12:05 -0800)]
mac workflow:  for universal builds, include what configure would normally set for the compiler flags

2 years agoMac workflow: also don't override the default SDK.
Eric Branlund [Fri, 28 Jan 2022 01:24:30 +0000 (17:24 -0800)]
Mac workflow: also don't override the default SDK.

2 years agoMac workflow: update comment about the macOS SDK.
Eric Branlund [Fri, 28 Jan 2022 01:18:46 +0000 (17:18 -0800)]
Mac workflow: update comment about the macOS SDK.

2 years agoMac: update notes in src/cocoa/AppDelegate.m for working with Xcode 13
Eric Branlund [Wed, 26 Jan 2022 22:06:56 +0000 (14:06 -0800)]
Mac:  update notes in src/cocoa/AppDelegate.m for working with Xcode 13

2 years agoBetter handle if the font recorded n the preferences is not available. Likely resolv... vmacos1.6.2-c
Eric Branlund [Fri, 20 Aug 2021 18:11:44 +0000 (11:11 -0700)]
Better handle if the font recorded n the preferences is not available.  Likely resolves the underlying problem in https://github.com/backwardsEric/hengband/issues/19 .

2 years agoTest for -fno-strength-reduce support before including it in the compiler flags;...
Eric Branlund [Sat, 14 Aug 2021 22:13:02 +0000 (15:13 -0700)]
Test for -fno-strength-reduce support before including it in the compiler flags; avoids warnings from clang about an unsupported optimization flag.

2 years agomacOS: use an uninstall-local rule rather than a distclean-local rule as the counter...
Eric Branlund [Sat, 14 Aug 2021 22:02:38 +0000 (15:02 -0700)]
macOS:  use an uninstall-local rule rather than a distclean-local rule as the counterpart to the actions from an install-data-local rule.

2 years agoSimply use a Boolean directly rather than do an explicit comparison with YES or NO.
Eric Branlund [Sat, 31 Jul 2021 04:40:45 +0000 (21:40 -0700)]
Simply use a Boolean directly rather than do an explicit comparison with YES or NO.

2 years agomacOS: avoid unused variable warning when compiled with -DNDEBUG.
Eric Branlund [Sat, 31 Jul 2021 04:25:02 +0000 (21:25 -0700)]
macOS:  avoid unused variable warning when compiled with -DNDEBUG.

2 years agoRemove handling of open_when_ready - never set to true and appears to be vestigial.
Eric Branlund [Sun, 25 Jul 2021 22:21:55 +0000 (15:21 -0700)]
Remove handling of open_when_ready - never set to true and appears to be vestigial.

2 years agoMacOS: rationalize handling of Booleans. Use bool/TRUE/FALSE for data interchanged...
Eric Branlund [Sun, 25 Jul 2021 22:18:03 +0000 (15:18 -0700)]
MacOS:  rationalize handling of Booleans.  Use bool/TRUE/FALSE for data interchanged with Hengband's core and BOOL/YES/NO for stuff that's only touched by the Objective C code.  Remove use of Boolean (historical Mac usage).

2 years agoUse AC_CONFIG_FILES() to set the files written by configure. Call AC_OUTPUT() with...
Eric Branlund [Thu, 15 Jul 2021 18:52:16 +0000 (11:52 -0700)]
Use AC_CONFIG_FILES() to set the files written by configure. Call AC_OUTPUT() with no arguments to match its current form and avoid a warning message from autotools.

2 years agoDrop use of AC_TYPE_SIGNAL since it is obsolete when assuming C89 or better.
Eric Branlund [Thu, 15 Jul 2021 18:51:25 +0000 (11:51 -0700)]
Drop use of AC_TYPE_SIGNAL since it is obsolete when assuming C89 or better.

2 years agoDrop use of AC_HEADER_TIME since recent versions of autotools complain about it being...
Eric Branlund [Thu, 15 Jul 2021 18:49:53 +0000 (11:49 -0700)]
Drop use of AC_HEADER_TIME since recent versions of autotools complain about it being obsolescent.

2 years agoDrop AC_HEADER_STDC since recent versions of autotools complain about it being obsole...
Eric Branlund [Thu, 15 Jul 2021 18:48:56 +0000 (11:48 -0700)]
Drop AC_HEADER_STDC since recent versions of autotools complain about it being obsolescent. Drop check for strings.h since no source files currently use it.

2 years agoBackport change from 3.0.0: replace "the" with "this" in Robin Hood's description.
Eric Branlund [Wed, 14 Jul 2021 07:07:58 +0000 (00:07 -0700)]
Backport change from 3.0.0: replace "the" with "this" in Robin Hood's description.

2 years agoBackport change from 3.0.0: fix misuse of "it's".
Eric Branlund [Wed, 14 Jul 2021 07:06:07 +0000 (00:06 -0700)]
Backport change from 3.0.0: fix misuse of "it's".

2 years agoDeclare internal routine as static to avoid warning about missing prototype.
Eric Branlund [Sat, 12 Jun 2021 23:27:55 +0000 (16:27 -0700)]
Declare internal routine as static to avoid warning about missing prototype.

2 years agoRename local variable in playSound to avoid warning about it shadowing a function...
Eric Branlund [Sat, 12 Jun 2021 23:26:35 +0000 (16:26 -0700)]
Rename local variable in playSound to avoid warning about it shadowing a function parameter.

3 years agoAdopt change to mouse event handling (currently unused in Hengband) from Angband...
Eric Branlund [Mon, 17 May 2021 03:01:14 +0000 (20:01 -0700)]
Adopt change to mouse event handling (currently unused in Hengband) from Angband: check for isKeyWindow set to true on [event window] before processing mouse events. That way the initial click in the main window when some other window has focus only changes focus which is the typical Mac behavior.

3 years agoAdjust double-height tile handling (not currently used in Hengband) to better match...
Eric Branlund [Mon, 17 May 2021 03:15:34 +0000 (20:15 -0700)]
Adjust double-height tile handling (not currently used in Hengband) to better match up with the current main-cocoa.m in Angband.

3 years agoTweak the default window layout since rendering changes and constraining window sizes...
Eric Branlund [Sat, 3 Apr 2021 04:32:05 +0000 (21:32 -0700)]
Tweak the default window layout since rendering changes and constraining window sizes to be a multiple o fthe tile size cause overlap with the old layout (at least on an early 2015 13" MacBook Pro; native resolution is 2560 x 1600; using the English interface).  Set the sizes so they should work without overlap using the default fonts (Menlo/Hiragino Maru Gothic 13 pt for the main window; 10 pt for the rest) on the smallest native resolution for currently supported Retina Macs (MacBook; 2304 x 1440).

3 years agoWhen using the median advance to compute the tile size, round the width to the neares...
Eric Branlund [Sat, 3 Apr 2021 02:09:03 +0000 (19:09 -0700)]
When using the median advance to compute the tile size, round the width to the nearest integer (unless it would be zero) rather than round up. That can give a more compact display (for the default font in subwindows the width of each tile will be 6 pixels rather than 7 in English and Japanese; there's no effect on the width per tile in the main window with the default font).

3 years agoUse 32 as the minimum for maxBits to match the declared dimension for window_flag_des...
Eric Branlund [Fri, 2 Apr 2021 08:10:54 +0000 (01:10 -0700)]
Use 32 as the minimum for maxBits to match the declared dimension for window_flag_desc. Update to use unsigned arithmetic for the bits placed in the mask to match it's declaration.

3 years agoAdopt optimization from Angband: only call makeKeyAnOrderFront in AngbandUpdateWindow...
Eric Branlund [Fri, 2 Apr 2021 08:07:24 +0000 (01:07 -0700)]
Adopt optimization from Angband: only call makeKeyAnOrderFront in AngbandUpdateWindowVisibility() if there was a mismatch between which subwindows the core had flagged as active and which subwindows the Mac front end was displaying.

3 years agoAdd workflows to test that Mac and Linux builds work.
Eric Branlund [Tue, 9 Feb 2021 03:47:51 +0000 (19:47 -0800)]
Add workflows to test that Mac and Linux builds work.

3 years agoHad renamed the mask file for the Adam Bolt's tileset to 16x16-mask.bmp (to make... vmacos1.6.2-b
Eric Branlund [Wed, 20 Jan 2021 03:28:33 +0000 (19:28 -0800)]
Had renamed the mask file for the Adam Bolt's tileset to 16x16-mask.bmp (to make it clearer what the mask was for).  Adjust the path in main-win.c to match that.

3 years agoNo longer use Angband 4's version of the tiles (with additional preference files...
Eric Branlund [Wed, 20 Jan 2021 03:24:52 +0000 (19:24 -0800)]
No longer use Angband 4's version of the tiles (with additional preference files to patch up the differences with Hengband's version).  Instead, convert Hengband's versions to PNG with lib/xtra/graf/osx_bmp2png.py script so they're usable with the Mac front-end.  Store the results of the conversion in the repository (so the prerequisites for osx_bmp2png.py aren't needed for ordinary builds; only when the tiles have to be reconverted).  Copy over the converted results during installation.

3 years agoModified to handle Hengband's conversion requirements: allow use of a separate bmp...
Eric Branlund [Wed, 20 Jan 2021 02:46:54 +0000 (18:46 -0800)]
Modified to handle Hengband's conversion requirements: allow use of a separate bmp input file to specify the transparency mask (as is used for Adam Bolt's tile set) and adjust the defaults for the --terrain option so the conversion of the original tile set is easy.

3 years agoAdd the 1.0 version of Adam Bolt's tile set. Downloaded as heng-graf-16x16.tar.gz...
Eric Branlund [Wed, 20 Jan 2021 02:44:06 +0000 (18:44 -0800)]
Add the 1.0 version of Adam Bolt's tile set. Downloaded as heng-graf-16x16.tar.gz (file dated 2003/8/6) from Hengband's osdn page.

3 years agoCopy over the bmp to png conversion script from sil-q (lib/xtra/graf/osx_bmp2png...
Eric Branlund [Wed, 20 Jan 2021 02:42:17 +0000 (18:42 -0800)]
Copy over the bmp to png conversion script from sil-q (lib/xtra/graf/osx_bmp2png.py as of 2020/8/24) so can adapt it to convert Hengband's versions of the tiles rather than reusing Angband 4's versions.

3 years agoCorrect sanity check for a truncated Kanji character at the end of the changed sequen...
Eric Branlund [Tue, 19 Jan 2021 18:59:06 +0000 (10:59 -0800)]
Correct sanity check for a truncated Kanji character at the end of the changed sequence passed to Term_text_cocoa(). Resolves the report of uncleared character in the Japanese version when changing between pages in teh character description (No3.png in https://osdn.net/projects/hengbandforosx/ticket/41228 ). Also fixes at least some of the cases where the Japanese version garbles item names displayed in the shops (No4.png in ticket 41228).

3 years agoSince Cataline no longer includes the Osaka font (it does download it on demand if...
Eric Branlund [Fri, 27 Nov 2020 01:40:57 +0000 (17:40 -0800)]
Since Cataline no longer includes the Osaka font (it does download it on demand if requested), use the Hiragino Maru Gothic ProN ("HiraMaruProN-W4") as the default font when compiled for Japanese.

3 years agoIn the default preferences, use the keys, FontName-0 and FontSize-0, since those...
Eric Branlund [Fri, 27 Nov 2020 01:37:50 +0000 (17:37 -0800)]
In the default preferences, use the keys, FontName-0 and FontSize-0, since those, rather than FontName and FontSize, are what are examined to get the name and sie of the font for the main window.

3 years agoIn drawWChar(), allow for the unlikely possibility that the character to be rendered...
Eric Branlund [Sun, 22 Nov 2020 01:01:19 +0000 (17:01 -0800)]
In drawWChar(), allow for the unlikely possibility that the character to be rendered requires two UniChars (as a surrogate pair). Previously had assumed that only one UniChar was needed and cast the whcar_t to a UniChar.

3 years agoBring over Term_mbcs_cocoa() (currently unused in Hengband) with more checks for...
Eric Branlund [Sun, 22 Nov 2020 00:53:16 +0000 (16:53 -0800)]
Bring over Term_mbcs_cocoa() (currently unused in Hengband) with more checks for bad UTF-8 from Angband.

3 years agoIn case conversion from EUC-JP to Unicode requires surrogate pairs for some character...
Eric Branlund [Sun, 22 Nov 2020 00:43:58 +0000 (16:43 -0800)]
In case conversion from EUC-JP to Unicode requires surrogate pairs for some characters, use CFStringIsSurrogateHighCharacter() and CFStringGetLongCharacterForSurrogatePair() in the conversion. Both require 10.6.

3 years agoFixed up another multi-line comment.
Eric Branlund [Tue, 20 Oct 2020 00:00:36 +0000 (17:00 -0700)]
Fixed up another multi-line comment.

3 years agoFixed up the formatting of more multi-line comments.
Eric Branlund [Thu, 8 Oct 2020 21:04:28 +0000 (14:04 -0700)]
Fixed up the formatting of more multi-line comments.

3 years agoBe more consistent about the format of comments.
Eric Branlund [Tue, 6 Oct 2020 20:29:01 +0000 (13:29 -0700)]
Be more consistent about the format of comments.

3 years agoAligned misaligned indent.
Eric Branlund [Sat, 3 Oct 2020 00:40:30 +0000 (17:40 -0700)]
Aligned misaligned indent.

3 years agoRemoved extraneous semicolon.
Eric Branlund [Wed, 30 Sep 2020 07:02:02 +0000 (00:02 -0700)]
Removed extraneous semicolon.

3 years agoCorrected two misspellings in comments. Added an article in a comment for clarity.
Eric Branlund [Wed, 30 Sep 2020 06:49:59 +0000 (23:49 -0700)]
Corrected two misspellings in comments. Added an article in a comment for clarity.

3 years agoSince the contents of Term aren't used, don't bother to call Term_activate() from...
Eric Branlund [Tue, 29 Sep 2020 21:22:58 +0000 (14:22 -0700)]
Since the contents of Term aren't used, don't bother to call Term_activate() from drawRect().

3 years agoMoved some commented out code and adjusted the comment to match up with what's in...
Eric Branlund [Tue, 29 Sep 2020 06:48:35 +0000 (23:48 -0700)]
Moved some commented out code and adjusted the comment to match up with what's in Angband.

3 years agoChanged to use VERSION_NAME rather than Hengband in a log message.
Eric Branlund [Tue, 29 Sep 2020 01:29:53 +0000 (18:29 -0700)]
Changed to use VERSION_NAME rather than Hengband in a log message.

3 years agoUse VERSION_NAME rather than Hengband when setting name of the directory with the...
Eric Branlund [Tue, 29 Sep 2020 01:23:36 +0000 (18:23 -0700)]
Use VERSION_NAME rather than Hengband when setting name of the directory with the user's files.

3 years agoChanged some whitespace to better match Angband's Mac OS X front end.
Eric Branlund [Tue, 29 Sep 2020 01:15:29 +0000 (18:15 -0700)]
Changed some whitespace to better match Angband's Mac OS X front end.

3 years agoRemoved synthesize statements that are redundant with the property declarations.
Eric Branlund [Mon, 28 Sep 2020 22:12:57 +0000 (15:12 -0700)]
Removed synthesize statements that are redundant with the property declarations.

3 years agoMoved comment so that it makes more sense.
Eric Branlund [Mon, 28 Sep 2020 21:07:52 +0000 (14:07 -0700)]
Moved comment so that it makes more sense.

3 years agoFix some whitespace from a recent change.
Eric Branlund [Tue, 22 Sep 2020 02:03:29 +0000 (19:03 -0700)]
Fix some whitespace from a recent change.

3 years agoUpdate the instructions about rebuilding the nib file for Xcode 12.
Eric Branlund [Tue, 22 Sep 2020 00:25:44 +0000 (17:25 -0700)]
Update the instructions about rebuilding the nib file for Xcode 12.

3 years agoCorrected an incorrect verb tense and made some wording changes in teh comments about...
Eric Branlund [Tue, 22 Sep 2020 00:23:10 +0000 (17:23 -0700)]
Corrected an incorrect verb tense and made some wording changes in teh comments about how to rebuild the nib file.

3 years agoIn the comments about rebuilding the nib file, corrected the paths given for MainMenu...
Eric Branlund [Tue, 22 Sep 2020 00:21:02 +0000 (17:21 -0700)]
In the comments about rebuilding the nib file, corrected the paths given for MainMenu.xib and MainMenu.nib in the source directories.

3 years agoMoved loadPrefs(), initWindows(), and linkTermData() from the application delegate...
Eric Branlund [Tue, 22 Sep 2020 00:06:23 +0000 (17:06 -0700)]
Moved loadPrefs(), initWindows(), and linkTermData() from the application delegate to file-level static functions: that's where they were in the past and they weren't gaining anything by being in the delegate.

3 years agoRearranged whitespace in some comments
Eric Branlund [Mon, 21 Sep 2020 21:30:30 +0000 (14:30 -0700)]
Rearranged whitespace in some comments

3 years agoGroup Term_mbcs_cocoa() with the other Term_* functions.
Eric Branlund [Mon, 21 Sep 2020 21:07:07 +0000 (14:07 -0700)]
Group Term_mbcs_cocoa() with the other Term_* functions.

3 years agoWasn't considering the full GLYPH_COUNT glyphs in updateGlyphInfo() (regression intro...
Eric Branlund [Sun, 20 Sep 2020 01:24:18 +0000 (18:24 -0700)]
Wasn't considering the full GLYPH_COUNT glyphs in updateGlyphInfo() (regression introduced with the change to dynamically allocate working space). Fixed.

3 years agoChanged to remove the empty .deps directory in 'make distclean'.
Eric Branlund [Sun, 23 Aug 2020 02:15:20 +0000 (19:15 -0700)]
Changed to remove the empty .deps directory in 'make distclean'.

3 years agoUpdated comment for create_angband_image() since it no longer looks up the path in...
Eric Branlund [Sat, 15 Aug 2020 06:17:20 +0000 (23:17 -0700)]
Updated comment for create_angband_image() since it no longer looks up the path in the bundle directory.

3 years agoIn Term_pict_cocoa(), step through the passed in arrays in increments of the tile...
Eric Branlund [Sat, 15 Aug 2020 06:05:47 +0000 (23:05 -0700)]
In Term_pict_cocoa(), step through the passed in arrays in increments of the tile width scaling (i.e. 2 in big tile mode; 1 otherwise). Does not matter in the current configuration, with always_pict off, but would matter if always_pict was on or if the core terminal code was modified to pass more than one tile at a time when higher_pict is on.

4 years agoChanged to update the inventory window after eating a staff or wand. version-1-6-2a vmacos1.6.2-a
Eric Branlund [Sun, 12 Apr 2020 02:00:22 +0000 (19:00 -0700)]
Changed to update the inventory window after eating a staff or wand.

4 years agoIn init_saved_floors(), only check for out-of-date save floor files if savefile is...
Eric Branlund [Fri, 10 Apr 2020 06:21:40 +0000 (23:21 -0700)]
In init_saved_floors(), only check for out-of-date save floor files if savefile is not an empty string.  That prevents spurious messages about old temporary files when "New" is selected in the Mac OS X front-end.

4 years agoExtended internal buffer to avoid overflow in English diary entry about player's...
Eric Branlund [Tue, 7 Apr 2020 16:36:11 +0000 (09:36 -0700)]
Extended internal buffer to avoid overflow in English diary entry about player's death.

4 years agoThe setting for big tiles initially shown in the menu wasn't being initialized from...
Eric Branlund [Mon, 6 Apr 2020 00:33:28 +0000 (17:33 -0700)]
The setting for big tiles initially shown in the menu wasn't being initialized from the stored value in the settings and was always shown as big tiles enabled. Fixed.

4 years agoChanged the Macintosh portion of the English readme with the instructions for the...
Eric Branlund [Sun, 5 Apr 2020 23:00:09 +0000 (16:00 -0700)]
Changed the Macintosh portion of the English readme with the instructions for the Mac OS X version.

4 years agoProvide splash screen prompt in the EUC-JP encoding since the source files aren't...
Eric Branlund [Sun, 5 Apr 2020 22:43:54 +0000 (15:43 -0700)]
Provide splash screen prompt in the EUC-JP encoding since the source files aren't preprocessed by nkf in 1.6.2.

4 years agoThe transfer of Mac-specific stuff to src/Makefile.am was incomplete. Added what...
Eric Branlund [Sun, 5 Apr 2020 19:47:04 +0000 (12:47 -0700)]
The transfer of Mac-specific stuff to src/Makefile.am was incomplete.  Added what was missing.

4 years agoAdded trigger names for the keycodes sent by the Mac OS X interface. Have the macros...
Eric Branlund [Sun, 5 Apr 2020 17:03:04 +0000 (10:03 -0700)]
Added trigger names for the keycodes sent by the Mac OS X interface.  Have the macros use the trigger names so most macros can be the same for the classic Mac interface and the Mac OS X one.

4 years agoExcept for specific tile set workarounds, treat ANGBAND_SYS=coc (the Mac OS X front...
Eric Branlund [Sun, 5 Apr 2020 16:49:08 +0000 (09:49 -0700)]
Except for specific tile set workarounds, treat ANGBAND_SYS=coc (the Mac OS X front end) the same as ANGBAND_SYS=mac (the classic Mac front end).

4 years agoWent back to using "coc" for ANGBAND_SYS in the Mac OS X interface to avoid conflicts...
Eric Branlund [Sun, 5 Apr 2020 16:42:51 +0000 (09:42 -0700)]
Went back to using "coc" for ANGBAND_SYS in the Mac OS X interface to avoid conflicts with the classic Mac interface.

4 years agoBrought over .gitignore from the master branch.
Eric Branlund [Sun, 5 Apr 2020 16:31:01 +0000 (09:31 -0700)]
Brought over .gitignore from the master branch.

4 years agoTo avoid a fatal "cannot set permissions correctly" error, set player_egid (and to...
Eric Branlund [Sun, 5 Apr 2020 16:26:38 +0000 (09:26 -0700)]
To avoid a fatal "cannot set permissions correctly" error, set player_egid (and to be safe, player_euid) before calling init_angband().  Did not determine why setting player_egid after the init_angband() call happens to work in Angband and 2.2.1.7.

4 years agoChanged configure.ac and the files for automake to handle building and installing...
Eric Branlund [Sun, 5 Apr 2020 16:22:50 +0000 (09:22 -0700)]
Changed configure.ac and the files for automake to handle building and installing the Mac OS X version.  Mostly matches what's in 2.2.1.7 with the notable excetion that set USE_TRANSPARENCY, SAFE_DIRECTORY, and VERSION_STRING in configure.ac for the Mac version (USE_TRANSPARENCY isn't used in 2.2.1.7; the others could be but currently aren't used there).

4 years agoSince 1.6.2 doesn't set TERM_LEN, TERM_COLOR, and concptr, use the matching types...
Eric Branlund [Sun, 5 Apr 2020 15:25:35 +0000 (08:25 -0700)]
Since 1.6.2 doesn't set TERM_LEN, TERM_COLOR, and concptr, use the matching types for the terminal hooks are compatible.

4 years agoBrought over the Mac OS X interface from 2.2.1.7. Changed ANGBAND_SYS to "mac" ...
Eric Branlund [Sun, 5 Apr 2020 14:49:06 +0000 (07:49 -0700)]
Brought over the Mac OS X interface from 2.2.1.7.  Changed ANGBAND_SYS to "mac" (no older Mac OS X interface unlike in 2.2.1.7 and not worrying about conflict with the classic Mac interface).  Did not bring over all the changelog history; see the main branch for that.

4 years agoAngband 4.2's version of the original tiles, 8x8.png, does not always line up with...
Eric Branlund [Sun, 5 Apr 2020 14:28:50 +0000 (07:28 -0700)]
Angband 4.2's version of the original tiles, 8x8.png, does not always line up with Hengband's 8x8.bmp.  Since 8x8.png is used on the Mac, added workarounds in lib/pref/graf-ori.prf which is conditionally included in graf-xxx.prf.

4 years agoAngband's version of Adam Bolt's tiles does not always line up with Hengband's versio...
Eric Branlund [Sun, 5 Apr 2020 14:27:23 +0000 (07:27 -0700)]
Angband's version of Adam Bolt's tiles does not always line up with Hengband's version.  Since use Angband's version on the Mac, added workarounds in lib/pref/graf-abt.prf which is conditionally included in graf-new.prf.

4 years agoAdded graf field since Hengband does not ANGBAND_GRAF to store the preference file...
Eric Branlund [Sun, 25 Aug 2019 16:13:18 +0000 (09:13 -0700)]
Added graf field since Hengband does not ANGBAND_GRAF to store the preference file name.

4 years agoAdded comment about how Hengband handles the directory for the tile sets and where...
Eric Branlund [Sun, 25 Aug 2019 16:10:34 +0000 (09:10 -0700)]
Added comment about how Hengband handles the directory for the tile sets and where it puts the prf files.

4 years agoCommented out the tile sets which don't already have .prf files in Hengband.
Eric Branlund [Sun, 25 Aug 2019 16:08:55 +0000 (09:08 -0700)]
Commented out the tile sets which don't already have .prf files in Hengband.

4 years agoBrought over the tile set configuration file lib/tiles/list.txt from Angband and...
Eric Branlund [Sun, 25 Aug 2019 16:02:00 +0000 (09:02 -0700)]
Brought over the tile set configuration file lib/tiles/list.txt from Angband and the two tile sets, lib/tiles/adam-bolt/16x16.png and lib/tiles/old/8x8.png, that Angband uses that are also used by Hengband. For placement in the Hengband directory, replace "lib/tiles" in the path names with "lib/xtra/graf". Did not bring over Angband's prf files for the two tile sets: use Hengband's versions in lib/pref.

4 years agoReplaced "tiles set" with "tile set" in error message.
Eric Branlund [Fri, 30 Aug 2019 22:51:40 +0000 (15:51 -0700)]
Replaced "tiles set" with "tile set" in error message.

4 years agoSince ANGBAND_GRAF in Hengband is not the preference file name, added an extra field...
Eric Branlund [Sun, 25 Aug 2019 07:30:24 +0000 (00:30 -0700)]
Since ANGBAND_GRAF in Hengband is not the preference file name, added an extra field in the configuration to be what ANGBAND_GRAF will be assigned for a tile set. Largely replaced the implementation in grafmode.c with something that will work with Hengband's routines. If Hengband chooses to adopt the datafile.h/datafile.c parsing from Angband, then it would make sense to go back to Angband's version of grafmode.c.

4 years agoFor now, keep the GRAPHICS_NONE preprocessor macro in defines.h: comment out the...
Eric Branlund [Sun, 25 Aug 2019 07:12:15 +0000 (00:12 -0700)]
For now, keep the GRAPHICS_NONE preprocessor macro in defines.h: comment out the equivalent definition in grafmode.h.

4 years agoAdded comment to explain relationship with the rest of Hengband.
Eric Branlund [Sun, 25 Aug 2019 07:10:52 +0000 (00:10 -0700)]
Added comment to explain relationship with the rest of Hengband.

4 years agoImported from Angband 4 to support an OS X main program, main-cocoa.m, which expected...
Eric Branlund [Sun, 25 Aug 2019 07:01:57 +0000 (00:01 -0700)]
Imported from Angband 4 to support an OS X main program, main-cocoa.m, which expected that style of tile set configuration. These are the upstream versions, commit 6cbfed5 for grafmode.c and commit 6583275 for grafmode.h in the angband/angband respository, https://github.com/angband/angband .

4 years agoAdded create_needed_dirs() for use on platforms that do not store everything in lib...
Eric Branlund [Sun, 5 Apr 2020 03:39:37 +0000 (20:39 -0700)]
Added create_needed_dirs() for use on platforms that do not store everything in lib.  Modified main.c to make use of create_needed_dirs() in the PRIVATE_USER_PATH case rather than the private function it had used.

4 years agoIn preparation for Mac OS X version, skip the contents of main.c if MACH_O_COCOA...
Eric Branlund [Sun, 5 Apr 2020 02:54:26 +0000 (19:54 -0700)]
In preparation for Mac OS X version, skip the contents of main.c if MACH_O_COCOA is set.

4 years agoIn preparation for a Mac OS X version, allow both Unix and Mac line termination in...
Eric Branlund [Sun, 5 Apr 2020 02:51:56 +0000 (19:51 -0700)]
In preparation for a Mac OS X version, allow both Unix and Mac line termination in my_fgets() if MACH_O_COCOA is set.

4 years agoIn preparation for a Mac OS X version, disable PRIVATE_USER_PATH and SAVEFILE_USE_UID...
Eric Branlund [Sun, 5 Apr 2020 02:49:31 +0000 (19:49 -0700)]
In preparation for a Mac OS X version, disable PRIVATE_USER_PATH and SAVEFILE_USE_UID if MACH_O_COCOA is set.

4 years agoReplaced instances of fprintf(fd, s) with fputs(s, fd) as has been done in 2.2.1...
Eric Branlund [Sat, 4 Apr 2020 22:52:26 +0000 (15:52 -0700)]
Replaced instances of fprintf(fd, s) with fputs(s, fd) as has been done in 2.2.1.7; that avoids potential problems if s contains something that looks like a format specifier and gets rid of compiler warnings.

4 years agoAdded casts for cases where msg_format/format had %ld specifiers but the argument...
Eric Branlund [Sat, 4 Apr 2020 19:38:28 +0000 (12:38 -0700)]
Added casts for cases where msg_format/format had %ld specifiers but the argument passed wasn't equivalent to a long int.

4 years agoAvoided compiler warnings about a 32-bit integer being passed to a %ld or %lu format...
Eric Branlund [Sat, 4 Apr 2020 19:13:07 +0000 (12:13 -0700)]
Avoided compiler warnings about a 32-bit integer being passed to a %ld or %lu format specifier by adding casts, changing the specifier, or changing the type of a local variable.

4 years agoBring over habu's 2012 November 18 change, autoconfから--enable-c99を削除し、stdint.hの有無で判定す...
Eric Branlund [Sat, 4 Apr 2020 17:32:11 +0000 (10:32 -0700)]
Bring over habu's 2012 November 18 change, autoconfから--enable-c99を削除し、stdint.hの有無で判定するよう変更 , to use stdint.h as the basis for configuring fixed-size integer types.  Avoids a problem with the initialization of the random number generator when compiling on Mac OS X.

4 years agoChanged init_file_paths() to treat the passed arguments as readonly in preparation...
Eric Branlund [Sat, 4 Apr 2020 15:57:03 +0000 (08:57 -0700)]
Changed init_file_paths() to treat the passed arguments as readonly in preparation for bringing in a Mac OS X front end.

4 years agoUpdated comment for init_file_paths() to reflect PHO's patch. Most of the comment...
Eric Branlund [Sat, 4 Apr 2020 15:27:50 +0000 (08:27 -0700)]
Updated comment for init_file_paths() to reflect PHO's patch.  Most of the comment text has been copied from 2.2.1.7 (there hasn't been any change to the behavior besides PHO's patch between 1.6.2 and 2.2.1.7).