OSDN Git Service
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.
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.
Eric Branlund [Thu, 2 Jul 2020 15:50:32 +0000 (08:50 -0700)]
Dropped period in English knowledge menu entry for consistency with the other entries.
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.
Eric Branlund [Mon, 6 Apr 2020 00:18:58 +0000 (17:18 -0700)]
Changed to mark the writeable files directory (~/Documents/Hengband previously) with a version number (so it's now ~/Documents/Hengband-2.2.1). That's to make it harder to load an incompatible save file since the plan is to put out the new Mac OS X interface with the old code base, 1.6.2, and presumably at some point put out a version for the code being called 2.2.2.
Eric Branlund [Sun, 5 Apr 2020 23:58:23 +0000 (16:58 -0700)]
Set player_egid before calling init_angband(). For good measure also set player_euid as well. Does not appear to have an effect with Hengband 2.2.1.7 but was necessary with Hengband 1.6.4.
Eric Branlund [Sun, 29 Mar 2020 20:54:36 +0000 (13:54 -0700)]
Corrected typo: "price" instead of the intended "prize".
Eric Branlund [Sun, 29 Mar 2020 18:43:17 +0000 (11:43 -0700)]
Changed the English diary entries about the gender and personality selections so "gender" appears in the one about gender, rather than the "personality" that was there before, and "personality" appears in the one about personality.
Eric Branlund [Sun, 29 Mar 2020 18:40:34 +0000 (11:40 -0700)]
Corrected English diary entry about realm selection to put "and" between the realms if there are two and use "realm" or "realms" as appropriate.
Eric Branlund [Sun, 29 Mar 2020 17:20:51 +0000 (10:20 -0700)]
In the English version, the period at the end of the Trump realm short description wasn't being cleared on the birth realm selection screen (an earlier change made it longer and it then exceeded the length of the string used for clearing). To fix that, use prt() to clear to the end of the line when displaying the selected realm and realm short description. Also share more code between the Japanese and English versions for that display.
Eric Branlund [Fri, 27 Mar 2020 03:43:21 +0000 (20:43 -0700)]
Since terminals other than terminal zero are configured to be panels and can not become the main window, test the keyWindow property for deciding where to apply font changes.
Eric Branlund [Wed, 25 Mar 2020 07:50:21 +0000 (00:50 -0700)]
Corrected English typo ('Arane' rather than 'Arena' in diary messages).
Eric Branlund [Tue, 24 Mar 2020 16:03:17 +0000 (09:03 -0700)]
For the English messages related to damage from the dust robe, changed the tense on the destruction message to match the other destruction messages and changed the damage message from "gets zapped" to "gets sliced" to better indicate the nature of the damage.
Eric Branlund [Tue, 24 Mar 2020 15:59:57 +0000 (08:59 -0700)]
Made "cinder" plural in English message for electric aura to be more idiomatic.
Eric Branlund [Tue, 24 Mar 2020 15:56:09 +0000 (08:56 -0700)]
Corrected English typo on first birth screen.
Eric Branlund [Tue, 24 Mar 2020 04:14:58 +0000 (21:14 -0700)]
For consistency, changed English diary entries to use simple past tense. Also omitted the subject in most (since it's implicitly the adventurer). Made a couple of changes in the diary text to be more idiomatic.
Eric Branlund [Sun, 22 Mar 2020 19:02:28 +0000 (12:02 -0700)]
It's not currently used in hengband, but bring over the change to mouse event handling from Angband that prevents clicks on the title bar from being passed to the core.
Eric Branlund [Fri, 20 Mar 2020 03:49:54 +0000 (20:49 -0700)]
Corrected spelling in English description of the hatchet of Elmi the Murderer.
Eric Branlund [Fri, 20 Mar 2020 02:35:20 +0000 (19:35 -0700)]
Ported faster rendering strategy for OS X from Angband.
Eric Branlund [Wed, 18 Mar 2020 06:32:29 +0000 (23:32 -0700)]
When calculating the number of columns, round down as is done with the number of rows: prefer blank space to partially cut off character in both directions.
Eric Branlund [Wed, 18 Mar 2020 05:32:54 +0000 (22:32 -0700)]
Changed to user changes to the window size are in increments of the current width for a column or the current height for a row. Requires at least 10.3 for NSWindow's contentResizeIncrements.
Eric Branlund [Tue, 10 Mar 2020 01:03:19 +0000 (18:03 -0700)]
Changed so the auxiliary windows are not floating panels; otherwise they're always in front of the main window, which is annoying.
Eric Branlund [Mon, 9 Mar 2020 16:19:59 +0000 (09:19 -0700)]
Put the do_cmd_redraw() and wakeup_event_loop() combination in a separate function. Also, character_generated always implies game_in_progress, so don't need to test the latter when testing the former.
Eric Branlund [Mon, 9 Mar 2020 15:19:33 +0000 (08:19 -0700)]
Refactored some tests of the graphics mode. Replaced a direct test of current_graphics_mode with a call to graphics_are_enabled(). Added an analogue to graphics_are_enabled() which tests the requested graphics mode.
Eric Branlund [Sat, 7 Mar 2020 22:18:08 +0000 (14:18 -0800)]
Changed to use the line from news_j.txt as the Japanese string for the copyright.
Eric Branlund [Sat, 7 Mar 2020 22:02:18 +0000 (14:02 -0800)]
Added instructions about how to set an exception for the hengband application since it is not signed.
Eric Branlund [Sat, 7 Mar 2020 21:54:11 +0000 (13:54 -0800)]
Use "Xcode" rather than "XCode" to be consistent how Apple capitalizes it.
Eric Branlund [Sat, 7 Mar 2020 21:51:51 +0000 (13:51 -0800)]
Changed to 10.8 since the current Cocoa client uses Base internationalization which is supported on 10.8 or later.
Eric Branlund [Sat, 7 Mar 2020 21:50:57 +0000 (13:50 -0800)]
Corrected typo: "Mac OS X 7" instead of the intended "Mac OS X 10.7".
Eric Branlund [Sat, 7 Mar 2020 20:58:36 +0000 (12:58 -0800)]
Changed the order of the directories in init_file_paths to match what's in the For2.2.2-Refactoring-Cocoa2 branch (which used the ordering from PHO's patch).
Eric Branlund [Sat, 7 Mar 2020 20:55:50 +0000 (12:55 -0800)]
Modified comment for init_file_paths to match up with the For2.2.2-Refactoring-Cocoa2 branch.
Eric Branlund [Sat, 7 Mar 2020 20:47:43 +0000 (12:47 -0800)]
Changed to match the For2.2.2-Refactoring-Cocoa2 branch. Put se_maoudamashii_voice_monster01.wav with the rest of the sound files though it still isn't mentioned in sound.cfg.
Eric Branlund [Sat, 7 Mar 2020 20:43:48 +0000 (12:43 -0800)]
Corrected some comments to match the For2.2.2-Refactoring-Cocoa2 branch.
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.