OSDN Git Service
Eric Branlund [Sun, 15 Sep 2019 08:20:01 +0000 (01:20 -0700)]
Added comment about unexpected, but beneficial, side effects from AC_PATH_XTRA on Mac OS X.
Eric Branlund [Sun, 15 Sep 2019 03:02:47 +0000 (20:02 -0700)]
The previous versions with Cocoa enabled and handling Objective C code appear to have only worked by luck. Here attempt to be more robust. Needs to be tested on Linux to see if it interferes with building there.
Eric Branlund [Sat, 14 Sep 2019 18:37:15 +0000 (11:37 -0700)]
Added the autoconf/automake bootstrapping script to the list of files to distribute.
Eric Branlund [Sat, 14 Sep 2019 17:42:16 +0000 (10:42 -0700)]
Added delete.me to mimic lib/xtra/graf/music and so the directory tree archived by "make dist" matches the contents for lib/xtra/graf.
Eric Branlund [Sat, 14 Sep 2019 17:39:29 +0000 (10:39 -0700)]
Added readdib.h, main-cap.c, and main-xaw.c to the extra sources. They are not used in a current Linux or Mac build, but readdib.h is used on Windows.
Eric Branlund [Sat, 14 Sep 2019 11:27:18 +0000 (04:27 -0700)]
Corrected so that the changes in
5a97ff77519179c4023e4ffc963c2572ce596a12 do not cause 'make DISTCHECK_CONFIGURE_FLAGS="--disable-japanese --enable-cocoa --without-x" distcheck' to fail.
Eric Branlund [Sat, 14 Sep 2019 09:03:37 +0000 (02:03 -0700)]
Changed current_world_ptr->game_turn to turn in comment since the latter appears to be what was intended.
Eric Branlund [Sat, 14 Sep 2019 04:07:53 +0000 (21:07 -0700)]
Observed levels in Yeek's den (most frequently level 12) with patches of unrecognied terrain and had crashes on such levels where the common symptom was an out-of-bounds feature index. Changed floor-generate.c so that nothing is done when adding a river to a dungeon, like Yeek's den, that does not accept any of the river types. Have not seen levels with patches of unrecognized terrain since the change.
Eric Branlund [Thu, 12 Sep 2019 03:04:24 +0000 (20:04 -0700)]
Changed "confusing" to "confused" in two places since the monster is confused rather than causing the player to be confused.
Eric Branlund [Thu, 12 Sep 2019 02:54:17 +0000 (19:54 -0700)]
"information" is it's own plural so dropped the "s".
Eric Branlund [Thu, 12 Sep 2019 02:36:36 +0000 (19:36 -0700)]
Corrected typo in English message.
Eric Branlund [Thu, 12 Sep 2019 01:47:13 +0000 (18:47 -0700)]
Removed unneeded capitalization in English message.
Eric Branlund [Thu, 12 Sep 2019 01:35:47 +0000 (18:35 -0700)]
Inserted missing "been" in English message.
Eric Branlund [Thu, 12 Sep 2019 01:30:20 +0000 (18:30 -0700)]
For English message about uniques resisting discharging, changed infinitive to participle (it's used as an adjective), corrected subject/verb agreement for second verb, and dropped the comma since do not have two separate clauses (same nounwith two verbs).
Eric Branlund [Thu, 12 Sep 2019 01:19:44 +0000 (18:19 -0700)]
For more idiomatic English, replaced "was crashed" with "was shattered" for mirros and with "crumbled" for walls.
Eric Branlund [Thu, 12 Sep 2019 01:02:01 +0000 (18:02 -0700)]
Add missing "to" in English message from mitokohmon().
Eric Branlund [Thu, 12 Sep 2019 00:57:42 +0000 (17:57 -0700)]
Switch to participle for English message about a creature blocking fishing; could replace "is standing" with "stands" if active voice is preferable here.
Eric Branlund [Thu, 12 Sep 2019 00:25:13 +0000 (17:25 -0700)]
For more idiomatic English, replaced "have gone to" with "went"; don't need to use the past perfect tense here.
Eric Branlund [Thu, 12 Sep 2019 00:23:07 +0000 (17:23 -0700)]
For a more idiomatic English expression, switch "have stuck into" with "is stuck in".
Eric Branlund [Thu, 12 Sep 2019 00:20:40 +0000 (17:20 -0700)]
Use "hit" rather than "sticked on" for idiomatic English.
Eric Branlund [Thu, 12 Sep 2019 00:04:06 +0000 (17:04 -0700)]
Added a preposition and swapped another for a more idiomatic English message when the player does not have the "revenge sentence" power.
Eric Branlund [Thu, 12 Sep 2019 00:01:27 +0000 (17:01 -0700)]
Reworded English message for lapsing of "swords to vampires" since "thirsty" is an adjective but was used as a noun.
Eric Branlund [Wed, 11 Sep 2019 23:31:19 +0000 (16:31 -0700)]
Reworded fully damaged English message - "crumple" is the wrong tense and doesn't seem like a good choice for the nature of the damge.
Eric Branlund [Wed, 11 Sep 2019 21:24:25 +0000 (14:24 -0700)]
To avoid unused expression warnings from version 10.0.1 of Apple's cc when compiling the English version, moved format() into the _() macro in three places.
Eric Branlund [Wed, 11 Sep 2019 19:46:05 +0000 (12:46 -0700)]
Modified teleport level English message for subject/verb agreement.
Eric Branlund [Wed, 11 Sep 2019 19:44:08 +0000 (12:44 -0700)]
Changed second half of riding message in English to be a second action rather than a participle.
Eric Branlund [Wed, 11 Sep 2019 19:42:58 +0000 (12:42 -0700)]
Inserted "been" in English message since the animal ridden is the one performing the action.
Eric Branlund [Wed, 11 Sep 2019 19:32:22 +0000 (12:32 -0700)]
Converted English counterattack messsage to a full sentence.
Eric Branlund [Wed, 11 Sep 2019 19:29:24 +0000 (12:29 -0700)]
Use "enveloping" rather than "enveloped" since the action is occuring in the present rather than the past.
Eric Branlund [Wed, 11 Sep 2019 19:22:42 +0000 (12:22 -0700)]
For the English message regarding KATA_IAI, matched verb tenses.
Eric Branlund [Wed, 11 Sep 2019 18:48:58 +0000 (11:48 -0700)]
For clearer English, replaced "informations of" with "information about".
Eric Branlund [Wed, 11 Sep 2019 18:39:45 +0000 (11:39 -0700)]
In the English version, the string for the monster's alignment wasn't initialized in one branch of the code handling probing.
Eric Branlund [Wed, 11 Sep 2019 18:36:13 +0000 (11:36 -0700)]
These are changes from "temporal" to "temporary" missed in commit
25a8808323e0bdf5f8a5878630ccb88775fe1c54.
Eric Branlund [Wed, 11 Sep 2019 18:28:33 +0000 (11:28 -0700)]
Added "-Wunguarded-availability" to the compiler flags for Mac OS X. That was introduced in XCode 9 to generate warnings for use of API's that are newer than the deployment target.
Eric Branlund [Wed, 11 Sep 2019 18:24:46 +0000 (11:24 -0700)]
time() takes a time_t* as the argument so change the cast of 0 to a time_t*. Avoids a compiler warning with Apple's cc version 10.0.1.
Eric Branlund [Wed, 11 Sep 2019 17:44:13 +0000 (10:44 -0700)]
Use "afraid" rather than "fear" in English message since it's being used as an ajdective.
Eric Branlund [Wed, 11 Sep 2019 17:37:30 +0000 (10:37 -0700)]
Replaced "have waked" with "have woken".
Eric Branlund [Wed, 11 Sep 2019 17:30:42 +0000 (10:30 -0700)]
For the English messages about a cursed item summoning something, use "has attracted" rather than "have attracted" since the cursed item is singular (unless it's ammunition).
Eric Branlund [Wed, 11 Sep 2019 17:10:55 +0000 (10:10 -0700)]
Changed English message for enhancing multiple items to use both of the integer format parameters.
Eric Branlund [Wed, 11 Sep 2019 17:06:58 +0000 (10:06 -0700)]
In English messages for things that return when thrown, inserted "come" before "back" in two places where it was missing.
Eric Branlund [Wed, 11 Sep 2019 17:00:19 +0000 (10:00 -0700)]
Replaced "temporal" (i.e. time-dependent) with the more specific word, "temporary" (i.e. not permanent, fleeting, or transitory) in English comments and messages to reflect normal English usage. Also replaced the adverb form, "temporally", with "temporarily".
Eric Branlund [Wed, 11 Sep 2019 04:32:00 +0000 (21:32 -0700)]
Commit
9843a18bde263d35049e3a19056fbb4e8f980eba only set the window title bars from the angband_term_name global. This change also sets the entries in the window menu from angband_term_name. The intent is to make it easier to localize (just change how angband_term_name is set in variable.c).
Eric Branlund [Wed, 11 Sep 2019 04:19:21 +0000 (21:19 -0700)]
For the Japanese version, replaced hengband with 変愚蛮怒 in the menu labels and localized strings.
Eric Branlund [Wed, 11 Sep 2019 02:03:08 +0000 (19:03 -0700)]
Added a template file, cocoa/Angband-Cocoa.strings, which is processed to generate the localization file, Contents/Resources/<language>.lproj/InfoPlist.strings within the Mac OS X application, for the user-facing strings in the application's Info.plist file. Modified Makefile.am to process the template and generate the localization files for English and Japanese. The Japanese localization for the copyright information still needs work - it currently is the same as in English.
Eric Branlund [Wed, 11 Sep 2019 01:52:29 +0000 (18:52 -0700)]
Added CFBundleDisplayName and CFBundleName keys to Angband-Cocoa.xml since they are in the list of recommended keys and have been apparently supported since 10.0. Modified Makefile.am to substitute values for those keys.
Eric Branlund [Wed, 11 Sep 2019 01:48:14 +0000 (18:48 -0700)]
Shifted the "Copyright ©" from Angband-Cocoa.xml to Makefile.am so the entire string for NSHumanReadableCopyright is set there. That should make it easier for localization.
Eric Branlund [Wed, 11 Sep 2019 01:38:19 +0000 (18:38 -0700)]
Removed the CFBundleLongVersionString and CFBundleGetInfoString keys so there are fewer things to localize. CFBundleLongVersionString is apparently undocumented and no longer used. CFBundleGetInfoString was superseded in 10.6 by NSHumanReadableCopyright.
Eric Branlund [Tue, 10 Sep 2019 16:43:09 +0000 (09:43 -0700)]
Removed trailing whitespace after semicolons that end lines.
Eric Branlund [Tue, 10 Sep 2019 09:22:58 +0000 (02:22 -0700)]
Changed Term_bigcurs_cocoa(), Term_curs_cocoa(), Term_pict_cocoa(), Term_text_cocoa(), and Term_wipe_cocoa() to merely record the changes which are then applied when Term_xtra_cocoa() is called with TERM_XTRA_FRESH as the operation. In the text rendering, redraw unchanged columns if it's possible that text from a changed column would extend into it. That reduces the clearing and clipping artifacts with the Snell Roundhand and Zapfino fonts.
Eric Branlund [Tue, 10 Sep 2019 07:38:13 +0000 (00:38 -0700)]
Using the English version, a combat with a moon beast and an orc shaman nearby caused a crash with the call stack going through monspell_message_base() and spell_RF6_HEAL(). Modified spell_RF6_HEAL() and spell_RF6_HASTE(), which has a similar problem, to mimic the Japanese messages and avoid the crash. Like the Japanese version, in both places the 4th form of the message is not taking the other participant into account. Also, the English version isn't attempting to get the gender of the possessive pronoun right.
Eric Branlund [Mon, 9 Sep 2019 08:33:53 +0000 (01:33 -0700)]
In files.c changed "Infra-vision" to "Infravision" for the English version so it would line up with the other attributes in its column. For consistency, changed other user-facing occurences of "infra-vision" in birth.c, help/birth.txt, and help/raceclas.txt. Item 267 in edit/k_info.txt still uses "Infra-vision" in its English name: was not sure if changing that would break savefiles. Code comments also still use "infra-vision".
Eric Branlund [Mon, 9 Sep 2019 08:21:55 +0000 (01:21 -0700)]
For the English version, added a space after the colon for "Digging" so that proficiency aligns with the others.
Eric Branlund [Sat, 7 Sep 2019 23:51:49 +0000 (16:51 -0700)]
Corrected typo in "invulnerability".
Eric Branlund [Sat, 7 Sep 2019 23:50:10 +0000 (16:50 -0700)]
Fixed usage error: heroes is plural want "hero's" for the singular possessive.
Eric Branlund [Sat, 7 Sep 2019 23:49:03 +0000 (16:49 -0700)]
The normal idiom is "in the long run" rather than "on the long run".
Eric Branlund [Sat, 7 Sep 2019 23:48:10 +0000 (16:48 -0700)]
Added missing apostrophe for possesive.
Eric Branlund [Sat, 7 Sep 2019 23:45:17 +0000 (16:45 -0700)]
Removed "a" or "an" in combination with "mail" or "armor" to match normal English usage.
Eric Branlund [Sat, 7 Sep 2019 17:59:38 +0000 (10:59 -0700)]
Previous change was not enough to ensure that the correct food item was removed after eating: set_food() causes handle_stuff() to be called and can reorder the pack. Modified to set the update flags which would change the pack after the calls to set_food().
Eric Branlund [Sat, 7 Sep 2019 17:54:04 +0000 (10:54 -0700)]
The English version of monster recall mentioned the character level twice when describing the expected experience. Removed the first to make the text clearer.
Eric Branlund [Fri, 6 Sep 2019 18:40:04 +0000 (11:40 -0700)]
Added a big cursor hook since it's used if the cursor points at a kanji character, even if big tile mode is not otherwise in effect.
Eric Branlund [Fri, 6 Sep 2019 18:10:56 +0000 (11:10 -0700)]
Move setting never_frosh on the terminal to term_data_link() since the other one-time only settings are there.
Eric Branlund [Thu, 5 Sep 2019 22:15:07 +0000 (15:15 -0700)]
Disable notifications about row flushes since nothing is done for them.
Eric Branlund [Thu, 5 Sep 2019 21:10:24 +0000 (14:10 -0700)]
In the English version, the displayed player level in the main window wasn't aligned with the stats below it.
Eric Branlund [Thu, 5 Sep 2019 20:35:56 +0000 (13:35 -0700)]
Modified so that using an unidentified staff from the pack delays reordering of the pack so that charge will be deducted from the correct item.
Eric Branlund [Thu, 5 Sep 2019 01:43:13 +0000 (18:43 -0700)]
In English version, a store's page indicator cuts off the last character of "Item Description".
Eric Branlund [Wed, 4 Sep 2019 17:07:32 +0000 (10:07 -0700)]
Modified so that zapping an unidentified wand from the pack will deduct the charge from the correct item.
Eric Branlund [Wed, 4 Sep 2019 15:16:33 +0000 (08:16 -0700)]
Adjust so eating an unidentified piece of food from the pack removes that piece of food and not something else.
Eric Branlund [Wed, 4 Sep 2019 06:36:04 +0000 (23:36 -0700)]
Adjust so reading an unidentified scroll from the pack removes that scroll and not another scroll.
Eric Branlund [Tue, 3 Sep 2019 20:56:27 +0000 (13:56 -0700)]
Removed push_pixel(), crack_rect(), and push_options() since they were no longer being used.
Eric Branlund [Tue, 3 Sep 2019 20:24:54 +0000 (13:24 -0700)]
In Term_pict_cocoa(), update the destination rectangle if more than one tile is drawn. Removed rounding of the destination rectangle borders since the tile size has been rounded already. Set the bounding rectangle for the changed area to encompass the full range drawn and not just the first tile.
Eric Branlund [Tue, 3 Sep 2019 16:48:00 +0000 (09:48 -0700)]
Changed strategy for handling text drawing: use a clipping rectangle to cut off stuff that could get left behind and not get cleared, round the tile size up to an integer number of pixels so that the clipping/clearing rectangles are aligned on pixel boundaries, and, when computing the tile size or ascenders/descenders add a bit of padding to account for subpixel positioning or antialiasing in the glyph rendering. This does not handle the calligraphic fonts (Snell Roundhand, Trattatello, Zapfino) well since the bounding box in x for some characters extends far beyond the advance. That leads to at least three artifacts: a character at the beginning or end of a rendered sequence can be noticeably clipped by the clipping rectangle, clearing problems in the middle of a sequence where a character extends into its neighbor and while that character changes the neighbor does not so the extension isn't cleared, and clearing artifacts at the end of a sequence (did not determine the exact cause for those). To resolve those, would likely need to record what changes need to be made in Term_text_cocoa() and Term_wipe_cocoa() and then apply them all at once (going at least one past the ends of the changes to handle how the characters extend into their neighbors) in the TERM_XTRA_FRESH case in Term_xtra_cocoa().
Eric Branlund [Tue, 3 Sep 2019 16:41:59 +0000 (09:41 -0700)]
In preparation for some more changes which will need the graphics context in Term_text_cocoa(), record the context returned by lockFocus() and, since it's available, pass it to drawWChar() so that drawWChar() doesn't need to make additional calls to get it.
Eric Branlund [Tue, 3 Sep 2019 02:32:56 +0000 (19:32 -0700)]
When increasing a stat, use "more" rather than "less" in the English message.
Eric Branlund [Tue, 3 Sep 2019 02:20:33 +0000 (19:20 -0700)]
Replaced current_world_ptr->game_turn with turn in comments where the latter makes more sense.
Eric Branlund [Fri, 30 Aug 2019 22:56:12 +0000 (15:56 -0700)]
Saw clearing artifacts along the tops of characters with the Rockwell and "DIN Condensed" fonts in 10.14. In both, the top of the bounding box for "@" relative to the baseline is above the reported ascent for the font. To avoid the clearing artifacts, get the overall bounding box for the glyphs examined in updateGlyphInfo() and override the reported ascent and descent if the bounding box goes beyond that range. There are still clearing artifacts with the "Snell Roundhand" and Zapfino fonts in 10.14, but those artifacts are on the righthand side of "@" and not along the top.
Eric Branlund [Fri, 30 Aug 2019 22:51:40 +0000 (15:51 -0700)]
Replaced "tiles set" with "tile set" in error message.
Eric Branlund [Fri, 30 Aug 2019 22:38:38 +0000 (15:38 -0700)]
Changed "current_world_ptr->game_turn" to "turn" in comments where it seemed like "turn" was what was intended.
Eric Branlund [Fri, 30 Aug 2019 22:00:33 +0000 (15:00 -0700)]
Replaced "current_world_ptr->game_turn" with "turn" in English messages to the player where "turn" seemed like the intended word.
Eric Branlund [Fri, 30 Aug 2019 21:13:53 +0000 (14:13 -0700)]
English message has swapped order for string and integer parameters but was given them in the same order as the Japanese message. Fixed.
Eric Branlund [Fri, 30 Aug 2019 21:12:07 +0000 (14:12 -0700)]
English message is missing string argument. Added it.
Eric Branlund [Fri, 30 Aug 2019 21:10:40 +0000 (14:10 -0700)]
English message was missing a string argument causing a segmentation fault when displayed. Fixed.
Eric Branlund [Thu, 29 Aug 2019 20:03:32 +0000 (13:03 -0700)]
Don't create lib/xtra in the application bundle since rules in lib will do so.
Eric Branlund [Wed, 28 Aug 2019 01:29:18 +0000 (18:29 -0700)]
Remove designable_translated.nib since it was mistakenly included (was a copy of designable.nib while going through and putting in translations for menu labels).
Eric Branlund [Tue, 27 Aug 2019 19:30:09 +0000 (12:30 -0700)]
Localized the one case where main-cocoa.m sends a string through the z-term interface. To handle that, adjusted the make rules so main-cocoa.m gets processed by gcc-wrap. Since automake issued a warning when OBJCCOMPILE was set only in the condition part for Cocoa builds, it is set, along with COMPILE, regardless of whether building the Cocoa version.
Eric Branlund [Tue, 27 Aug 2019 19:26:42 +0000 (12:26 -0700)]
Changed the recommended destination for bug reports to match that listed in lib/file/news.txt.
Eric Branlund [Tue, 27 Aug 2019 19:23:17 +0000 (12:23 -0700)]
Corrections for compiler errors introduced by commit
9843a18bde263d35049e3a19056fbb4e8f980eba when the source had been configured with Japanese disabled.
Eric Branlund [Tue, 27 Aug 2019 19:21:40 +0000 (12:21 -0700)]
These are the message catalogs and changes to the installation rules that should been included with commit
3f92bafc41eef036e71bff827c03041413eb4cda.
Eric Branlund [Tue, 27 Aug 2019 17:27:36 +0000 (10:27 -0700)]
Localized the two alert dialogs that are displayed. I believe that finishes the user-facing text that doesn't go through the Angband term display. The alert dialogs were also changed to use NSAlert since NSRunAlertPanel was deprecated in 10.10 and NSAlert has been available since 10.3.
Eric Branlund [Tue, 27 Aug 2019 17:22:44 +0000 (10:22 -0700)]
Commit
98de7b628e457c82a9607f3d1fb7b1ed266d7d86 for rendering Japanese characters left off a necessary ++i to avoid an infinite loop.
Eric Branlund [Tue, 27 Aug 2019 17:12:38 +0000 (10:12 -0700)]
Use the Angband global, angband_term_name, as the source for the terminal names so that they are consistent with what is shown by Angband's command to configure the contents of the terminals.
Eric Branlund [Tue, 27 Aug 2019 17:07:21 +0000 (10:07 -0700)]
When the JP preprocessor macro is set, detect and render EUC-JP encoded characters in Term_text_cocoa().
Eric Branlund [Tue, 27 Aug 2019 00:06:29 +0000 (17:06 -0700)]
Added comments for some of the methods the application delegate implements from NSObject and how the application delegate declaration will eventually have to change because of a dperecation in 10.14.
Eric Branlund [Mon, 26 Aug 2019 23:39:57 +0000 (16:39 -0700)]
Updated the makefile rules to install the Japanese localization.
Eric Branlund [Mon, 26 Aug 2019 23:32:52 +0000 (16:32 -0700)]
Added a Japanese localization for the Mac OS X cocoa interface. It will likely need tidying up by someone who can speak the language. I didn't find out how to separate the localizable strings from the rest of the nib file, so the full nib file was copied to ja.lproj, the relevant strings in designable.nib changed, and then the nib directory for ja.lproj was opened and saved in XCode to get the updated keyedobjects.nib.
Eric Branlund [Mon, 26 Aug 2019 23:28:19 +0000 (16:28 -0700)]
So the dynamically added entries in the Command and Graphics menu can be localized, look up the name to use in either CommandMenu.strings (for the Command menu) or GraphicsMenu.strings (for the Graphics menu). Those files are kept in the <language_code>.lproj directory of the application bundle.
Eric Branlund [Mon, 26 Aug 2019 23:25:58 +0000 (16:25 -0700)]
Forgot to include the nib files in commit
e24ebf8eb45351cf7fad395339a92df93d0e3522. Here they are.
Eric Branlund [Mon, 26 Aug 2019 23:16:55 +0000 (16:16 -0700)]
Since localization to Japanese should be supported, don't test instead for the name of the graphics menu in menuNeedsUpdate(), instead test against a reference to the graphics menu stored in the application delegate. Modified the nib file to handle that.
Eric Branlund [Mon, 26 Aug 2019 23:12:31 +0000 (16:12 -0700)]
If asked by the OS to open a file, pass FALSE to new_game().
Eric Branlund [Mon, 26 Aug 2019 23:10:21 +0000 (16:10 -0700)]
Set up file-level constants for the keys to look up the frame rate and graphics mode in the user settings.
Eric Branlund [Mon, 26 Aug 2019 23:06:23 +0000 (16:06 -0700)]
Hengband does not appear to have the equivalent of Angband's "List Monsters" and "List Items" commands so do not put those in the Command menu.