[contraband-cvs] CVS: contraband spells.lisp,1.4,1.5 quests.lisp,1.7,1.8 objects.lisp,1.1,1.2 creatures.lisp,1.4,1.5

[Stig E S. <st...@us...>]

Update of /cvsroot/contraband/contraband
In directory sc8-pr-cvs1:/tmp/cvs-serv12498/variants/contraband

Modified Files:
	spells.lisp quests.lisp objects.lisp creatures.lisp 
Log Message:
renamed several .id function to use one generic called GET-ID

Index: spells.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/spells.lisp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** spells.lisp	19 May 2003 15:42:32 -0000	1.4
--- spells.lisp	28 May 2003 10:34:31 -0000	1.5
***************
*** 335,339 ****
      (when-bind (book (interactive-book-selection dungeon player))
        (let* ((okind (aobj.kind book))
! 	     (book-id (object.id okind)))
  	(when-bind (spell-info (gethash book-id (variant.spellbooks variant)))
  ;;	  (warn "SI: ~s" spell-info)
--- 335,339 ----
      (when-bind (book (interactive-book-selection dungeon player))
        (let* ((okind (aobj.kind book))
! 	     (book-id (get-id okind)))
  	(when-bind (spell-info (gethash book-id (variant.spellbooks variant)))
  ;;	  (warn "SI: ~s" spell-info)
***************
*** 636,640 ****
  ;                       (interactive-book-selection dungeon player)))
  ;      (let* ((okind (aobj.kind book))
! ;             (book-id (object.id okind))
  ;             (which-one 0))
  ;        (when-bind (spell-info (gethash book-id (variant.spellbooks variant)))
--- 636,640 ----
  ;                       (interactive-book-selection dungeon player)))
  ;      (let* ((okind (aobj.kind book))
! ;             (book-id (get-id okind))
  ;             (which-one 0))
  ;        (when-bind (spell-info (gethash book-id (variant.spellbooks variant)))
***************
*** 694,698 ****
  ;      (when-bind (book (interactive-book-selection dungeon player))
  ;        (let* ((okind (aobj.kind book))
! ;               (book-id (object.id okind)))
  ;          (when-bind (spell-info (gethash book-id (variant.spellbooks variant)))      
  ;            (when-bind (which-one (interactive-spell-selection player spell-info
--- 694,698 ----
  ;      (when-bind (book (interactive-book-selection dungeon player))
  ;        (let* ((okind (aobj.kind book))
! ;               (book-id (get-id okind)))
  ;          (when-bind (spell-info (gethash book-id (variant.spellbooks variant)))      
  ;            (when-bind (which-one (interactive-spell-selection player spell-info

Index: quests.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/quests.lisp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** quests.lisp	19 May 2003 15:42:32 -0000	1.7
--- quests.lisp	28 May 2003 10:34:31 -0000	1.8
***************
*** 85,89 ****
  	  do
  	  (when (typep x 'active-object)
! 	    (when (equal obj (object.id (aobj.kind x)))
  	      (return-from has-object? i)))))
    
--- 85,89 ----
  	  do
  	  (when (typep x 'active-object)
! 	    (when (equal obj (get-id (aobj.kind x)))
  	      (return-from has-object? i)))))
    

Index: objects.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/objects.lisp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** objects.lisp	4 Apr 2003 11:49:16 -0000	1.1
--- objects.lisp	28 May 2003 10:34:31 -0000	1.2
***************
*** 87,91 ****
  
      (unless the-effect 
!       (warn "Didn't find ~s effect for ~s" which-use (object.id okind))
        (return-from use-object! retval))
  	    
--- 87,91 ----
  
      (unless the-effect 
!       (warn "Didn't find ~s effect for ~s" which-use (get-id okind))
        (return-from use-object! retval))
  	    

Index: creatures.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/creatures.lisp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** creatures.lisp	19 Apr 2003 15:30:14 -0000	1.4
--- creatures.lisp	28 May 2003 10:34:31 -0000	1.5
***************
*** 82,86 ****
  
      (unless (is-creatable? variant the-kind)
!       (warn "Tried to produce dead unique ~a, failed" (monster.id the-kind)) 
        (return-from produce-active-monster nil))
  
--- 82,86 ----
  
      (unless (is-creatable? variant the-kind)
!       (warn "Tried to produce dead unique ~a, failed" (get-id the-kind)) 
        (return-from produce-active-monster nil))