summaryrefslogtreecommitdiff
path: root/src/cmd7.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:57 +0100
committerBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:57 +0100
commit4b6f8d810f5ad513bea8fada09be01dde0fd643c (patch)
tree380e3b41ad48424ecf48d1af7bbd11f17cbdd6db /src/cmd7.cc
parentc4746c0f6d328baa429c96e54d86d2d7f97ccbcc (diff)
Remove k_name, k_text, k_head in favor of simple strings
Diffstat (limited to 'src/cmd7.cc')
-rw-r--r--src/cmd7.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/cmd7.cc b/src/cmd7.cc
index c750104f..fabf8c7a 100644
--- a/src/cmd7.cc
+++ b/src/cmd7.cc
@@ -1680,12 +1680,12 @@ bool_ artifact_display_or_use(int pval, int oldpval, bool_ use)
if ( missing )
c_prt(TERM_RED, format("%d of the required %d essences of %s",
missing, essence[i],
- k_name + k_info[lookup_kind(TV_BATERIE, i + 1)].name ),
+ k_info[lookup_kind(TV_BATERIE, i + 1)].name ),
row++, col);
else
c_prt(TERM_GREEN, format("you have the needed %d essences of %s",
essence[i],
- k_name + k_info[lookup_kind(TV_BATERIE, i + 1)].name ),
+ k_info[lookup_kind(TV_BATERIE, i + 1)].name ),
row++, col);
}
@@ -2737,7 +2737,7 @@ void alchemist_display_recipe(int tval, int sval, int ego)
c_prt(TERM_GREEN,
format(" %d essence%s %s ", qty,
qty > 1 ? "s" : "",
- k_name + k_info[lookup_kind(TV_BATERIE, alchemist_recipes[al_idx].sval_essence)].name ),
+ k_info[lookup_kind(TV_BATERIE, alchemist_recipes[al_idx].sval_essence)].name),
row++, col);
}
@@ -2910,8 +2910,10 @@ void alchemist_recipe_book(void)
}
}
else
+ {
/* add this essence to the list*/
- strip_and_print(k_name + k_info[kidx].name, TERM_WHITE, num);
+ strip_and_print(k_info[kidx].name, TERM_WHITE, num);
+ }
choice[num++] = i;
}
@@ -3040,7 +3042,7 @@ void alchemist_recipe_book(void)
break;
}
strcat(names, " of ");
- strcat(names, k_name + k_info[kidx].name);
+ strcat(names, k_info[kidx].name);
}
@@ -3228,7 +3230,7 @@ int alchemist_recipe_select(int *tval, int sval, int ego, bool_ recipe)
/* Acquire the "name" of object "i" */
/* and print it in it's place */
- strip_and_print(k_name + k_ptr->name, color, num);
+ strip_and_print(k_ptr->name, color, num);
/* Remember the object index */
validc[num] = color;