From 78e49a63b67a926b70e80d8c91a5a5308050755f Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Fri, 2 Sep 2016 14:57:56 -0500
Subject: [PATCH] vgacamm.exe fixed and vrstest works better~! wwwwwwwwwwwww

---
 src/lib/16_ca.c    | 120 ++++++++++++++++++++++-----------------------
 src/lib/typdefst.h |   7 +--
 2 files changed, 61 insertions(+), 66 deletions(-)

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 35c22510..8acba516 100755
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -46,10 +46,10 @@ loaded into the data segment
 =============================================================================
 */
 
-/*typedef struct
+typedef struct
 {
-  unsigned bit0,bit1;	// 0-255 is a character, > is a pointer to a node
-} huffnode;*/	//moved to src/lib/typdefst.h
+  word bit0,bit1;	// 0-255 is a character, > is a pointer to a node
+} huffnode;
 
 
 /*typedef struct
@@ -498,7 +498,7 @@ void CAL_OptimizeNodes(huffnode *table)
 ======================
 */
 
-/*++++void CAL_HuffExpand (byte huge *source, byte huge *dest,
+void CAL_HuffExpand (byte huge *source, byte huge *dest,
   long length,huffnode *hufftable)
 {
 //  unsigned bit,byte,node,code;
@@ -534,7 +534,7 @@ void CAL_OptimizeNodes(huffnode *table)
 
 	__asm
 	{
-		mov	bx,[headptr]
+;;;;;		mov	bx,[headptr]
 
 		mov	si,[sourceoff]
 		mov	di,[destoff]
@@ -555,28 +555,28 @@ expandshort:
 		jnc	sourceupshort
 
 bit1short:
-asm	mov	dx,[ss:bx+2]		// take bit1 path
-asm	shl	cl,1				// advance to next bit position
-asm	jnc	sourceupshort
+		mov	dx,[ss:bx+2]		// take bit1 path
+		shl	cl,1				// advance to next bit position
+		jnc	sourceupshort
 
 newbyteshort:
-asm	mov	ch,[si]				// load next byte
-asm	inc	si
-asm	mov	cl,1				// back to first bit
+		mov	ch,[si]				// load next byte
+		inc	si
+		mov	cl,1				// back to first bit
 
 sourceupshort:
-asm	or	dh,dh				// if dx<256 its a byte, else move node
-asm	jz	storebyteshort
-asm	mov	bx,dx				// next node = (huffnode *)code
-asm	jmp	expandshort
+		or	dh,dh				// if dx<256 its a byte, else move node
+		jz	storebyteshort
+		mov	bx,dx				// next node = (huffnode *)code
+		jmp	expandshort
 
 storebyteshort:
-asm	mov	[es:di],dl
-asm	inc	di					// write a decopmpressed byte out
-asm	mov	bx,[headptr]		// back to the head node for next bit
+		mov	[es:di],dl
+		inc	di					// write a decopmpressed byte out
+;;;;		mov	bx,[headptr]		// back to the head node for next bit
 
-asm	cmp	di,ax				// done?
-	jne	expandshort
+		cmp	di,ax				// done?
+		jne	expandshort
 	}
 	}
 	else
@@ -590,59 +590,59 @@ asm	cmp	di,ax				// done?
 
 	__asm
 	{
-	mov	bx,[headptr]
-	mov	cl,1
+;;;;		mov	bx,[headptr]
+		mov	cl,1
 
-	mov	si,[sourceoff]
-	mov	di,[destoff]
-	mov	es,[destseg]
-	mov	ds,[sourceseg]
+		mov	si,[sourceoff]
+		mov	di,[destoff]
+		mov	es,[destseg]
+		mov	ds,[sourceseg]
 
-	lodsb			// load first byte
+		lodsb			// load first byte
 
 expand:
-	test	al,cl		// bit set?
-	jnz	bit1
-	mov	dx,[ss:bx]	// take bit0 path from node
-	jmp	gotcode
+		test	al,cl		// bit set?
+		jnz	bit1
+		mov	dx,[ss:bx]	// take bit0 path from node
+		jmp	gotcode
 bit1:
-	mov	dx,[ss:bx+2]	// take bit1 path
+		mov	dx,[ss:bx+2]	// take bit1 path
 
 gotcode:
-	shl	cl,1		// advance to next bit position
-	jnc	sourceup
-	lodsb
-	cmp	si,0x10		// normalize ds:si
-asm  	jb	sinorm
-	mov	cx,ds
-	inc	cx
-	mov	ds,cx
-	xor	si,si
+		shl	cl,1		// advance to next bit position
+		jnc	sourceup
+		lodsb
+		cmp	si,0x10		// normalize ds:si
+		jb	sinorm
+		mov	cx,ds
+		inc	cx
+		mov	ds,cx
+		xor	si,si
 sinorm:
-	mov	cl,1		// back to first bit
+		mov	cl,1		// back to first bit
 
 sourceup:
-	or	dh,dh		// if dx<256 its a byte, else move node
-	jz	storebyte
-	mov	bx,dx		// next node = (huffnode *)code
-	jmp	expand
+		or	dh,dh		// if dx<256 its a byte, else move node
+		jz	storebyte
+		mov	bx,dx		// next node = (huffnode *)code
+		jmp	expand
 
 storebyte:
-	mov	[es:di],dl
-	inc	di		// write a decopmpressed byte out
-	mov	bx,[headptr]	// back to the head node for next bit
-
-	cmp	di,0x10		// normalize es:di
-asm  	jb	dinorm
-	mov	dx,es
-	inc	dx
-	mov	es,dx
-	xor	di,di
+		mov	[es:di],dl
+		inc	di		// write a decopmpressed byte out
+;;;;		mov	bx,[headptr]	// back to the head node for next bit
+
+		cmp	di,0x10		// normalize es:di
+		jb	dinorm
+		mov	dx,es
+		inc	dx
+		mov	es,dx
+		xor	di,di
 dinorm:
 
-	sub	[WORD PTR ss:length],1
-	jnc	expand
-	dec	[WORD PTR ss:length+2]
+		sub	[WORD PTR ss:length],1
+		jnc	expand
+		dec	[WORD PTR ss:length+2]
 		jns	expand		// when length = ffff ffff, done
 	}
 	}
@@ -653,7 +653,7 @@ dinorm:
 		mov	ds,ax
 	}
 
-}*/
+}
 
 
 /*
diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index d01ebab4..286f675c 100755
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -184,15 +184,10 @@ typedef struct
 //from 16_ca
 //==========================================================================
 
-typedef struct
-{
-  unsigned bit0,bit1;	// 0-255 is a character, > is a pointer to a node
-} huffnode;
-
 typedef struct
 {
 	byte		ca_levelbit,ca_levelnum;
-	huffnode huffnode;
+	//huffnode huffnode;
 } ca_t;
 
 //==========================================================================
-- 
2.39.5