From 9dc0b42341f8c7ffbf28c5c7386a19919cde5d47 Mon Sep 17 00:00:00 2001
From: Bardur Arantsson <bardur@scientician.net>
Date: Tue, 14 Apr 2015 06:39:21 +0200
Subject: Rename "pval" parameter to "spell_idx" for clarity

---
 src/cmd5.cc     | 10 +++++-----
 src/spells4.cc  |  8 ++++----
 src/spells4.hpp |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/cmd5.cc b/src/cmd5.cc
index aea592ab..4aaceda7 100644
--- a/src/cmd5.cc
+++ b/src/cmd5.cc
@@ -112,7 +112,7 @@ bool_ is_magestaff()
 }
 
 
-static void browse_school_spell(int book, int pval, object_type *o_ptr)
+static void browse_school_spell(int book, int spell_idx, object_type *o_ptr)
 {
 	int i;
 	int num = 0, where = 1;
@@ -134,13 +134,13 @@ static void browse_school_spell(int book, int pval, object_type *o_ptr)
 	Term_save();
 
 	/* Display a list of spells */
-	where = print_book(book, pval, o_ptr);
+	where = print_book(book, spell_idx, o_ptr);
 
 	/* Get a spell from the user */
 	while (get_com(out_val, &choice))
 	{
 		/* Display a list of spells */
-		where = print_book(book, pval, o_ptr);
+		where = print_book(book, spell_idx, o_ptr);
 
 		/* Note verify */
 		ask = (isupper(choice));
@@ -162,8 +162,8 @@ static void browse_school_spell(int book, int pval, object_type *o_ptr)
 		Term_load();
 
 		/* Display a list of spells */
-		where = print_book(book, pval, o_ptr);
-		print_spell_desc(spell_x(book, pval, i), where);
+		where = print_book(book, spell_idx, o_ptr);
+		print_spell_desc(spell_x(book, spell_idx, i), where);
 	}
 
 
diff --git a/src/spells4.cc b/src/spells4.cc
index 4a952b18..4d72d4ac 100644
--- a/src/spells4.cc
+++ b/src/spells4.cc
@@ -129,13 +129,13 @@ int school_book_length(int sval)
 	return school_book->spell_idxs.size();
 }
 
-int spell_x(int sval, int pval, int i)
+int spell_x(int sval, int spell_idx, int i)
 {
 	assert(i >= 0);
 
 	if (sval == BOOK_RANDOM)
 	{
-		return pval;
+		return spell_idx;
 	}
 	else
 	{
@@ -446,12 +446,12 @@ int print_spell(cptr label_, byte color, int y, s32b s)
 	return y + 1;
 }
 
-int print_book(s16b sval, s32b pval, object_type *obj)
+int print_book(s16b sval, s32b spell_idx, object_type *obj)
 {
 	int y = 2;
 	int i;
 
-	random_book_setup(sval, pval);
+	random_book_setup(sval, spell_idx);
 
 	school_book *school_book = school_books_at(sval);
 
diff --git a/src/spells4.hpp b/src/spells4.hpp
index 7a8c8985..2042ee54 100644
--- a/src/spells4.hpp
+++ b/src/spells4.hpp
@@ -35,8 +35,8 @@ school_book *school_books_at(int sval);
 void school_book_add_spell(school_book *school_book, s32b spell_idx);
 void random_book_setup(s16b sval, s32b spell_idx);
 int print_spell(cptr label, byte color, int y, s32b s);
-int print_book(s16b sval, s32b pval, object_type *obj);
+int print_book(s16b sval, s32b spell_idx, object_type *obj);
 int school_book_length(int sval);
-int spell_x(int sval, int pval, int i);
+int spell_x(int sval, int spell_idx, int i);
 bool_ school_book_contains_spell(int sval, s32b spell_idx);
 void lua_cast_school_spell(s32b spell_idx, bool_ no_cost);
-- 
cgit v1.2.3