Changeset 484 for abuse/trunk/src/level.cppTweet

Timestamp:

Apr 17, 2011, 10:28:20 AM (11 years ago)

Author:

Sam Hocevar

Message:

lisp: populate LispSymbol? with symbol-related methods.

File:

• abuse/trunk/src/level.cpp (modified) (8 diffs)

abuse/trunk/src/level.cpp

@@ -1080 +1080 @@
       {
         if (figures[new_type]->seq[k] &&
-           !strcmp(lstring_value(symbol_name(figures[new_type]->seq_syms[k])),old_name))
+           !strcmp(lstring_value(((LispSymbol *)figures[new_type]->seq_syms[k])->GetName()),old_name))
         *(s_remap[i]+j)=k;
       }
@@ -1119 +1119 @@
           if (figures[new_type]->vars[k])
           {
-        if (!strcmp(lstring_value(symbol_name(figures[new_type]->vars[k])),old_name))
+        if (!strcmp(lstring_value(((LispSymbol *)figures[new_type]->vars[k])->GetName()),old_name))
           *(v_remap[i]+j)=figures[new_type]->var_index[k];
           }
@@ -1560 +1560 @@
     for (;j<figures[i]->ts;j++)
       if (figures[i]->seq[j])
-        size+=1+strlen(lstring_value(symbol_name(figures[i]->seq_syms[j])))+1;
+        size+=1+strlen(lstring_value(((LispSymbol *)figures[i]->seq_syms[j])->GetName()))+1;
   }
   sd.add_by_hand(new spec_entry(SPEC_DATA_ARRAY,"describe_states",NULL,size,0));
@@ -1573 +1573 @@
     for (;j<figures[i]->tiv;j++)
       if (figures[i]->vars[j])
-        size+=1+strlen(lstring_value(symbol_name(figures[i]->vars[j])))+1;
+        size+=1+strlen(lstring_value(((LispSymbol *)figures[i]->vars[j])->GetName()))+1;
   }
   sd.add_by_hand(new spec_entry(SPEC_DATA_ARRAY,"describe_lvars",NULL,size,0));
@@ -1827 +1827 @@
   } else
   {
-    void *fun=make_find_symbol("set_player_defaults");
-    if (DEFINEDP(symbol_function(fun)))
+    LispSymbol *fun = LispSymbol::FindOrCreate("set_player_defaults");
+    if (DEFINEDP(fun->GetFunction()))
     {
       view *f;
@@ -1838 +1838 @@
       current_object=f->focus;
       void *m=mark_heap(TMP_SPACE);
-      eval_function((LispSymbol *)fun,NULL);
+      eval_function(fun,NULL);
       restore_heap(m,TMP_SPACE);
     }
@@ -1887 +1887 @@
       if (figures[i]->seq[j])
       {
-    char *state_name=lstring_value(symbol_name(figures[i]->seq_syms[j]));
+    char *state_name=lstring_value(((LispSymbol *)figures[i]->seq_syms[j])->GetName());
     fp->write_uint8(strlen(state_name)+1);
     fp->write(state_name,strlen(state_name)+1);
@@ -1906 +1906 @@
         if (figures[i]->vars[j] && figures[i]->var_index[j]==x)
     {
-      char *var_name=lstring_value(symbol_name(figures[i]->vars[j]));
+      char *var_name=lstring_value(((LispSymbol *)figures[i]->vars[j])->GetName());
       fp->write_uint8(strlen(var_name)+1);
       fp->write(var_name,strlen(var_name)+1);