Skip to content

Boulder #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Beakerboy merged 2 commits into from
Jul 2, 2026
Merged

Boulder #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69178f0
Add boulder symbol option to Nethack options
Beakerboy Jul 2, 2026
e4920e3
Remove boulder symbol option and related code
Beakerboy Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Classes/iNethackAppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ - (void)applicationDidFinishLaunching:(UIApplication *)application {
NSString *dogName = [defaults stringForKey:@"dogname"];
NSString *catName = [defaults stringForKey:@"catname"];
NSString *horseName = [defaults stringForKey:@"horsename"];
NSString *boulderSym = [defaults stringForKey:@"boulderSym"];
NSMutableArray *activeOptions = [NSMutableArray array];

if (startAsBlind) {
Expand All @@ -66,6 +67,10 @@ - (void)applicationDidFinishLaunching:(UIApplication *)application {
if (horseName && [horseName length] > 0) {
NSString *horseOption = [NSString stringWithFormat:@"horsename:%@", horseName];
[activeOptions addObject:horseOption];
}
if (boulderSym && ![boulderSym isEqualToString:@"`"]) {
NSString *boulderOption = [NSString stringWithFormat:@"boulder:%@", boulderSym];
[activeOptions addObject:boulderOption];
}
if ([activeOptions count] > 0) {
NSString *optionsString = [activeOptions componentsJoinedByString:@","];
Expand Down
21 changes: 0 additions & 21 deletions Classes/win/iphone/winiphone.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
#define kOptionUsername (@"username")
#define kOptionAutopickup (@"autopickup")
#define kOptionPickupTypes (@"pickupTypes")
#define kOptionBoulderSym (@"boulderSym")
#define kOptionTravel (@"travel")
#define kOptionPickupThrown (@"pickupThrown")
#define kOptionWizard (@"wizard")
Expand Down Expand Up @@ -177,7 +176,6 @@ + (void) initialize {
[defaults registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
@"YES", kOptionAutopickup,
@"$\"=/!?+", kOptionPickupTypes,
@"`", kOptionBoulderSym,
@"YES", kOptionTravel,
@"YES", kOptionPickupThrown,
@"YES", kOptionAutokick,
Expand Down Expand Up @@ -593,25 +591,6 @@ void iphone_init_options() {
flags.verbose = TRUE;
iflags.toptenwin = TRUE;
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
//iNethack2: custom boulder symbol
NSString *boulderSym = [defaults objectForKey:kOptionBoulderSym];
if (boulderSym==NULL)
boulderSym=@"`";
const char *bould = [boulderSym UTF8String];
boulderSym = [boulderSym substringToIndex:1];
//Update user preference to ensure it's only 1 character long
if ([[NSUserDefaults standardUserDefaults] stringForKey:@"boulderSym"]) {
[[NSUserDefaults standardUserDefaults] setObject:boulderSym forKey:@"boulderSym"];
}
iflags.bouldersym = (uchar) bould[0];

// Nethack 36: custom boulders work different now.
if (![boulderSym isEqual: @"`"]) {
ov_primary_syms[SYM_BOULDER + SYM_OFF_X] = (nhsym) iflags.bouldersym;
ov_rogue_syms[SYM_BOULDER + SYM_OFF_X] = (nhsym) iflags.bouldersym;
init_primary_symbols();
init_showsyms();
}

//iNethack2: pickup_thrown setting
flags.pickup_thrown = [defaults boolForKey:kOptionPickupThrown];
Expand Down
Loading