DREAMWEB: Replaced foreign-guarded code with "foreignrelease" variable, added modifychar stub

8 files changed, 55 insertions, 40 deletions

diff --git a/devtools/tasmrecover/dreamweb/dreamweb.asm b/devtools/tasmrecover/dreamweb/dreamweb.asm
index edecad783e..c222a63178 100644
--- a/devtools/tasmrecover/dreamweb/dreamweb.asm
+++ b/devtools/tasmrecover/dreamweb/dreamweb.asm
@@ -50,7 +50,7 @@ debuglevel1	equ	0	;memory debug on
 debuglevel2	equ	0	;debug keys on+shouts
 demo	equ	0
 CD	equ	1
-Foreign	equ	0
+Foreign	equ	1
 Spanish	equ	0
 German	equ	0
 
@@ -4225,9 +4225,10 @@ Undertextline	proc	near
 
 	mov	di,textaddressx
 	mov	bx,textaddressy
-	if	foreign
+	cmp	foreignrelease, 0
+	jz $1
 	sub	bx,3
-	endif
+$1:
 	mov	ds,buffers
 	mov	si,textunder
 	mov	cl,undertextsizex
@@ -4248,9 +4249,10 @@ Deltextline	proc	near
 
 	mov	di,textaddressx
 	mov	bx,textaddressy
-	if	foreign
+	cmp	foreignrelease, 0
+	jz $1
 	sub	bx,3
-	endif
+$1:
 	mov	ds,buffers
 	mov	si,textunder
 	mov	cl,undertextsizex
@@ -4271,9 +4273,10 @@ Dumptextline	proc	near
 	mov	newtextline,0
 	mov	di,textaddressx
 	mov	bx,textaddressy
-	if	foreign
+	cmp	foreignrelease, 0
+	jz $1
 	sub	bx,3
-	endif
+$1:
 	mov	cl,undertextsizex
 	mov	ch,undertextsizey
 	call	multidump
@@ -6238,6 +6241,7 @@ Recname	db	"DREAMWEB.DEM",0
 
 Quitrequested	db 0
 Subtitles		db 0
+ForeignRelease	db 0
 
 
 ;-------------------------------------------------------End of code segment----
diff --git a/devtools/tasmrecover/dreamweb/monitor.asm b/devtools/tasmrecover/dreamweb/monitor.asm
index 247ba10f2b..7f3979c2b3 100644
--- a/devtools/tasmrecover/dreamweb/monitor.asm
+++ b/devtools/tasmrecover/dreamweb/monitor.asm
@@ -1425,10 +1425,11 @@ Printcurs	proc	near
 	mov	bx,curslocy
 	mov	cl,6
 	mov	ch,8
-	if	foreign
+	cmp	foreignrelease, 0
+	jz $1
 	sub	bx,3
 	mov	ch,11
-	endif
+$1:
 	mov	ds,buffers
 	mov	si,textunder
 	push	di bx
@@ -1449,11 +1450,11 @@ Printcurs	proc	near
 flashcurs:	pop	di bx
 	sub	di,6
 	mov	cl,12
-	if	foreign
-	mov	ch,11
-	else
 	mov	ch,8
-	endif
+	cmp	foreignrelease, 0
+	jz $2
+	mov	ch,11
+$2:
 	call	multidump
 
 	pop	es bx dx ds di si
@@ -1473,10 +1474,11 @@ Delcurs 	proc	near
 	mov	bx,curslocy
 	mov	cl,6
 	mov	ch,8
-	if	foreign
+	cmp	foreignrelease, 0
+	jz $1
 	sub	bx,3
 	mov	ch,11
-	endif
+$1:
 	push	di bx cx
 	mov	ds,buffers
 	mov	si,textunder
diff --git a/devtools/tasmrecover/dreamweb/newplace.asm b/devtools/tasmrecover/dreamweb/newplace.asm
index ac703f6b11..2bbf4fe498 100644
--- a/devtools/tasmrecover/dreamweb/newplace.asm
+++ b/devtools/tasmrecover/dreamweb/newplace.asm
@@ -158,13 +158,14 @@ alreadyinfo:	mov	ax,mousebutton
 	mov	di,60
 	mov	bx,72+55
 	call	showframe
-	if	foreign
+	cmp	foreignrelease, 0
+	jz $1
 	mov	al,4
 	mov	ah,0
 	mov	di,60
 	mov	bx,72+55+21
 	call	showframe
-	endif
+$1:
 	pop	bx
 
 	mov	bh,0
@@ -175,11 +176,11 @@ alreadyinfo:	mov	ax,mousebutton
 	call	findnextcolon
 
 	mov	di,63
-	if	foreign
-	mov	bx,84+4
-	else
 	mov	bx,84
-	endif
+	cmp	foreignrelease, 0
+	jz $2
+	mov	bx,84+4
+$2:
 	mov	dl,191
 	mov	al,0
 	mov	ah,0
diff --git a/devtools/tasmrecover/dreamweb/object.asm b/devtools/tasmrecover/dreamweb/object.asm
index bdd043d588..bc73ef5679 100644
--- a/devtools/tasmrecover/dreamweb/object.asm
+++ b/devtools/tasmrecover/dreamweb/object.asm
@@ -670,11 +670,13 @@ Describeob	proc	near
 
 	mov	di,33
 	mov	bx,92
-	if	foreign
+
+	cmp	foreignrelease, 0
+	jz notsetd
 	cmp	objecttype,1
 	jnz	notsetd
 	mov	bx,82
-notsetd:	endif
+notsetd:
 	mov	dl,241
 	mov	ah,16
 	mov	charshift,91+91
@@ -682,11 +684,12 @@ notsetd:	endif
 	mov	charshift,0
 	mov	di,36
 	mov	bx,104
-	if	foreign
+	cmp	foreignrelease, 0
+	jz notsetd2
 	cmp	objecttype,1
 	jnz	notsetd2
 	mov	bx,94
-notsetd2:	endif
+notsetd2:
 	mov	dl,241
 	mov	ah,0
 	call	printdirect
diff --git a/devtools/tasmrecover/dreamweb/print.asm b/devtools/tasmrecover/dreamweb/print.asm
index a2052285f0..7cbb45c08b 100644
--- a/devtools/tasmrecover/dreamweb/print.asm
+++ b/devtools/tasmrecover/dreamweb/print.asm
@@ -6,9 +6,10 @@ Printchar	proc	near
 	cmp	al,255
 	jz	ignoreit
 	push	si bx di
-	if	foreign
+	cmp	foreignrelease, 0
+	jz $1
 	sub	bx,3
-	endif
+$1:
 	push	ax
 	sub	al,32 ;"A"
 	mov	ah,0
diff --git a/devtools/tasmrecover/dreamweb/sprite.asm b/devtools/tasmrecover/dreamweb/sprite.asm
index fadea3b790..45f807da3f 100644
--- a/devtools/tasmrecover/dreamweb/sprite.asm
+++ b/devtools/tasmrecover/dreamweb/sprite.asm
@@ -4785,12 +4785,12 @@ Reconstruct	proc	near
 	call	drawfloor
 	call	spriteupdate
 	call	printsprites
-	if	foreign
+	cmp	foreignrelease, 0
+	jz notfudge
 	cmp	reallocation,20
 	jnz	notfudge
 	call	undertextline
 notfudge:
-	endif
 	mov	havedoneobs,0
 noneedtorecon:	ret
 
diff --git a/devtools/tasmrecover/dreamweb/use.asm b/devtools/tasmrecover/dreamweb/use.asm
index 08debfca56..fbbd9c99db 100644
--- a/devtools/tasmrecover/dreamweb/use.asm
+++ b/devtools/tasmrecover/dreamweb/use.asm
@@ -1879,11 +1879,11 @@ Usecashcard	proc	near
 	call	showman
 
 	mov	di,114
-	if	foreign
-	mov	bx,120-3
-	else
 	mov	bx,120
-	endif
+	cmp	foreignrelease, 0
+	jz $1
+	mov	bx,120-3
+$1:
 	mov	ds,tempgraphics
 	mov	al,39
 	mov	ah,0
@@ -3189,9 +3189,10 @@ notinlouiss:	ret
 Getundertimed	proc	near
 
 	mov	al,timedy
-	if	foreign
+	cmp	foreignrelease, 0
+	jz $1
 	sub	al,3
-	endif
+$1:
 	mov	ah,0
 	mov	bx,ax
 	mov	al,timedx
@@ -3212,9 +3213,10 @@ Getundertimed	proc	near
 Putundertimed	proc	near
 
 	mov	al,timedy
-	if	foreign
+	cmp	foreignrelease, 0
+	jz $1
 	sub	al,3
-	endif
+$1:
 	mov	ah,0
 	mov	bx,ax
 	mov	al,timedx
@@ -3239,9 +3241,10 @@ Dumptimedtext	proc	near
 	cmp	needtodumptimed,1
 	jnz	nodumptimed
 	mov	al,timedy
-	if	foreign
+	cmp	foreignrelease, 0
+	jz $1
 	sub	al,3
-	endif
+$1:
 	mov	ah,0
 	mov	bx,ax
 	mov	al,timedx
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index d6c6a2523f..5f7a528a5b 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -23,6 +23,7 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'convertkey',
 	'readabyte',
 	'readoneblock',
-	'frameoutv'
+	'frameoutv',
+	'modifychar'
 	])
 generator.generate('dreamweb') #start routine