summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crawl-ref/source/acr.cc2
-rw-r--r--crawl-ref/source/cio.cc2
-rw-r--r--crawl-ref/source/describe.cc12
-rw-r--r--crawl-ref/source/guic-x11.cc2
-rw-r--r--crawl-ref/source/initfile.cc4
-rw-r--r--crawl-ref/source/lev-pand.cc2
-rw-r--r--crawl-ref/source/libunix.cc2
-rw-r--r--crawl-ref/source/makeitem.cc4
-rw-r--r--crawl-ref/source/mon-data.h2
-rw-r--r--crawl-ref/source/mpr.h4
-rw-r--r--crawl-ref/source/mutation.cc4
-rw-r--r--crawl-ref/source/output.cc14
-rw-r--r--crawl-ref/source/tile2.cc2
-rw-r--r--crawl-ref/source/unrand.h18
-rw-r--r--crawl-ref/source/view.cc2
15 files changed, 39 insertions, 37 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 0451419fcf..0b4fba6736 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -2479,7 +2479,7 @@ void process_command( command_type cmd )
if (Options.tutorial_left)
{
std::string msg = "Unknown command. (For a list of commands type "
- "<w>?\?<lightgray>.)";
+ "<w>?\?<lightgrey>.)";
print_formatted_paragraph(msg, get_number_of_cols());
}
else // well, not examine, but...
diff --git a/crawl-ref/source/cio.cc b/crawl-ref/source/cio.cc
index 8dfced98b0..e74e6dbd3e 100644
--- a/crawl-ref/source/cio.cc
+++ b/crawl-ref/source/cio.cc
@@ -169,7 +169,7 @@ int c_getch()
}
// Wrapper around cgotoxy that can draw a fake cursor for Unix terms where
-// cursoring over darkgray or black causes problems.
+// cursoring over darkgrey or black causes problems.
void cursorxy(int x, int y)
{
#if defined(USE_TILE)
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 3cc763da2a..4221b884cc 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2911,7 +2911,7 @@ void describe_god( god_type which_god, bool give_title )
cprintf (EOL EOL);
// Print god's description.
- textcolor(LIGHTGRAY);
+ textcolor(LIGHTGREY);
std::string god_desc = getLongDescription(god_name(which_god, false));
const int numcols = get_number_of_cols();
@@ -2934,7 +2934,7 @@ void describe_god( god_type which_god, bool give_title )
// I know these messages aren't perfect so if you can think up
// something better, do it.
- textcolor(LIGHTGRAY);
+ textcolor(LIGHTGREY);
cprintf(EOL EOL "Favour - ");
textcolor(colour);
@@ -2969,7 +2969,7 @@ void describe_god( god_type which_god, bool give_title )
//mv: The following code shows abilities given by your god (if any).
- textcolor(LIGHTGRAY);
+ textcolor(LIGHTGREY);
cprintf(EOL EOL "Granted powers: (Cost)" EOL);
textcolor(colour);
@@ -3081,13 +3081,13 @@ void describe_god( god_type which_god, bool give_title )
else
cgotoxy(1, bottom_line - 2, GOTO_CRT);
- textcolor(LIGHTGRAY);
+ textcolor(LIGHTGREY);
cprintf(get_linebreak_string(_religion_help(which_god),
numcols).c_str());
}
- cgotoxy(1, bottom_line-1);
- textcolor(LIGHTGRAY);
+ cgotoxy(1, bottom_line - 1);
+ textcolor(LIGHTGREY);
formatted_string::parse_string(
"Press '<w>!</w>' to toggle between the overview and the more detailed "
"description.").display();
diff --git a/crawl-ref/source/guic-x11.cc b/crawl-ref/source/guic-x11.cc
index 315cfb37b3..965f3089d4 100644
--- a/crawl-ref/source/guic-x11.cc
+++ b/crawl-ref/source/guic-x11.cc
@@ -1025,7 +1025,7 @@ XImage *read_png (const char *fname)
png_set_packing (png_ptr);
/* sBIT handling is very tricky. If we are extracting only the image, we
- can use the sBIT info for grayscale and color images, if the three
+ can use the sBIT info for greyscale and color images, if the three
values agree. If we extract the transparency/alpha mask, sBIT is
irrelevant for trans and valid for alpha. If we mix both, the
multiplication may result in values that require the normal bit depth,
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 2d8ec1b2ce..ed89744d20 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -145,9 +145,11 @@ int str_to_colour( const std::string &str, int default_colour,
ASSERT(ARRAYSZ(element_cols) == (EC_RANDOM - EC_FIRE) + 1);
- for (ret = 0; ret < 16; ret++)
+ for (ret = 0; ret < 16; ++ret)
+ {
if (str == cols[ret])
break;
+ }
// Check for alternate spellings.
if (ret == 16)
diff --git a/crawl-ref/source/lev-pand.cc b/crawl-ref/source/lev-pand.cc
index f2028b7edf..acbb984779 100644
--- a/crawl-ref/source/lev-pand.cc
+++ b/crawl-ref/source/lev-pand.cc
@@ -94,7 +94,7 @@ void init_pandemonium(void)
}
// colour of monster 9 is colour of floor, 8 is colour of rock
- // IIRC, BLACK is set to LIGHTGRAY
+ // IIRC, BLACK is set to LIGHTGREY
for (pc = 0; pc < 10; ++pc)
{
diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc
index d8f97915cd..eb66fb36ab 100644
--- a/crawl-ref/source/libunix.cc
+++ b/crawl-ref/source/libunix.cc
@@ -28,7 +28,7 @@
The colour exchange system is perhaps a little overkill, but I wanted
it to be general to support future changes.. The only thing not
supported properly is black on black (used by curses for "normal" mode)
- and white on white (used by me for "bright black" (darkgray) on black
+ and white on white (used by me for "bright black" (darkgrey) on black
Jan 1998 Svante Gerhard <svante@algonet.se> */
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 48c1ff9b70..4c52a30ec7 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -190,7 +190,7 @@ static int _newwave_missile_colour(const item_def &item)
item_colour = RED;
break;
case MI_THROWING_NET:
- item_colour = DARKGRAY;
+ item_colour = DARKGREY;
break;
default:
// huh?
@@ -219,7 +219,7 @@ static int _classic_missile_colour(const item_def &item)
item_colour = WHITE;
break;
case MI_THROWING_NET:
- item_colour = DARKGRAY;
+ item_colour = DARKGREY;
break;
default:
item_colour = LIGHTCYAN;
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 5408f1faf5..8a5f4973a3 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -2972,7 +2972,7 @@
// mv:but it can be generated by polymorph spells and because IMO it's
// logical polymorph target so complete monster statistics should exist.
{
- MONS_HUMAN, '@', LIGHTGRAY, "human",
+ MONS_HUMAN, '@', LIGHTGREY, "human",
M_WARM_BLOOD | M_SPEAKS,
MR_NO_FLAGS,
550, 10, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3,
diff --git a/crawl-ref/source/mpr.h b/crawl-ref/source/mpr.h
index 17d203fb98..4a677ba730 100644
--- a/crawl-ref/source/mpr.h
+++ b/crawl-ref/source/mpr.h
@@ -63,8 +63,8 @@ enum msg_colour_type
MSGCOL_RED,
MSGCOL_MAGENTA,
MSGCOL_BROWN,
- MSGCOL_LIGHTGRAY,
- MSGCOL_DARKGRAY,
+ MSGCOL_LIGHTGREY,
+ MSGCOL_DARKGREY,
MSGCOL_LIGHTBLUE,
MSGCOL_LIGHTGREEN,
MSGCOL_LIGHTCYAN,
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 3688ed7605..573c924ba7 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -1307,7 +1307,7 @@ formatted_string describe_mutations()
if ( you.species == SP_DEMONSPAWN )
{
if (fully_inactive)
- colourname = "darkgray";
+ colourname = "darkgrey";
else if (!fully_active)
colourname = "yellow";
else if ( you.demon_pow[i] < you.mutation[i] )
@@ -1318,7 +1318,7 @@ formatted_string describe_mutations()
else // innate ability
{
if (fully_inactive)
- colourname = "darkgray";
+ colourname = "darkgrey";
else if (!fully_active)
colourname = "blue";
else if ( you.demon_pow[i] < you.mutation[i] )
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 6ab46233b2..a3eadda080 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -158,12 +158,12 @@ class colour_bar
int m_request_redraw_after; // force a redraw at this turn count
};
-colour_bar HP_Bar(LIGHTGREEN, GREEN, RED, DARKGRAY);
+colour_bar HP_Bar(LIGHTGREEN, GREEN, RED, DARKGREY);
#ifdef USE_TILE
-colour_bar MP_Bar(BLUE, BLUE, LIGHTBLUE, DARKGRAY);
+colour_bar MP_Bar(BLUE, BLUE, LIGHTBLUE, DARKGREY);
#else
-colour_bar MP_Bar(LIGHTBLUE, BLUE, MAGENTA, DARKGRAY);
+colour_bar MP_Bar(LIGHTBLUE, BLUE, MAGENTA, DARKGREY);
#endif
// ----------------------------------------------------------------------
@@ -1658,25 +1658,25 @@ static void _print_overview_screen_equip(column_composer& cols,
else if (!you_can_wear(e_order[i], true))
{
snprintf(buf, sizeof buf,
- "%s<darkgray>(%s unavailable)</darkgray>",
+ "%s<darkgrey>(%s unavailable)</darkgrey>",
slot, slot_name_lwr);
}
else if (!you_tran_can_wear(e_order[i], true))
{
snprintf(buf, sizeof buf,
- "%s<darkgray>(%s currently unavailable)</darkgray>",
+ "%s<darkgrey>(%s currently unavailable)</darkgrey>",
slot, slot_name_lwr);
}
else if (!you_can_wear(e_order[i]))
{
snprintf(buf, sizeof buf,
- "%s<lightgray>(%s restricted)</lightgray>",
+ "%s<lightgrey>(%s restricted)</lightgrey>",
slot, slot_name_lwr);
}
else
{
snprintf(buf, sizeof buf,
- "<darkgray>(no %s)</darkgray>", slot_name_lwr);
+ "<darkgrey>(no %s)</darkgrey>", slot_name_lwr);
}
cols.add_formatted(2, buf, false);
}
diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc
index efce722939..e66ae39e74 100644
--- a/crawl-ref/source/tile2.cc
+++ b/crawl-ref/source/tile2.cc
@@ -1007,7 +1007,7 @@ void WallIdx(int &wall, int &floor, int &special)
case BLUE:
wall = IDX_WALL_ICE;
break;
- case LIGHTGRAY:
+ case LIGHTGREY:
case WHITE:
wall = IDX_WALL_HALL;
break;
diff --git a/crawl-ref/source/unrand.h b/crawl-ref/source/unrand.h
index 1b52e0022a..643210be5a 100644
--- a/crawl-ref/source/unrand.h
+++ b/crawl-ref/source/unrand.h
@@ -470,7 +470,7 @@
/* 18 */
{
"scythe \"Finisher\"", "blackened scythe",
- OBJ_WEAPONS, WPN_SCYTHE, +3, +5, DARKGRAY,
+ OBJ_WEAPONS, WPN_SCYTHE, +3, +5, DARKGREY,
{
SPWPN_SPEED, 0, 0, 3, 0, 0, // str
0, 0, 0, 0, 0, 0,
@@ -743,7 +743,7 @@
/* 33 */
{
"robe of Folly", "dull robe",
- OBJ_ARMOUR, ARM_ROBE, -1, 0, LIGHTGRAY,
+ OBJ_ARMOUR, ARM_ROBE, -1, 0, LIGHTGREY,
{
0, 0, 0, 0, -5, 0, // int
0, 0, 0, 0, 0, 0,
@@ -754,7 +754,7 @@
}
,
"",
- "A dull gray robe.",
+ "A dull grey robe.",
""
}
,
@@ -815,7 +815,7 @@
/* 37 */
{
"ring of Robustness", "steel ring",
- OBJ_JEWELLERY, RING_PROTECTION, +8, 0, LIGHTGRAY,
+ OBJ_JEWELLERY, RING_PROTECTION, +8, 0, LIGHTGREY,
{
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
@@ -851,7 +851,7 @@
/* 39 */
{
"spear of Voo-Doo", "ebony spear",
- OBJ_WEAPONS, WPN_SPEAR, +2, +10, DARKGRAY,
+ OBJ_WEAPONS, WPN_SPEAR, +2, +10, DARKGREY,
{
SPWPN_VAMPIRICISM, 0, 0, 0, 0, 0,
0, 0, 0, 1, 1, 0, // res poison, prot life
@@ -925,7 +925,7 @@
/* 43 */
{
"Elemental Staff", "black staff",
- OBJ_WEAPONS, WPN_QUARTERSTAFF, +3, +1, DARKGRAY,
+ OBJ_WEAPONS, WPN_QUARTERSTAFF, +3, +1, DARKGREY,
{
SPWPN_PROTECTION, 0, 0, 0, 0, 0,
2, 2, 0, 0, 0, 60, // res fire, cold, magic
@@ -944,7 +944,7 @@
/* 44 */
{
"hand crossbow \"Sniper\"", "black crossbow",
- OBJ_WEAPONS, WPN_HAND_CROSSBOW, +10, +0, DARKGRAY,
+ OBJ_WEAPONS, WPN_HAND_CROSSBOW, +10, +0, DARKGREY,
{
SPWPN_VENOM, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
@@ -980,7 +980,7 @@
/* 46 */
{
"robe of Night", "black robe",
- OBJ_ARMOUR, ARM_ROBE, +4, 0, DARKGRAY,
+ OBJ_ARMOUR, ARM_ROBE, +4, 0, DARKGREY,
{
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 30, // res magic
@@ -1017,7 +1017,7 @@
/* 48 */
{
"great mace \"Undeadhunter\"", "great steel mace",
- OBJ_WEAPONS, WPN_GREAT_MACE, +7, +7, LIGHTGRAY,
+ OBJ_WEAPONS, WPN_GREAT_MACE, +7, +7, LIGHTGREY,
{
SPWPN_HOLY_WRATH, 0, 0, 0, 0, 0,
0, 0, 0, 0, 1, 0, // life prot
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc
index 6f5d247326..3f8c65f2eb 100644
--- a/crawl-ref/source/view.cc
+++ b/crawl-ref/source/view.cc
@@ -432,7 +432,7 @@ static void _get_symbol( int x, int y,
else if (!one_chance_in(3))
*colour = LIGHTCYAN | colmask; // 1/6
else
- *colour = LIGHTGRAY | colmask; // 1/12
+ *colour = LIGHTGREY | colmask; // 1/12
}
}
else if (object < NUM_REAL_FEATURES && _show_bloodcovered(x,y))
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-05-20 15:59:21 +0000