From 6f58c0476ee2afc785c3f62aa5b3a7d06561837b Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Sat, 14 Mar 2009 16:36:33 +0000 Subject: Remove references to unimplemented branches (Caverns, Pit, Inferno). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9474 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/branch.cc | 35 +++++-------------- crawl-ref/source/dat/descript/cards.txt | 17 +-------- crawl-ref/source/database.cc | 1 + crawl-ref/source/enum.h | 17 +++------ crawl-ref/source/mon-pick.cc | 62 --------------------------------- crawl-ref/source/player.cc | 4 +-- crawl-ref/source/terrain.cc | 6 ---- crawl-ref/source/view.cc | 6 ---- 8 files changed, 16 insertions(+), 132 deletions(-) diff --git a/crawl-ref/source/branch.cc b/crawl-ref/source/branch.cc index 94145ee906..3e10784e89 100644 --- a/crawl-ref/source/branch.cc +++ b/crawl-ref/source/branch.cc @@ -139,6 +139,14 @@ unsigned long get_branch_flags(branch_type branch) } Branch branches[] = { + // Branch struct: + // branch id, parent branch, depth, startdepth, branch flags, level flags + // entry stairs, exit stairs, short name, long name, abbrev name + // entry message + // has_shops, has_uniques, floor colour, rock colour + // mons rarity function, mons level function + // num_traps_function, rand_trap_function, num_fogs_function, rand_fog_function + // altar chance (in %), travel shortcut, upstairs exit branch, dangerous branch end { BRANCH_MAIN_DUNGEON, BRANCH_MAIN_DUNGEON, 27, -1, 0, 0, NUM_FEATURES, NUM_FEATURES, // sentinel values @@ -312,24 +320,6 @@ Branch branches[] = { NULL, NULL, NULL, NULL, 0, 'Y', true, true }, - { BRANCH_INFERNO, BRANCH_MAIN_DUNGEON, -1, -1, 0, 0, - NUM_FEATURES, NUM_FEATURES, - NULL, NULL, NULL, - NULL, - false, false, BLACK, BLACK, - NULL, NULL, - NULL, NULL, NULL, NULL, - 0, 'R', false, false }, - - { BRANCH_THE_PIT, BRANCH_MAIN_DUNGEON, -1, -1, 0, 0, - NUM_FEATURES, NUM_FEATURES, - NULL, NULL, NULL, - NULL, - false, false, BLACK, BLACK, - NULL, NULL, - NULL, NULL, NULL, NULL, - 0, '0', false, false }, - { BRANCH_HALL_OF_ZOT, BRANCH_MAIN_DUNGEON, 5, 27, BFLAG_HAS_ORB, 0, DNGN_ENTER_ZOT, DNGN_RETURN_FROM_ZOT, "Zot", "the Realm of Zot", "Zot", @@ -338,13 +328,4 @@ Branch branches[] = { mons_hallzot_rare, mons_hallzot_level, NULL, NULL, NULL, NULL, 1, 'Z', false, true }, - - { BRANCH_CAVERNS, BRANCH_MAIN_DUNGEON, -1, -1, 0, 0, - NUM_FEATURES, NUM_FEATURES, - NULL, NULL, NULL, - NULL, - false, false, BLACK, BLACK, - NULL, NULL, - NULL, NULL, NULL, NULL, - 0, 0, false, false } }; diff --git a/crawl-ref/source/dat/descript/cards.txt b/crawl-ref/source/dat/descript/cards.txt index 505f6b173b..7e93dd2843 100644 --- a/crawl-ref/source/dat/descript/cards.txt +++ b/crawl-ref/source/dat/descript/cards.txt @@ -105,7 +105,7 @@ This card turns walls translucent. %%%% the Map -This scroll reveals your surroundings. +This card reveals your surroundings. %%%% the Banshee @@ -229,18 +229,3 @@ a very buggy card Buggy (It's a bug if you ever see this.) %%%% - - [ Part 3: "Attached Text" ] - ------------------------------------------------------------------------------- -Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are -powering Web 2.0 with engaging, cross-platform capabilities. Quickly and -easily build your RIAs with Flex Builder, the Eclipse(TM)based development -software that enables intelligent coding and step-through debugging. -Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com - [ Part 4: "Attached Text" ] - -_______________________________________________ -Crawl-ref-discuss mailing list -Crawl-ref-discuss@lists.sourceforge.net -https://lists.sourceforge.net/lists/listinfo/crawl-ref-discuss diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc index 177dc34949..a3c2346e7f 100644 --- a/crawl-ref/source/database.cc +++ b/crawl-ref/source/database.cc @@ -70,6 +70,7 @@ static TextDB AllDBs[] = "descript/branches.txt", "descript/skills.txt", "descript/ability.txt", + "descript/cards.txt", NULL), TextDB( "db/randart", diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index a505667027..76aaddfe58 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -349,11 +349,8 @@ enum branch_type // you.where_are_you BRANCH_GEHENNA, BRANCH_COCYTUS, BRANCH_TARTARUS, - BRANCH_INFERNO, // unimplemented - BRANCH_THE_PIT, // unimplemented - BRANCH_LAST_HELL = BRANCH_THE_PIT, + BRANCH_LAST_HELL = BRANCH_TARTARUS, BRANCH_HALL_OF_ZOT, - BRANCH_CAVERNS, // unimplemented NUM_BRANCHES }; @@ -1045,10 +1042,7 @@ enum dungeon_feature_type DNGN_ENTER_TOMB, DNGN_ENTER_SWAMP, // 122 DNGN_ENTER_SHOALS, - DNGN_ENTER_RESERVED_2, - DNGN_ENTER_RESERVED_3, - DNGN_ENTER_RESERVED_4, // 126 - DNGN_ENTER_LAST_BRANCH = DNGN_ENTER_RESERVED_4, + DNGN_ENTER_LAST_BRANCH = DNGN_ENTER_SHOALS, // Exits from various branches // Order must be the same as above @@ -1065,12 +1059,9 @@ enum dungeon_feature_type DNGN_RETURN_FROM_SNAKE_PIT, DNGN_RETURN_FROM_ELVEN_HALLS, // 140 DNGN_RETURN_FROM_TOMB, - DNGN_RETURN_FROM_SWAMP, // 142 + DNGN_RETURN_FROM_SWAMP, // 142 DNGN_RETURN_FROM_SHOALS, - DNGN_RETURN_RESERVED_2, - DNGN_RETURN_RESERVED_3, - DNGN_RETURN_RESERVED_4, // 146 - DNGN_RETURN_FROM_LAST_BRANCH = DNGN_RETURN_RESERVED_4, + DNGN_RETURN_FROM_LAST_BRANCH = DNGN_RETURN_FROM_SHOALS, // Portals to various places unknown. DNGN_ENTER_PORTAL_VAULT = 160, diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc index b02a6e2871..02f9a8ec0c 100644 --- a/crawl-ref/source/mon-pick.cc +++ b/crawl-ref/source/mon-pick.cc @@ -2344,68 +2344,6 @@ int mons_hallzot_rare(int mcls) } } -// The Caverns (unused) -int mons_caverns_level( int mcls ) -{ - int mlev = absdungeon_depth(BRANCH_CAVERNS, 1); - - switch (mcls) - { - case MONS_YELLOW_DRACONIAN: - case MONS_BLACK_DRACONIAN: - case MONS_WHITE_DRACONIAN: - case MONS_RED_DRACONIAN: - case MONS_PURPLE_DRACONIAN: - case MONS_PALE_DRACONIAN: - case MONS_GREEN_DRACONIAN: - case MONS_MOTTLED_DRACONIAN: - mlev++; - break; - - case MONS_DRACONIAN_CALLER: - case MONS_DRACONIAN_MONK: - case MONS_DRACONIAN_SCORCHER: - case MONS_DRACONIAN_KNIGHT: - case MONS_DRACONIAN_ANNIHILATOR: - case MONS_DRACONIAN_ZEALOT: - case MONS_DRACONIAN_SHIFTER: - mlev += 3; - break; - - default: - mlev += 99; - break; - } - - return (mlev); -} - -int mons_caverns_rare( int mcls ) -{ - switch (mcls) - { - case MONS_YELLOW_DRACONIAN: - case MONS_BLACK_DRACONIAN: - case MONS_WHITE_DRACONIAN: - case MONS_RED_DRACONIAN: - case MONS_PURPLE_DRACONIAN: - case MONS_PALE_DRACONIAN: - case MONS_GREEN_DRACONIAN: - case MONS_MOTTLED_DRACONIAN: - case MONS_DRACONIAN_CALLER: - case MONS_DRACONIAN_MONK: - case MONS_DRACONIAN_SCORCHER: - case MONS_DRACONIAN_KNIGHT: - case MONS_DRACONIAN_ANNIHILATOR: - case MONS_DRACONIAN_ZEALOT: - case MONS_DRACONIAN_SHIFTER: - return (500); - - default: - return (0); - } -} - // The Hells // The Iron City of Dis diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 9658de3510..b6fff40d84 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -396,7 +396,7 @@ bool player_in_hell( void ) // No real reason except to draw someone's attention here if they // mess with the branch enum. COMPILE_CHECK(BRANCH_FIRST_HELL == BRANCH_DIS, a); - COMPILE_CHECK(BRANCH_LAST_HELL == BRANCH_THE_PIT, b); + COMPILE_CHECK(BRANCH_LAST_HELL == BRANCH_TARTARUS, b); return (you.level_type == LEVEL_DUNGEON && you.where_are_you >= BRANCH_FIRST_HELL @@ -4346,7 +4346,7 @@ bool player_is_airborne(void) return you.airborne(); } -bool player_has_spell(spell_type spell) +bool player_has_spell( spell_type spell ) { return you.has_spell(spell); } diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc index 24194ae463..305979db1e 100644 --- a/crawl-ref/source/terrain.cc +++ b/crawl-ref/source/terrain.cc @@ -126,9 +126,6 @@ command_type grid_stair_direction(dungeon_feature_type grid) case DNGN_RETURN_FROM_TOMB: case DNGN_RETURN_FROM_SWAMP: case DNGN_RETURN_FROM_SHOALS: - case DNGN_RETURN_RESERVED_2: - case DNGN_RETURN_RESERVED_3: - case DNGN_RETURN_RESERVED_4: case DNGN_ENTER_SHOP: case DNGN_EXIT_HELL: case DNGN_EXIT_PORTAL_VAULT: @@ -164,9 +161,6 @@ command_type grid_stair_direction(dungeon_feature_type grid) case DNGN_ENTER_TOMB: case DNGN_ENTER_SWAMP: case DNGN_ENTER_SHOALS: - case DNGN_ENTER_RESERVED_2: - case DNGN_ENTER_RESERVED_3: - case DNGN_ENTER_RESERVED_4: return (CMD_GO_DOWNSTAIRS); default: diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index 71c242352a..eae37eed80 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -4473,9 +4473,6 @@ void init_feature_table( void ) case DNGN_ENTER_TOMB: case DNGN_ENTER_SWAMP: case DNGN_ENTER_SHOALS: - case DNGN_ENTER_RESERVED_2: - case DNGN_ENTER_RESERVED_3: - case DNGN_ENTER_RESERVED_4: Feature[i].colour = YELLOW; Feature[i].dchar = DCHAR_STAIRS_DOWN; Feature[i].flags |= FFT_NOTABLE; @@ -4506,9 +4503,6 @@ void init_feature_table( void ) case DNGN_RETURN_FROM_TOMB: case DNGN_RETURN_FROM_SWAMP: case DNGN_RETURN_FROM_SHOALS: - case DNGN_RETURN_RESERVED_2: - case DNGN_RETURN_RESERVED_3: - case DNGN_RETURN_RESERVED_4: Feature[i].colour = YELLOW; Feature[i].dchar = DCHAR_STAIRS_UP; Feature[i].map_colour = GREEN; -- cgit v1.2.3-54-g00ecf