summaryrefslogtreecommitdiffstats
path: root/trunk/source/itemname.h
diff options
context:
space:
mode:
authornlanza <nlanza@c06c8d41-db1a-0410-9941-cceddc491573>2005-08-02 04:38:39 +0000
committernlanza <nlanza@c06c8d41-db1a-0410-9941-cceddc491573>2005-08-02 04:38:39 +0000
commit64fb30df969e02635f651f3e6c6bb5f0dce1960c (patch)
tree0c58890a208bcd3101c0b6dc40c33de563732162 /trunk/source/itemname.h
parent94ff479e19f6e5541af96090bc1c207587a6148c (diff)
downloadcrawl-ref-64fb30df969e02635f651f3e6c6bb5f0dce1960c.tar.gz
crawl-ref-64fb30df969e02635f651f3e6c6bb5f0dce1960c.zip
Build fixes to build cleanly on OS X; switch from makefile.lnx to
makefile.osx in the master makefile to build. Note that this checkin adds comments to the start of each modified file tagging the file as modified by Crawl Reference; the license requires this, so we should be careful to stick with it. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'trunk/source/itemname.h')
-rw-r--r--trunk/source/itemname.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/trunk/source/itemname.h b/trunk/source/itemname.h
index 63a606440d..91f649e641 100644
--- a/trunk/source/itemname.h
+++ b/trunk/source/itemname.h
@@ -19,7 +19,7 @@ bool is_vowel( const char chr );
/* ***********************************************************************
* called from: describe - effects - item_use - shopping
* *********************************************************************** */
-char get_ident_type(char cla, char ty);
+char get_ident_type(char cla, int ty);
/* ***********************************************************************
@@ -144,7 +144,7 @@ void save_id(char identy[4][50]);
/* ***********************************************************************
* called from: files - item_use - newgame - ouch - shopping - spells1
* *********************************************************************** */
-void set_ident_type( char cla, char ty, char setting, bool force = false );
+void set_ident_type( char cla, int ty, char setting, bool force = false );
/* ***********************************************************************