From 05646f1436736a76ebeec2796f3244c70ed7a92f Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Mon, 13 Mar 2017 14:52:13 -0500
Subject: [PATCH] __seguse.txt added to show _seg usage also OpenVGMFile needs
 to be ported to 16_snd.c so we can use CA MM and PM ][ ca needs huge amounts
 of work and i should remember what needs to be done soon also i should
 reverify 16_in.c to make sure it can work with other code of id engine] fixed
 the glitch] i need the sprite stuff to use the memory manager added a test of
 the script thingy

---
 btget.bat     |  8 ++++----
 l4get.bat     |  8 ++++----
 makefile      | 15 ++++++++++-----
 src/util/z.sh |  4 ++--
 x4get.bat     |  8 ++++----
 5 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/btget.bat b/btget.bat
index cb4466c7..ed1d6b23 100755
--- a/btget.bat
+++ b/btget.bat
@@ -25,18 +25,18 @@ rem	 echo y=%y
 		set z=%o
 	) endif
 
-	htget http://%url/%1.zi.%z > %y
+	htget http://%url/%1.zip.%z > %y
 rem  	pause
 	iff NOT "%@FILESIZE[%y,b]" == "0" then
-		type %y >> %w.zi
+		type %y >> %w.zip
 		iff "%@FILESIZE[%y,b]" == "65536" then
 rem  				echo o=%o
 			goto oooo
 		endiff
 		iff NOT "%#" == "0" then
 			shift /1
-			iff exist %w.zi then
-				unzi %w.zi
+			iff exist %w.zip then
+				unzip %w.zip
 				del %w.z*
 			endiff
 			goto loop
diff --git a/l4get.bat b/l4get.bat
index e5326854..78617810 100755
--- a/l4get.bat
+++ b/l4get.bat
@@ -25,18 +25,18 @@ rem	 echo y=%y
 		set z=%o
 	) endif
 
-	htget http://%url/%1.zi.%z > %y
+	htget http://%url/%1.zip.%z > %y
 rem  	pause
 	iff NOT "%@FILESIZE[%y,b]" == "0" then
-		type %y >> %w.zi
+		type %y >> %w.zip
 		iff "%@FILESIZE[%y,b]" == "65536" then
 rem  				echo o=%o
 			goto oooo
 		endiff
 		iff NOT "%#" == "0" then
 			shift /1
-			iff exist %w.zi then
-				unzi %w.zi
+			iff exist %w.zip then
+				unzip %w.zip
 				del %w.z*
 			endiff
 			goto loop
diff --git a/makefile b/makefile
index 591a4445..01a489b8 100755
--- a/makefile
+++ b/makefile
@@ -40,6 +40,7 @@ DELLOGFILE=1
 to_os_path=\=/
 REMOVECOMMAND=rm -f
 COPYCOMMAND=cp -f
+MOVECOMMAND=mv
 DIRSEP=/
 OBJ=obj
 DUMP=cat
@@ -49,6 +50,7 @@ DOSLIBMAKEALL=./buildall.sh build all
 to_os_path=/=\
 REMOVECOMMAND=del
 COPYCOMMAND=copy /y
+MOVECOMMAND=move
 DIRSEP=\
 OBJ=obj
 DUMP=type
@@ -427,9 +429,12 @@ comq: .symbolic
 www: .symbolic
 	@for %f in (/var/www/$(EXEC)) do @if exist /var/www/%f $(REMOVECOMMAND) /var/www/%f
 	@$(REMOVECOMMAND) /var/www/*.exe.zi*
+	@$(REMOVECOMMAND) /var/www/*.zip.zi*
 	@for %f in ($(EXEC)) do @if exist %f @$(COPYCOMMAND) %f /var/www/
 	@./src/util/z.sh $(EXEC) $(EXEC)
-	@./src/util/z.sh data data
+	@7z a -r data.zip data
+	@./src/util/z.sh data.zip data
+	@$(REMOVECOMMAND) data.zip
 	@wmake -h wwwext
 
 wwwext: .symbolic
@@ -441,18 +446,18 @@ wwwext1: .symbolic
 	#4ch.mooo.com
 	@scp -r -P $(HOSTPORT) *.exe $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
 	@scp -r -P $(HOSTPORT) *get.bat $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
-	@scp -r -P $(HOSTPORT) /var/www/*.exe.zi.* $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
+	@scp -r -P $(HOSTPORT) /var/www/*.exe.zip.* $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
 	#@scp -r -P $(HOSTPORT) $(DATADIR)spri.zip $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
-	@scp -r -P $(HOSTPORT) /var/www/data.zi.* $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
+	@scp -r -P $(HOSTPORT) /var/www/data.zip.* $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
 
 
 wwwext2: .symbolic
 	#beta.latech.edu
 	@scp -r -P $(HOST2PORT) *.exe $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
 	@scp -r -P $(HOST2PORT) *get.bat $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
-	@scp -r -P $(HOST2PORT) /var/www/*.exe.zi.* $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
+	@scp -r -P $(HOST2PORT) /var/www/*.exe.zip.* $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
 	#@scp -r -P $(HOST2PORT) $(DATADIR)spri.zip $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
-	@scp -r -P $(HOST2PORT) /var/www/data.zi.* $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
+	@scp -r -P $(HOST2PORT) /var/www/data.zip.* $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
 
 getwww: .symbolic
 	*x4get.bat $(EXEC)
diff --git a/src/util/z.sh b/src/util/z.sh
index 3c823ad0..7561110a 100755
--- a/src/util/z.sh
+++ b/src/util/z.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 while [ -n "$1" ]
 do
-	7z a -v64k -r /var/www/"$1".zi "$1"
-	echo 7z a -v64k -r /var/www/"$1".zi "$1"
+	7z a -v64k -r /var/www/"$1".zip "$1"
+	echo 7z a -v64k -r /var/www/"$1".zip "$1"
 	shift
 done
diff --git a/x4get.bat b/x4get.bat
index 2637951b..b89cc657 100755
--- a/x4get.bat
+++ b/x4get.bat
@@ -25,18 +25,18 @@ rem	 echo y=%y
 		set z=%o
 	) endif
 
-	htget http://%url/%1.zi.%z > %y
+	htget http://%url/%1.zip.%z > %y
 rem  	pause
 	iff NOT "%@FILESIZE[%y,b]" == "0" then
-		type %y >> %w.zi
+		type %y >> %w.zip
 		iff "%@FILESIZE[%y,b]" == "65536" then
 rem  				echo o=%o
 			goto oooo
 		endiff
 		iff NOT "%#" == "0" then
 			shift /1
-			iff exist %w.zi then
-				unzi %w.zi
+			iff exist %w.zip then
+				unzip %w.zip
 				del %w.z*
 			endiff
 			goto loop
-- 
2.39.5