From fe3d4ce758822d65a0a5d617b7b77df2dbc972d8 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Sun, 16 Mar 2014 14:55:57 -0700
Subject: Implement new magic frontend using sexpr

---
 src/map/script.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/map/script.cpp')

diff --git a/src/map/script.cpp b/src/map/script.cpp
index fe42e44..9884aae 100644
--- a/src/map/script.cpp
+++ b/src/map/script.cpp
@@ -1832,7 +1832,7 @@ void builtin_countitem(ScriptState *st)
     get_val(st, data);
     if (data->type == ByteCode::STR || data->type == ByteCode::CONSTSTR)
     {
-        ItemName name = stringish<ItemName>(ZString(conv_str(st, data)));
+        ZString name = ZString(conv_str(st, data));
         struct item_data *item_data = itemdb_searchname(name);
         if (item_data != NULL)
             nameid = item_data->nameid;
@@ -1872,7 +1872,7 @@ void builtin_checkweight(ScriptState *st)
     get_val(st, data);
     if (data->type == ByteCode::STR || data->type == ByteCode::CONSTSTR)
     {
-        ItemName name = stringish<ItemName>(ZString(conv_str(st, data)));
+        ZString name = ZString(conv_str(st, data));
         struct item_data *item_data = itemdb_searchname(name);
         if (item_data)
             nameid = item_data->nameid;
@@ -1916,7 +1916,7 @@ void builtin_getitem(ScriptState *st)
     get_val(st, data);
     if (data->type == ByteCode::STR || data->type == ByteCode::CONSTSTR)
     {
-        ItemName name = stringish<ItemName>(ZString(conv_str(st, data)));
+        ZString name = ZString(conv_str(st, data));
         struct item_data *item_data = itemdb_searchname(name);
         nameid = 727;           //Default to iten
         if (item_data != NULL)
@@ -1969,7 +1969,7 @@ void builtin_makeitem(ScriptState *st)
     get_val(st, data);
     if (data->type == ByteCode::STR || data->type == ByteCode::CONSTSTR)
     {
-        ItemName name = stringish<ItemName>(ZString(conv_str(st, data)));
+        ZString name = ZString(conv_str(st, data));
         struct item_data *item_data = itemdb_searchname(name);
         nameid = 512;           //Apple Item ID
         if (item_data)
@@ -2015,7 +2015,7 @@ void builtin_delitem(ScriptState *st)
     get_val(st, data);
     if (data->type == ByteCode::STR || data->type == ByteCode::CONSTSTR)
     {
-        ItemName name = stringish<ItemName>(ZString(conv_str(st, data)));
+        ZString name = ZString(conv_str(st, data));
         struct item_data *item_data = itemdb_searchname(name);
         //nameid=512;
         if (item_data)
@@ -2960,7 +2960,7 @@ void builtin_getareadropitem(ScriptState *st)
     get_val(st, data);
     if (data->type == ByteCode::STR || data->type == ByteCode::CONSTSTR)
     {
-        ItemName name = stringish<ItemName>(ZString(conv_str(st, data)));
+        ZString name = ZString(conv_str(st, data));
         struct item_data *item_data = itemdb_searchname(name);
         item = 512;
         if (item_data)
@@ -3376,7 +3376,7 @@ void builtin_getitemname(ScriptState *st)
     get_val(st, data);
     if (data->type == ByteCode::STR || data->type == ByteCode::CONSTSTR)
     {
-        ItemName name = stringish<ItemName>(ZString(conv_str(st, data)));
+        ZString name = ZString(conv_str(st, data));
         i_data = itemdb_searchname(name);
     }
     else
-- 
cgit v1.2.3-60-g2f50