# HG changeset patch
# User boisy
# Date 1198680357 0
# Node ID e1d1f7c55f327bad3908f423dccf12a54777a162
# Parent  fa13c817008082c69deb78b2e4abe1825925dd13
Updated to LSL interpreter and compression, now fits on 40d

diff -r fa13c8170080 -r e1d1f7c55f32 3rdparty/packages/sierra/kingsquest1/logDir
Binary file 3rdparty/packages/sierra/kingsquest1/logDir has changed
diff -r fa13c8170080 -r e1d1f7c55f32 3rdparty/packages/sierra/kingsquest1/makefile
--- a/3rdparty/packages/sierra/kingsquest1/makefile	Wed Dec 26 14:21:57 2007 +0000
+++ b/3rdparty/packages/sierra/kingsquest1/makefile	Wed Dec 26 14:45:57 2007 +0000
@@ -1,22 +1,19 @@
 include $(NITROS9DIR)/rules.mak
 
-vpath %.asm ../objs
+vpath %.asm ../objs_lsl
 
 DEPENDS		= ./makefile
 
-DISK_1_40D	= kingsquest1_d1_40d.dsk
-DISK_2_40D	= kingsquest1_d2_40d.dsk
-DISK_80D	= kingsquest1_80d.dsk
+DISK_40D	= kingsquest1_40d.dsk
 
-DISK_1_40D_NAME	= "King's Quest I Disk 1"
-DISK_2_40D_NAME	= "King's Quest I Disk 2"
-DISK_80D_NAME	= "King's Quest I"
+DISK_40D_NAME	= "King's Quest I"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
+
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -26,28 +23,14 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-OS9BOOT_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
-		$(MD)/rbf.mn \
-		$(MD)/rb1773.dr $(MD)/ddd0_80d.dd \
-		$(MD)/scf.mn $(MD)/vtio.dr \
-		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
-		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
-		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
-
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
 
-TEXTFILES_D1	= startup tOC_40d.txt
-TEXTFILES	= startup tOC_80d.txt
+TEXTFILES	= startup tOC_40d.txt
 
-SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
-		vol.1 words.tok
-
-SUPPORTFILES_D2	= object vol.0 vol.2
-
-SUPPORTFILES	= $(SUPPORTFILES_D1) object vol.0 vol.1 vol.2
+SUPPORTFILES	= logDir object picDir sndDir viewDir vol.0 \
+		vol.1 vol.2 words.tok
 
 ALLOBJS		= $(CMDS)
 
@@ -56,54 +39,30 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk_40d:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D)
+dsk:	all
+	$(RM) $(DISK_40D) $(DISK_2_40D)
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
+	$(OS9FORMAT_DS40) -q $(DISK_40D) -n$(DISK_40D_NAME)
 	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
 	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
 	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
+	$(OS9GEN) $(DISK_40D) -b=os9boot_40d -t=kernel_1773
 	$(RM) os9boot_40d kernel_1773
-	$(MAKDIR) $(DISK_1_40D),CMDS
-	$(CP) $(CMDS) $(DISK_1_40D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
+	$(MAKDIR) $(DISK_40D),CMDS
+	$(CP) $(CMDS) $(DISK_40D),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_40D),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_1_40D),CMDS
+	$(CP) shell $(DISK_40D),CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_1_40D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
-	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
-	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
-
-dsk_80d:	all
-	$(RM) $(DISK_80D)
-	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
-	$(RM) os9boot_80d kernel_1773
-	$(MAKDIR) $(DISK_80D),CMDS
-	$(CP) $(CMDS) $(DISK_80D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
-	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_80D),CMDS
-	$(RM) shell
-	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DISK_80D),.
-	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
-	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
-	$(CP) $(SUPPORTFILES) $(DISK_80D),.
-
-dsk:	dsk_40d dsk_80d
+	$(OS9ATTR) $(DISK_40D),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DISK_40D),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $(DISK_40D),.
+	$(OS9RENAME) $(DISK_40D),tOC_40d.txt tOC.txt
+	tocgen $(DISK_40D),tOC.txt $(DISK_40D),tOC
+	$(CP) $(SUPPORTFILES) $(DISK_40D),.
 
 dskcopy: dsk
-	$(CP) $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D) $(DSKDIR)
+	$(CP) $(DISK_40D) $(DSKDIR)
 
 dskclean:
-	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D)
+	$(RM) $(DISK_40D)
diff -r fa13c8170080 -r e1d1f7c55f32 3rdparty/packages/sierra/kingsquest1/picDir
Binary file 3rdparty/packages/sierra/kingsquest1/picDir has changed
diff -r fa13c8170080 -r e1d1f7c55f32 3rdparty/packages/sierra/kingsquest1/sndDir
Binary file 3rdparty/packages/sierra/kingsquest1/sndDir has changed
diff -r fa13c8170080 -r e1d1f7c55f32 3rdparty/packages/sierra/kingsquest1/tOC_40d.txt
--- a/3rdparty/packages/sierra/kingsquest1/tOC_40d.txt	Wed Dec 26 14:21:57 2007 +0000
+++ b/3rdparty/packages/sierra/kingsquest1/tOC_40d.txt	Wed Dec 26 14:45:57 2007 +0000
@@ -1,2 +1,1 @@
-d1 s1 v0 v1
-d2 s1 v0 v2
+d1 s1 v0 v1 v2
diff -r fa13c8170080 -r e1d1f7c55f32 3rdparty/packages/sierra/kingsquest1/viewDir
Binary file 3rdparty/packages/sierra/kingsquest1/viewDir has changed
diff -r fa13c8170080 -r e1d1f7c55f32 3rdparty/packages/sierra/kingsquest1/vol.0
Binary file 3rdparty/packages/sierra/kingsquest1/vol.0 has changed
diff -r fa13c8170080 -r e1d1f7c55f32 3rdparty/packages/sierra/kingsquest1/vol.1
Binary file 3rdparty/packages/sierra/kingsquest1/vol.1 has changed
diff -r fa13c8170080 -r e1d1f7c55f32 3rdparty/packages/sierra/kingsquest1/vol.2
Binary file 3rdparty/packages/sierra/kingsquest1/vol.2 has changed