[contraband-cvs] CVS: contraband spells.lisp,1.3,1.4 quests.lisp,1.6,1.7 player.lisp,1.6,1.7 keys.lisp,1.7,1.8

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

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

Modified Files:
	spells.lisp quests.lisp player.lisp keys.lisp 
Log Message:
renamed player.inventory to get-creature-inventory

Index: spells.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/spells.lisp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** spells.lisp	12 Apr 2003 14:36:25 -0000	1.3
--- spells.lisp	19 May 2003 15:42:32 -0000	1.4
***************
*** 992,996 ****
    (declare (ignore dungeon))
    (block select-book
!     (let ((carrying (aobj.contains (player.inventory player)))
  	  (books '())
  	  ;;(variant *variant*)
--- 992,996 ----
    (declare (ignore dungeon))
    (block select-book
!     (let ((carrying (aobj.contains (get-creature-inventory player)))
  	  (books '())
  	  ;;(variant *variant*)

Index: quests.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/quests.lisp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** quests.lisp	18 Apr 2003 12:32:05 -0000	1.6
--- quests.lisp	19 May 2003 15:42:32 -0000	1.7
***************
*** 80,84 ****
    (check-type creature player)
    (check-type obj string)
!   (let ((objs (items.objs (aobj.contains (player.inventory creature)))))
      (loop for i from 0
  	  for x across objs
--- 80,84 ----
    (check-type creature player)
    (check-type obj string)
!   (let ((objs (items.objs (aobj.contains (get-creature-inventory creature)))))
      (loop for i from 0
  	  for x across objs
***************
*** 235,239 ****
  (defun add-to-inventory (creature object &key identified)
    (check-type creature player)
!   (let* ((backpack (player.inventory creature))
  	 (inventory (aobj.contains backpack)))
      (when identified
--- 235,239 ----
  (defun add-to-inventory (creature object &key identified)
    (check-type creature player)
!   (let* ((backpack (get-creature-inventory creature))
  	 (inventory (aobj.contains backpack)))
      (when identified
***************
*** 249,253 ****
    (let ((pos (has-object? creature key)))
      (when pos
!       (item-table-remove! (aobj.contains (player.inventory creature)) pos))))
  
  (defun get-new-object (id)
--- 249,253 ----
    (let ((pos (has-object? creature key)))
      (when pos
!       (item-table-remove! (aobj.contains (get-creature-inventory creature)) pos))))
  
  (defun get-new-object (id)

Index: player.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/player.lisp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** player.lisp	20 Apr 2003 10:30:21 -0000	1.6
--- player.lisp	19 May 2003 15:42:32 -0000	1.7
***************
*** 68,72 ****
        (let ((eq-slots (player.equipment player)))
  	(item-table-add! eq-slots backpack 'eq.backpack)
! 	(setf (player.inventory player) backpack)))
  
      
--- 68,72 ----
        (let ((eq-slots (player.equipment player)))
  	(item-table-add! eq-slots backpack 'eq.backpack)
! 	(setf (get-creature-inventory player) backpack)))
  
      

Index: keys.lisp
===================================================================
RCS file: /cvsroot/contraband/contraband/keys.lisp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** keys.lisp	17 Apr 2003 14:43:13 -0000	1.7
--- keys.lisp	19 May 2003 15:42:32 -0000	1.8
***************
*** 114,118 ****
  	(with-dialogue ()
  	  (clear-window *cur-win*) ;; hack
! 	  (let* ((backpack (player.inventory player))
  		 (inventory (aobj.contains backpack)))
  	    (item-table-print inventory :show-pause t :start-x 3))
--- 114,118 ----
  	(with-dialogue ()
  	  (clear-window *cur-win*) ;; hack
! 	  (let* ((backpack (get-creature-inventory player))
  		 (inventory (aobj.contains backpack)))
  	    (item-table-print inventory :show-pause t :start-x 3))