Ignore:
Timestamp:
May 11, 2011, 1:26:11 AM (11 years ago)
Author:
Sam Hocevar
Message:

lisp: refactor Lisp spaces so that they are real objects, and get rid
of the unused USER_SPACE.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/level.cpp

    r555 r635  
    743743    }
    744744
    745     clear_tmp();
     745    LSpace::Tmp.Clear();
    746746
    747747    if (cur)
     
    822822  }
    823823
    824   clear_tmp();
     824  LSpace::Tmp.Clear();
    825825}
    826826
     
    941941      uint16_t t=fp->read_uint16();
    942942      game_object *p=new game_object(o_remap[t],1);
    943       clear_tmp();
     943      LSpace::Tmp.Clear();
    944944      if (!first) first=p; else last->next=p;
    945945      last=p; p->next=NULL;
     
    11511151        uint16_t t=fp->read_uint16();
    11521152        game_object *p=new game_object(o_remap[t],1);
    1153         clear_tmp();
     1153        LSpace::Tmp.Clear();
    11541154        if (!first) first=p; else last->next=p;
    11551155        last=p; p->next=NULL;
     
    15101510/*  if (DEFINEDP(symbol_function(l_level_loaded)))
    15111511  {
    1512     int sp=current_space;
    1513     current_space=PERM_SPACE;
     1512    LSpace *sp = LSpace::Current;
     1513    LSpace::Current = &LSpace::Perm;
    15141514
    15151515    void *arg_list=NULL;
     
    15181518    ((LSymbol *)l_level_loaded)->EvalFunction(arg_list);
    15191519
    1520     current_space=sp;
     1520    LSpace::Current = sp;
    15211521  } */
    15221522}
     
    18411841    if (f->focus)
    18421842    {
    1843       current_object=f->focus;
    1844       void *m=mark_heap(TMP_SPACE);
     1843      current_object = f->focus;
     1844      void *m = LSpace::Tmp.Mark();
    18451845      fun->EvalFunction(NULL);
    1846       restore_heap(m,TMP_SPACE);
     1846      LSpace::Tmp.Restore(m);
    18471847    }
    18481848      }
Note: See TracChangeset for help on using the changeset viewer.