OSDN Git Service
Eric Branlund [Sun, 25 Dec 2022 18:24:31 +0000 (11:24 -0700)]
Backport adjustment from 3.0.0: shift "Actual" and Current" labels two characters to the right on the third page of the character sheet.
Eric Branlund [Sun, 25 Dec 2022 18:20:03 +0000 (11:20 -0700)]
Backport correction from 3.0.0: avoid duplication of second letter for English names generated by get_table_name().
Eric Branlund [Tue, 20 Dec 2022 13:11:59 +0000 (06:11 -0700)]
MacOS: disable sending commands from the command menu while in an in-game menu
Eric Branlund [Tue, 20 Dec 2022 13:07:05 +0000 (06:07 -0700)]
MacOS: disable changing the tile set of wide tile mode when in an in-game menu
Eric Branlund [Sat, 5 Nov 2022 13:45:19 +0000 (07:45 -0600)]
GCU: backport habu1010's patch, https://github.com/hengband/hengband/pull/2778 , to avoid flickering with TERM_XTRA_CLEAR
Eric Branlund [Sat, 5 Nov 2022 13:43:29 +0000 (07:43 -0600)]
GCU: backport habu1010's patch, https://github.com/hengband/hengband/pull/2772 , to increase the maximum number of terminals
Eric Branlund [Wed, 26 Oct 2022 20:01:19 +0000 (14:01 -0600)]
Mac: cover F17 to F19 in pref-mac.prf for the Cocoa interface. Related to https://github.com/backwardsEric/hengband/issues/25 . Note that the current version of NSEvent.h has entries for function keys up to F35 (0xF726).
Eric Branlund [Mon, 5 Sep 2022 20:45:35 +0000 (14:45 -0600)]
English: fix some typos and a subject/verb mismatch in the rumors (backport from 3.0.0)
Eric Branlund [Thu, 11 Aug 2022 19:41:11 +0000 (13:41 -0600)]
Backport simplified version of change from 3.0.0 so the English activation message for the Phial of Galadriel is "The Phial wells with clear light." rather than "The & Phial~ wells with clear light.".
Eric Branlund [Wed, 22 Jun 2022 21:27:11 +0000 (15:27 -0600)]
Backport Habu's GCU cursor flickering patch from Hengband 3.0.0 https://github.com/hengband/hengband/commit/
d8bc52c20addeb066cea1a2f73e024293ea12100 .
Eric Branlund [Tue, 21 Jun 2022 18:32:57 +0000 (12:32 -0600)]
Declare feat_door and ugbldg as extern to avoid duplicate symbol errors when linking on Debian 11 (gcc 10.2.1 and ld 2.35.2; both as packaged by Debian).
Eric Branlund [Tue, 21 Jun 2022 18:28:18 +0000 (12:28 -0600)]
Fix error introduced when merging the plural_aux() change.
Eric Branlund [Tue, 21 Jun 2022 18:01:47 +0000 (12:01 -0600)]
Fix up some indentation in the GCU color changes.
Eric Branlund [Tue, 21 Jun 2022 16:59:48 +0000 (10:59 -0600)]
Linux/Unix: adapt color handling from Angband 4.2.4 for gcu frontend; with the default colors and terminals with an extended color range, avoids white backgrounds in lit areas and parts of the stats panel and character screen
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
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
Eric Branlund [Tue, 21 Jun 2022 15:45:32 +0000 (09:45 -0600)]
Backport change from 3.0.0: avoid accessing before the start of the buffer in plural_aux().
Eric Branlund [Thu, 28 Apr 2022 22:44:28 +0000 (16:44 -0600)]
English: add comma and remove duplicated letter in birth screen reroll prompt.
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
Eric Branlund [Fri, 28 Jan 2022 01:26:44 +0000 (17:26 -0800)]
Mac workflow: also don't override the default SDK.
Eric Branlund [Fri, 28 Jan 2022 01:18:46 +0000 (17:18 -0800)]
Mac workflow: update comment about the macOS SDK.
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
backwardsEric [Tue, 30 Nov 2021 21:43:42 +0000 (13:43 -0800)]
Merge pull request #22 from backwardsEric/backport-english-edits-nov-2021
Backport English changes for 3.0.0 from November 2021
Eric Branlund [Tue, 30 Nov 2021 21:31:30 +0000 (13:31 -0800)]
Pull in Hourier's change to unify to present tense.
Eric Branlund [Tue, 30 Nov 2021 21:24:04 +0000 (13:24 -0800)]
Fix typo in English message from cast_summon_greater_demon().
Eric Branlund [Tue, 30 Nov 2021 21:22:30 +0000 (13:22 -0800)]
English: fix subject/verb agreement for messages about Psycho-spears cast by monsters.
Eric Branlund [Tue, 30 Nov 2021 21:20:54 +0000 (13:20 -0800)]
To be more idiomatic, reword English message about changing the hand holding an item.
Eric Branlund [Tue, 30 Nov 2021 21:18:09 +0000 (13:18 -0800)]
English: use "a" rather than "an" with "spider".
Eric Branlund [Tue, 30 Nov 2021 21:16:47 +0000 (13:16 -0800)]
Add missing "no" in English message for no appropriate item when processing a priest's bless weapon ability.
Eric Branlund [Tue, 30 Nov 2021 21:13:23 +0000 (13:13 -0800)]
To be more idiomatic, insert helper verb in English error message for birth options.
Eric Branlund [Tue, 30 Nov 2021 21:12:12 +0000 (13:12 -0800)]
To be more idiomatic, change "Explosion Device" to "Explosive Device".
Eric Branlund [Sun, 22 Aug 2021 23:34:57 +0000 (16:34 -0700)]
Port fix from 3.0.0 so a pack reordering doesn't mess up the messages from *identify*.
Eric Branlund [Fri, 20 Aug 2021 18:04:15 +0000 (11:04 -0700)]
Better handle if the font recorded in the preferences is not available. Likely resolves the underlying problem in https://github.com/backwardsEric/hengband/issues/19 .
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.
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.
Eric Branlund [Sat, 31 Jul 2021 04:25:02 +0000 (21:25 -0700)]
macOS: avoid unused variable warning when compiled with -DNDEBUG.
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.
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).
Eric Branlund [Thu, 15 Jul 2021 18:42:39 +0000 (11:42 -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.
Eric Branlund [Thu, 15 Jul 2021 18:33:14 +0000 (11:33 -0700)]
Drop use of AC_TYPE_SIGNAL since it is obsolete when assuming C89 or better.
Eric Branlund [Thu, 15 Jul 2021 18:26:16 +0000 (11:26 -0700)]
Drop use of AC_HEADER_TIME since recent versions of autotools complain about it being obsolescent.
Eric Branlund [Thu, 15 Jul 2021 18:20:07 +0000 (11:20 -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.
Eric Branlund [Wed, 14 Jul 2021 07:03:41 +0000 (00:03 -0700)]
Backport change from 3.0.0: replace "the" with "this" in Robin Hood's description.
Eric Branlund [Wed, 14 Jul 2021 07:02:00 +0000 (00:02 -0700)]
Backport change from 3.0.0: fit misuse of "it's".
Eric Branlund [Sat, 12 Jun 2021 23:27:55 +0000 (16:27 -0700)]
Declare internal routine as static to avoid warning about missing prototype.
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.
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.
Eric Branlund [Mon, 17 May 2021 02:56:37 +0000 (19:56 -0700)]
Adjust double-height tile handling (not currently used in Hengband) to better match up with the current main-cocoa.m in Angband.
Eric Branlund [Sat, 17 Apr 2021 16:31:19 +0000 (09:31 -0700)]
For English prompts with get_check(), insert space if it wasn't already there, between the question mark and the expected values appended by get_check().
Eric Branlund [Sat, 3 Apr 2021 03:07:45 +0000 (20:07 -0700)]
Tweak the default window layout since rendering changes and constraining window sizes to be a multiple of the tile size cause overlap with the old layout (at least on 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).
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).
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.
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.
Eric Branlund [Sat, 20 Mar 2021 18:22:54 +0000 (11:22 -0700)]
Change "glows pale" to "glows palely" for the English message about a restore mana activation (the same Japanese pharse is used for the mana ball activation, bu the message for that uses "becomes pale").
Eric Branlund [Sat, 20 Mar 2021 18:20:53 +0000 (11:20 -0700)]
Changed English wording for header of the monster list selected by matching a substring.
Eric Branlund [Wed, 17 Feb 2021 04:32:17 +0000 (20:32 -0800)]
Replace more instances of "Nothing happen." with "Nothing happens.".
Eric Branlund [Wed, 17 Feb 2021 04:30:08 +0000 (20:30 -0800)]
Reword English phrases whtich had the awkward "an equipment".
Eric Branlund [Tue, 16 Feb 2021 23:36:38 +0000 (15:36 -0800)]
To be more idiomatic, replace "have x quality" with "are of x quality".
Eric Branlund [Tue, 16 Feb 2021 23:34:12 +0000 (15:34 -0800)]
To simplify subject/verb agreement in English for the autopick describer, always have a plural noun for body_str. To do that, drop "equipment" (or the unidiomatic "equipments") for the default, "items", replace "corpse" with "corpses", replace "armor" (or the unidiomatic "armors") with "pieces of armor" and "junk" with "pieces of junk". Modify dependent phrases and possessives to match the choice of a plural noun for body_str.
Eric Branlund [Tue, 16 Feb 2021 23:19:20 +0000 (15:19 -0800)]
Backport Hourier's addition of an English description for 'Sun Blade'.
Eric Branlund [Tue, 16 Feb 2021 23:16:14 +0000 (15:16 -0800)]
Backport Hourier's addition of an English description for 'hermit's purple'.
Eric Branlund [Tue, 16 Feb 2021 23:11:51 +0000 (15:11 -0800)]
Backport of iks's 2020/11/7 addition of English descriptions for artifacts.
Eric Branlund [Tue, 16 Feb 2021 23:03:14 +0000 (15:03 -0800)]
Adjust last part of the English description for "of Jack of Shadows" to be more idiomatic and avoid a spelling mistake.
Eric Branlund [Tue, 16 Feb 2021 23:01:48 +0000 (15:01 -0800)]
Backport English description of the dagger of Jing Ke from 3.0.0.
Eric Branlund [Tue, 16 Feb 2021 22:59:06 +0000 (14:59 -0800)]
Backport English description of the whip 'Rose' from 3.0.0.
Eric Branlund [Tue, 16 Feb 2021 20:13:06 +0000 (12:13 -0800)]
Corrected English spelling mistake.
Eric Branlund [Tue, 16 Feb 2021 20:11:58 +0000 (12:11 -0800)]
Use "deleted" rather than "delete for English future perfect tense.
Eric Branlund [Tue, 16 Feb 2021 20:10:46 +0000 (12:10 -0800)]
For readability of an English message, replaced "do" followed by a gerund with a simple verb.
Eric Branlund [Tue, 16 Feb 2021 20:09:57 +0000 (12:09 -0800)]
For readability, change English dismount message to present tense and change the verb used.
Eric Branlund [Tue, 16 Feb 2021 20:09:03 +0000 (12:09 -0800)]
In English message, inserted a definite article to be more idiomatic.
Eric Branlund [Tue, 16 Feb 2021 20:08:14 +0000 (12:08 -0800)]
Correct subject-verb agreement in English message ("nothing" is singular).
Eric Branlund [Tue, 16 Feb 2021 20:07:24 +0000 (12:07 -0800)]
Correct subject-verb agreement in English message.
Eric Branlund [Tue, 16 Feb 2021 20:04:54 +0000 (12:04 -0800)]
For readability, inserted a definite article in the English messages about angry summons that did already have the article.
Eric Branlund [Tue, 16 Feb 2021 20:00:31 +0000 (12:00 -0800)]
To hopefully be clearer, reworded English message about no available items for use with the remove essence option.
Eric Branlund [Tue, 16 Feb 2021 19:58:22 +0000 (11:58 -0800)]
Reworded English tip for the smithing enhance mode: replaced "an equipment" with "an item" and removed leading "the" in the second sentence.
Eric Branlund [Tue, 16 Feb 2021 19:56:31 +0000 (11:56 -0800)]
To be more idiomatic, make "record" plural in English delete all message.
Eric Branlund [Tue, 16 Feb 2021 19:55:17 +0000 (11:55 -0800)]
In English birth option header, "affect" rather than "effect" is appropriate. Also rearrange parentheses for clarity and drop "s" after "(*)" since it didn't add anything.
Eric Branlund [Tue, 16 Feb 2021 19:53:20 +0000 (11:53 -0800)]
In English enter menu, use "out-of-date" rather than "obsoleted" as wrning on the help entry since the former seems clearer.
Eric Branlund [Tue, 16 Feb 2021 19:52:26 +0000 (11:52 -0800)]
To be more idiomatic, use "to" ranther than "for" in an English message.
Eric Branlund [Tue, 16 Feb 2021 19:51:44 +0000 (11:51 -0800)]
Make subject ("I") explicit in an English message.
Eric Branlund [Tue, 16 Feb 2021 19:50:00 +0000 (11:50 -0800)]
Replaced "stare into" with "stare at" to be more idiomatic.
Eric Branlund [Tue, 16 Feb 2021 19:48:58 +0000 (11:48 -0800)]
For clarity, replaced "is drawn" with synonymous "is drained" in English message.
Eric Branlund [Tue, 16 Feb 2021 19:48:08 +0000 (11:48 -0800)]
In English message, inserted a missing "to" for an infinitive.
Eric Branlund [Tue, 16 Feb 2021 19:47:15 +0000 (11:47 -0800)]
Switched "is" to "are" to match "some monsters".
Eric Branlund [Tue, 16 Feb 2021 19:46:30 +0000 (11:46 -0800)]
Fully spell out "highlight" in English options list.
Eric Branlund [Tue, 16 Feb 2021 19:45:33 +0000 (11:45 -0800)]
Change "an" to "a" since it precedes "dragon".
Eric Branlund [Tue, 16 Feb 2021 19:44:44 +0000 (11:44 -0800)]
For readability, use active voice for English message displayed when a teleport curse triggers.
Eric Branlund [Tue, 16 Feb 2021 19:43:29 +0000 (11:43 -0800)]
Corrected English spelling mistakes ("address").
Eric Branlund [Tue, 16 Feb 2021 19:42:19 +0000 (11:42 -0800)]
Corrected English spelling for plural of "box".
Eric Branlund [Tue, 16 Feb 2021 19:41:36 +0000 (11:41 -0800)]
Since "junk" is a collective noun, don't add "s" for plural.
Eric Branlund [Tue, 16 Feb 2021 19:40:51 +0000 (11:40 -0800)]
Made "whistle" plural to match the other entries that aren't collective nouns.
Eric Branlund [Tue, 16 Feb 2021 19:39:18 +0000 (11:39 -0800)]
To be more idiomatic, drop "the" and simply use "stop time".
Eric Branlund [Tue, 16 Feb 2021 19:38:21 +0000 (11:38 -0800)]
For clarity, change preposition for English message about lacking spare material for a repair.
Eric Branlund [Tue, 16 Feb 2021 19:37:11 +0000 (11:37 -0800)]
Capitalize "Klein" to match ordinary usage for "Klein bottle".
Eric Branlund [Tue, 16 Feb 2021 19:35:01 +0000 (11:35 -0800)]
Changed English wording for header of the monster list selected by matching a substring.
Eric Branlund [Tue, 16 Feb 2021 19:32:52 +0000 (11:32 -0800)]
Add "apiece" to English message to clarify that the quoted price is per charge.
Eric Branlund [Tue, 16 Feb 2021 19:31:32 +0000 (11:31 -0800)]
Provided an English version of the dice slots payout table.
Eric Branlund [Tue, 16 Feb 2021 19:25:07 +0000 (11:25 -0800)]
For clarity, reworded English prompt for selecting the cards to keep in poker.
Eric Branlund [Tue, 16 Feb 2021 19:23:44 +0000 (11:23 -0800)]
Correct Enlgihs typo.
Eric Branlund [Tue, 16 Feb 2021 19:23:01 +0000 (11:23 -0800)]
Correct English: "shot an allow able" -> "shoot an arrow able".