OSDN Git Service
Eric Branlund [Fri, 6 Mar 2020 23:14:31 +0000 (15:14 -0800)]
Adopted change from Angband: don't change the window visibility because a window is closed when the application exits. That fixes an issue in Angband, but Hengband currently doesn't seem to be affected.
Eric Branlund [Fri, 6 Mar 2020 21:21:34 +0000 (13:21 -0800)]
Changing the font or tile set during character generation would cause a crash. Fixed.
Eric Branlund [Fri, 28 Feb 2020 22:16:58 +0000 (14:16 -0800)]
Per hengbandforosx ticket 40203, include the dimensions, as rows and columns, in the title bars for the terminal windows.
Eric Branlund [Fri, 28 Feb 2020 21:39:38 +0000 (13:39 -0800)]
Create the Angband terminals other than terminal zero as utility panels: makes the title bar thinner. Also implies some other behavioral changes which are not inconsistent with how those terminals are used. Addresses the hengbandforosx's ticket 40204.
Eric Branlund [Fri, 28 Feb 2020 20:36:11 +0000 (12:36 -0800)]
Use #import (to be more idiomatic with Objective C) rather than #include for cocoa/AppDelegate.h and quotes (since its not in the system's include path) rather than brackets. That also lines up the code with Angband's version of main-cocoa.m.
Eric Branlund [Thu, 27 Feb 2020 19:08:54 +0000 (11:08 -0800)]
Position the splash screen prompt in relation to the assumed size of the splash screen text rather than based on the dimensions of the window so the prompt remains close to the rest of the splash screen text regardless of the window size.
Eric Branlund [Thu, 27 Feb 2020 18:52:22 +0000 (10:52 -0800)]
Adjusted Japanese splash screen prompt to match the relabeled menu item for a new game.
Eric Branlund [Wed, 26 Feb 2020 08:54:43 +0000 (00:54 -0800)]
Removed AngbandSoundCatalog's dispose() method: not necessary.
Eric Branlund [Wed, 26 Feb 2020 08:51:54 +0000 (00:51 -0800)]
Changed to do additional cleanup in hook_quit: nuke the terminals and set to nil the shared sound catalog and default font for the context.
Eric Branlund [Wed, 26 Feb 2020 08:26:28 +0000 (00:26 -0800)]
Removed function, not called anywhere, that was inadvertently left in the changes for automatic reference counting.
Eric Branlund [Wed, 26 Feb 2020 08:19:45 +0000 (00:19 -0800)]
Corrected typo in comment.
Eric Branlund [Wed, 26 Feb 2020 07:20:36 +0000 (23:20 -0800)]
Since 10.6 is no longer of interest, removed the redeclarations that were used for it.
Eric Branlund [Wed, 26 Feb 2020 06:10:45 +0000 (22:10 -0800)]
Since the user repsonse to the alert dialogs is not used, don't bother storing it.
Eric Branlund [Wed, 26 Feb 2020 06:04:33 +0000 (22:04 -0800)]
The release notes for Core Foundation say that as of 10.10 the synchronize method on the defaults should be avoid in general because it has limited utility. Therefore, removed the calls to it.
Eric Branlund [Wed, 26 Feb 2020 05:42:44 +0000 (21:42 -0800)]
To reduce the differences with Angband 4.2's version, initialize new_game to FALSE and move its declaration.
Eric Branlund [Wed, 26 Feb 2020 05:29:06 +0000 (21:29 -0800)]
To make further changes easier (to better match with current Apple documentation and code generated with Xcode), converted to automatic reference counting (ARC). To simplify cleanup, made some plain C structs (the storage for sound and pending changes to a terminal) into Objective-C classes. For similar reasons, and for better encapsulation, moved some file global variables into classes and promoted some instance variables in AngbandContext to full properties. For ease of access to the application deleget, made some static functions into instance functions of the application delegate.
Eric Branlund [Tue, 25 Feb 2020 22:42:06 +0000 (14:42 -0800)]
Made beginGame() an instance method of AngbandAppDelegate rather than a class method for AngbandContext. That's intended to simplify converting to automatic reference counting (will have access to the AngbandAppDelegate* through self). Made the class methods of AngbandContext which set up directories into file-level static functions (want easy access to them from beginGame but don't need to include them in the AngbandAppDelegate class).
Eric Branlund [Tue, 25 Feb 2020 20:22:14 +0000 (12:22 -0800)]
Changed Japanese translation for "New" to match what was suggested in hengbandforosx ticket 40060; that also matches what Pages uses for "New" (without the ellipsis) in its menus.
Eric Branlund [Mon, 24 Feb 2020 22:45:48 +0000 (14:45 -0800)]
Changed Cocoa terminal hook prototypes to match those in z-term.h.
Eric Branlund [Mon, 24 Feb 2020 17:53:21 +0000 (09:53 -0800)]
Added menu item and backing value stored in the preferences to control whether big tile mode is enabled in the Cocoa front end.
Eric Branlund [Mon, 24 Feb 2020 17:33:18 +0000 (09:33 -0800)]
Corrected workaround for flower entry.
Eric Branlund [Sun, 23 Feb 2020 22:13:04 +0000 (14:13 -0800)]
Adjusted logic in Term_xtra_cocoa_fresh() to support big tile mode.
Eric Branlund [Sun, 23 Feb 2020 21:59:04 +0000 (13:59 -0800)]
Load the possible graphics modes before loading the preferences so can appropriately choose whether or not to enable big tile mode in load_prefs().
Eric Branlund [Sun, 23 Feb 2020 19:41:26 +0000 (11:41 -0800)]
Adjusted logic in query_before_text() to handle big tile mode. query_after_text() does not require modification since it will see the left side, the one marked as a tile, of an area rendered with a tile.
Eric Branlund [Sun, 23 Feb 2020 19:19:06 +0000 (11:19 -0800)]
Adjusted logic in Term_pict_cocoa() to handle big tile mode.
Eric Branlund [Sun, 23 Feb 2020 18:54:29 +0000 (10:54 -0800)]
Anband'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.
Eric Branlund [Sat, 22 Feb 2020 23:24:38 +0000 (15:24 -0800)]
Corrected typo in English description for Rhan-Tegoth.
Eric Branlund [Fri, 21 Feb 2020 22:29:44 +0000 (14:29 -0800)]
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.
Eric Branlund [Fri, 21 Feb 2020 03:34:51 +0000 (19:34 -0800)]
In case a tile set fails to load, provide feedback to the user in the form of an alert dialog and updating which graphics option is marked in the menu.
Eric Branlund [Fri, 21 Feb 2020 02:40:07 +0000 (18:40 -0800)]
Protected against CGBitmapContextCreate() failing while loading a tile set.
Eric Branlund [Fri, 21 Feb 2020 00:01:25 +0000 (16:01 -0800)]
Amended fix for minimum content size regression to simplify the code.
Eric Branlund [Thu, 20 Feb 2020 13:58:30 +0000 (05:58 -0800)]
Made white space changes to better match what's in the For2.2.2-Refactoring branch.
Eric Branlund [Thu, 20 Feb 2020 13:56:52 +0000 (05:56 -0800)]
Added comments on preprocessor conditional parts to match what's in the For2.2.2-Refactoring branch.
Eric Branlund [Thu, 20 Feb 2020 13:54:11 +0000 (05:54 -0800)]
In init.c's dir_create() and create_needed_dirs(), expanded internal fixed-size buffers to match what's used in init_file_paths().
Eric Branlund [Thu, 20 Feb 2020 13:50:13 +0000 (05:50 -0800)]
Changed create_needed_dirs() so that as called by main.c it acts like main.c did before the changes I made for init_file_paths(): only attempts to create the user directory when PRIVATE_USER_PATH is set.
Eric Branlund [Thu, 20 Feb 2020 13:46:27 +0000 (05:46 -0800)]
In create_needed_dirs(), don't make ANGBAND_DIR_SCRIPT since with PHO's patch it isn't one of the directories that may be writable.
Eric Branlund [Thu, 20 Feb 2020 13:40:01 +0000 (05:40 -0800)]
Corrected error in merge: expanding game_datadir rather than the game_libpath from the change.
Eric Branlund [Thu, 20 Feb 2020 08:03:04 +0000 (00:03 -0800)]
Changed declaration order and white space in spell_RF6_HASTE and spell_RF6_HEAL to match what's been done in the For2.2.2-Refactoring branch.
Eric Branlund [Thu, 20 Feb 2020 07:50:11 +0000 (23:50 -0800)]
Removed AngbandContext's endGame since it is not called.
Eric Branlund [Thu, 20 Feb 2020 07:47:35 +0000 (23:47 -0800)]
Removed AngbandContext's validateMenuItem since it does not host setGraphicsMode and the application delegate handles the validation.
Eric Branlund [Thu, 20 Feb 2020 06:56:10 +0000 (22:56 -0800)]
Changed to NSMenuItem's parentItem (added in 10.6) rather than the locally declared superitem.
Eric Branlund [Thu, 20 Feb 2020 06:48:52 +0000 (22:48 -0800)]
Removed terminalsMenu from the application delegate (not referenced by the code or by the Interface Builder file). Removed the IBAction designation from setGraphicsMode and selectWindow (both are not hooked to controls via InterfaceBuilder file). Removed the IBOutlet designation from AngbandView's angbandContext since it is not hooked to a user interface element by the Interface Builder file.
Eric Branlund [Thu, 20 Feb 2020 03:58:12 +0000 (19:58 -0800)]
Updated openFiles for changes evidently made in 10.3: return value is void and success or failure is reported through NSApplication's replyToOpenOrPrint.
Eric Branlund [Thu, 20 Feb 2020 03:20:16 +0000 (19:20 -0800)]
I dropped a trailing bracket in the merge from upstream. Fixed.
Eric Branlund [Thu, 20 Feb 2020 03:12:14 +0000 (19:12 -0800)]
Changed to have main-cocoa.m use the application delegate declaration from cocoa/AppDelegate.h rather than use its own declaration. Since cocoa/AppDelegate.h is now included in compilation, moved it from EXTRA_DIST to hengband_SOURCES and EXTRA_hengband_sources.
Eric Branlund [Thu, 20 Feb 2020 03:01:49 +0000 (19:01 -0800)]
Modified src/Makefile.am so that src/cocoa/AppDelegate.{h,m} and src/cocoa/Base.lproj/MainMenu.xib are included in the archive generated with "make dist".
Eric Branlund [Thu, 20 Feb 2020 02:23:48 +0000 (18:23 -0800)]
Added stub files, cocoa/AppDelegate.h and cocoa/AppDelegate.m, and an XML Interface BUilder file, cocoa/Base.lproj/MainMenu.xib, so that it's easier to regenerate MainMenu.nib if making substantial changes to the Cocoa menus. Comments in cocoa/AppDelegate.m outline the procedure. The former src/cocoa/en.lproj/MainMenu.nib (as a directory) has been replaced by src/cocoa/Base.lproj/MainMenu.nib. The version in this commit was generated with Xcode 11.3 with a deployment target of 10.8. There is no longer a separate nib, src/cocoa/ja.lproj/MainMenu.nib, for Japanese. Instead have src/cocoa/ja.lproj/MainMenu.strings to specify the Japanese versions of the menu labels. Since Base localization is supposed to only be available in 10.8 and later, set the deployment target flags in Makefile.am to be 10.8 rather than 10.7.
Eric Branlund [Mon, 17 Feb 2020 05:52:23 +0000 (21:52 -0800)]
Merge branch 'master' of git://git.osdn.net/gitroot/hengband/hengband . Used upstream's of two arguments to init_file_paths() but kept the implementation similar to what was used in the OS X port (don't modify the incoming arguments so declare them as concptr).
Eric Branlund [Mon, 17 Feb 2020 05:03:02 +0000 (21:03 -0800)]
Fixed regression: minimum window size not correctly set at startup on main window.
deskull [Sun, 16 Feb 2020 13:04:35 +0000 (22:04 +0900)]
Merge pull request #40011 (phonohawk/hengband/with-varpath into master).
Eric Branlund [Thu, 13 Feb 2020 01:40:01 +0000 (17:40 -0800)]
Merge branch 'master' of git://git.osdn.net/gitroot/hengband/hengband
PHO [Thu, 6 Feb 2020 13:05:32 +0000 (22:05 +0900)]
[Feature] Add ./configure option "--with-varpath=PATH"
On Unix-like platforms, it is often desirable to install files that
will be modified after installation under a separate directory tree
from that containing read-only data files. This is so that read-only
files can reside in a read-only file system, and also package managers
can update or remove read-only files without worrying about removing
user data.
The new option "--with-varpath=PATH", when specified, configures the
game so that certain directories, namely apex, bone, data, edit, user,
and save, will be created under the given path, as opposed to the path
specified with "--with-libpath=PATH". When the option is not given,
those directories will be created under the lib directory as before.
deskull [Fri, 7 Feb 2020 15:30:56 +0000 (00:30 +0900)]
Merge pull request #40005 (phonohawk/hengband/fix-build-unix into master).
Eric Branlund [Thu, 6 Feb 2020 09:37:09 +0000 (01:37 -0800)]
For OS X, suppress the warning messages about EUC-JP encoded strings (doing so for both the English and Japanese versions; it would be better to just do so when compiling the Japanese version).
PHO [Thu, 6 Feb 2020 06:26:56 +0000 (15:26 +0900)]
[Fix] Fix a build failure that occurs when --disable-japanese is in effect
PHO [Thu, 6 Feb 2020 06:25:30 +0000 (15:25 +0900)]
[Fix] #39669 Fix build on non-Windows platforms
Eric Branlund [Thu, 6 Feb 2020 02:10:50 +0000 (18:10 -0800)]
Corrected typo in English ability description.
Eric Branlund [Wed, 29 Jan 2020 09:33:33 +0000 (01:33 -0800)]
Changed to keep the save menu entry and command menu entries disabled during player birth.
Eric Branlund [Wed, 29 Jan 2020 09:21:23 +0000 (01:21 -0800)]
Modified so save menu item is disabled while on the splash screen.
Eric Branlund [Tue, 28 Jan 2020 04:45:30 +0000 (20:45 -0800)]
To match English message for adding an essence to an object, swapped the format arguments. Kept the arguments for the Japanese message the same.
Eric Branlund [Tue, 28 Jan 2020 04:30:58 +0000 (20:30 -0800)]
Merge branch 'master' of git://git.osdn.net/gitroot/hengband/hengband
Eric Branlund [Mon, 27 Jan 2020 15:37:40 +0000 (07:37 -0800)]
Changed so that font changes on the main window while playing do a better job of keeping the player in the bounds of the window.
deskull [Mon, 27 Jan 2020 15:19:01 +0000 (00:19 +0900)]
[Fix] #37353 英語版のビルドエラー修正 / Fix build error in English.
Eric Branlund [Sun, 26 Jan 2020 22:29:36 +0000 (14:29 -0800)]
Removed extraneous space in English description for the swimsuit of Milim the Valkyrie.
Eric Branlund [Sun, 26 Jan 2020 01:56:07 +0000 (17:56 -0800)]
Changed when blending is used with tile sets: now use blending if the tile set has an alpha channel. In practice, that means the original tiles will now be rendered with blending (previously they were not) and the Nomad tiles will be rendered without blending (but since they have no opacity information the only difference should be improved rendering speed).
Eric Branlund [Sun, 26 Jan 2020 03:14:07 +0000 (19:14 -0800)]
Added an English description for the sexy swimsuit of Milim the Valkyrie. The description tries to follow Google Translate's result for the Japanese description. It also draws from information from Wikipedia's entry for Queen's Blade Rebellion, https://en.wikipedia.org/wiki/Queen%27s_Blade_Rebellion .
Eric Branlund [Fri, 24 Jan 2020 18:18:22 +0000 (10:18 -0800)]
Changed where init_graphics_modes() is called to align with Angband 4.2.
Eric Branlund [Fri, 24 Jan 2020 18:09:10 +0000 (10:09 -0800)]
Made some whitespace changes to better match what's in Angband's main-cocoa.m.
Eric Branlund [Fri, 24 Jan 2020 17:55:34 +0000 (09:55 -0800)]
Port over correction for Angband issue 4114 ( https://github.com/angband/angband/issues/4114 ): exiting while in fullscreen mode and then restarting leaves terminal 0 acting as if it was the full screen size.
Eric Branlund [Fri, 24 Jan 2020 17:31:31 +0000 (09:31 -0800)]
Added optimization for tile rendering: don't draw the foreground of a tile if it is the same as the background.
Eric Branlund [Fri, 24 Jan 2020 17:11:13 +0000 (09:11 -0800)]
Corrected tile rendering problem introduced by the change to record the drawing changes and flush them in response to TERM_XTRA_FRESH: with tiles, objects and creatures always shown with black background.
Eric Branlund [Thu, 23 Jan 2020 16:26:57 +0000 (08:26 -0800)]
Corrected instance of subject/verb agreement in English description for Keiun-Kininken.
Eric Branlund [Thu, 23 Jan 2020 02:51:06 +0000 (18:51 -0800)]
Replaced "spelling" with "spell casting" in English name for high mage innate ability.
Eric Branlund [Wed, 22 Jan 2020 11:18:43 +0000 (03:18 -0800)]
Fixed instance of whitespace to match adjacent lines.
Eric Branlund [Tue, 21 Jan 2020 01:04:47 +0000 (17:04 -0800)]
Made whitespace changes to reduce the number of differences with Angband's main-cocoa.m.
Eric Branlund [Tue, 21 Jan 2020 00:42:58 +0000 (16:42 -0800)]
Removed commented out code that does not appear in Angband 4.2's main-cocoa.m.
Eric Branlund [Tue, 21 Jan 2020 00:25:46 +0000 (16:25 -0800)]
Reordered keys in Angband-Cocoa.xml so there are fewer differences when compared to the equivalent file in Angband.
Eric Branlund [Mon, 20 Jan 2020 07:26:15 +0000 (23:26 -0800)]
Changed "of The Bonze Octopus" to "of The Bronze Octopus" (Google Translate gives tin in its result, but I'll stick with bronze) and added an English description which interpolates from Google Translate's result for the Japanese description (ignoring the quoted material) and the mention of the legend in kansai-odyssey.com/kishiwada-castle-danjiri-museum/ .
Eric Branlund [Mon, 20 Jan 2020 06:52:40 +0000 (22:52 -0800)]
Added an English description for the metal shod boots 'Tetsu-geta of Flame'. The description largely follows Google Translate's result for the description.
Eric Branlund [Sun, 19 Jan 2020 20:42:39 +0000 (12:42 -0800)]
Added an English description for the metal lamellar armour of the Padre. It tries to cover the same ground as Google Translate's result for the Japanese description.
Eric Branlund [Sun, 19 Jan 2020 19:25:25 +0000 (11:25 -0800)]
Added an English description for the awl-pike 'Ama-no-NumaHoko'. It is a recapitulation of https://en.wikipedia.org/wiki/Amenonuhoko which seems to be the same story given in the Japanese description.
Eric Branlund [Sun, 19 Jan 2020 19:06:55 +0000 (11:06 -0800)]
Added an English description for the blue dragon scale mail 'Elemental of Ching-Rong'. It's an attempt to capture what I think is the intent of the Japanese description (as filtered through Google Translate) and is informed by the content at https://en.wikipedia.org/wiki/Azure_Dragon , https://en.wikipedia.org/wiki/White_Tiger_(mythology) , https://en.wikipedia.org/wiki/Black_Tortoise , and https://en.wikipedia.org/wiki/Vermilion_Bird .
Eric Branlund [Sun, 19 Jan 2020 18:17:25 +0000 (10:17 -0800)]
Added an English description for the rhino hide armour 'Dasai'. It adds some to Google Translate's result for the Japanese description to hint at the penalty to charisma and the AGGRAVATE flag.
Eric Branlund [Sun, 19 Jan 2020 17:53:26 +0000 (09:53 -0800)]
Added an English description for the small metal shield of Perseus. It is a slightly rearranged version of Google Translate's result for the Japanese description.
Eric Branlund [Sun, 19 Jan 2020 17:25:44 +0000 (09:25 -0800)]
Added an English description for the testsubo of Shuten-douji. It is essentially Google Translate's result for the Japanese description with some modifications based on the content from https://en.wikipedia.org/wiki/Shuten-dōji and https://en.wikipedia.org/wiki/Kanabō .
Eric Branlund [Sun, 19 Jan 2020 17:06:25 +0000 (09:06 -0800)]
Added an English description for the falchion of Guan Yu. It is essentially the same as Google Translate's result for the Japanese description, but use the transliteration of the Chinese name for the general from the Three Kingdoms period in Chinese history, https://en.wikipedia.org/wiki/Guan_Yu .
Eric Branlund [Sun, 19 Jan 2020 16:34:52 +0000 (08:34 -0800)]
Inserted missing period in English message. Brings the message into agreement with the changes merged into the For2.2.2-Refactoring branch.
Eric Branlund [Sat, 18 Jan 2020 07:12:12 +0000 (23:12 -0800)]
Added an English description, which is just Google Translate's result for the Japanese description, for the Yumi of irresponsibility.
Eric Branlund [Sat, 18 Jan 2020 06:26:06 +0000 (22:26 -0800)]
Added an English description for the 'Iron ball'. Based on https://nethackwiki.com/wiki/Punishment , this appears to be a Nethack reference. The English description is not particularly close to Google Translate's result for the Japanese description.
Eric Branlund [Fri, 17 Jan 2020 19:25:20 +0000 (11:25 -0800)]
Added an English description for Matoi using Google Translate's result for the Jpanese description, https://en.wikipedia.org/wiki/Matoi , and nihonhikeshihozonkai.org/english/index.html as sources.
Eric Branlund [Fri, 17 Jan 2020 19:09:02 +0000 (11:09 -0800)]
Added an English description for Hyousi-gi using Google Translate's result for the Japanese description and the "Other uses" sectiob of https://en.wikipedia.org/wiki/Hyōshigi as sources.
Eric Branlund [Fri, 17 Jan 2020 08:54:06 +0000 (00:54 -0800)]
Added an English description of the long sword 'Gurenki'. From www-personal.umich.edu/~weyrbrat/fanfic/anime/novels/tsurugi.html , I'm guessing it is a reference to the light novel, Hayou no Tsurugi, so the description uses the color mentioned in Google Translate's result for the Japanese description and an allusion to it's demon-killing prowess (mentioned in that website summarizing Hayou no Tsurugi and implied by the KILL_DEMON | ESP_DEMON flags).
Eric Branlund [Fri, 17 Jan 2020 05:17:35 +0000 (21:17 -0800)]
For clarity, swapped word in the English description for Layzark, the Emperor.
Eric Branlund [Thu, 16 Jan 2020 21:57:52 +0000 (13:57 -0800)]
Changed encoding for keycode and option modifier in macro triggers generated from the Cocoa interface. The changed keycode encoding covers the entire range of a unichar and does not have the possibility of being mistaken for a modifier key. The changed encoding for the option modifier is to match what is used in main-mac.c. Removed direct mapping of some keys (cursor keys, help function key, and delete function key) to the underlying command set and instead pass those through the macro trigger mechanism. That allows the cursor keys to work in the editor for the autopick settings. Added trigger names to match the macro triggers generated by the Cocoa interface in pref-mac.prf and modified the macro patterns there to use trigger names so most of the macros can be shared for the old Mac interface and the Cocoa interface.
Eric Branlund [Wed, 15 Jan 2020 18:24:15 +0000 (10:24 -0800)]
In preparation for keycode encoding changes in main-cocoa.m use "coc" for ANGBAND_SYS rather than "mac". In the preference files for now, treat "coc" as a synonym for "mac".
Eric Branlund [Mon, 13 Jan 2020 04:38:24 +0000 (20:38 -0800)]
Changed to set ANGBAND_SYS before calling load_prefs() so that use the *-mac.prf files rather than the *-xxx.prf ones.
Eric Branlund [Fri, 10 Jan 2020 20:20:58 +0000 (12:20 -0800)]
Corrected awkwardly worded comment.
Eric Branlund [Fri, 10 Jan 2020 18:55:08 +0000 (10:55 -0800)]
Changed English earthquake messages to match what upstream had done in the For2.2.2-Refactoring branch to fix side effects of a global search and replace.
Eric Branlund [Wed, 8 Jan 2020 05:24:22 +0000 (21:24 -0800)]
Went back to using "staffs" as the plural of staff rather than "stave" since saw some sources indicating that both are acceptable and some treating "staves" as archaic. Using "staves" as the plural also would require some modification of object_desc() and the k_info.txt entries for "Quarterstaff", "Jo Staff" and "Bo Staff".
Eric Branlund [Sun, 5 Jan 2020 20:16:03 +0000 (12:16 -0800)]
Added blank line to match how the changes were incorporated into the For2.2.2-Refactoring branch upstream.