From ead8204e1ec6d0077c12102cc7ec457069d8d2ad Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 30 Sep 2012 14:40:42 +0000
Subject: [PATCH] Fix a.masm changes so MSVC builds work again.  The relevant
 functionality seems to work (non-power of 2 textures drawn without error),
 even with CLASSIC_NONPOW2_YSIZE_WALLS defined in engine.c, but I'm not
 familiar with any corner or edge cases that need to be watched out for with
 this.

Note: CLASSIC_NONPOW2_YSIZE_WALLS is still not enabled in svn.


git-svn-id: https://svn.eduke32.com/eduke32@3035 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/src/a.masm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/polymer/eduke32/build/src/a.masm b/polymer/eduke32/build/src/a.masm
index 96c5fb8c4..3cedc2077 100644
--- a/polymer/eduke32/build/src/a.masm
+++ b/polymer/eduke32/build/src/a.masm
@@ -600,20 +600,20 @@ CDECLBEGINSET 6
 	push ebp
 	mov ebp, edx  ; ebp: vertical place
 	mov ebx, eax  ; ebx: vertical increment
-	mov eax, dword ptr [globaltilesizy]
+	mov eax, dword ptr [_globaltilesizy]
 	mov dword ptr [np2_beginvline+1], eax
 	inc ecx
 np2_fixchain1a: sub edi, 320
 np2_beginvline: ; +1: y tile size
-	mov eax, 0x00000123
+	mov eax, 00000123h
 	mul ebp
 np2_fixchain1b: add edi, 320
-	and eax, 0x000000ff
+	and eax, 000000ffh
 	mov al, byte ptr [esi+edx]
 	add ebp, ebx
 	dec ecx
 np2_do_palookup: ; +2: addr
-	mov al, byte ptr [0xbeeff00d+eax]
+	mov al, byte ptr [eax+0000beefh]
 	mov byte ptr [edi], al
 	jnz short np2_beginvline
 	mov eax, ebp
@@ -654,17 +654,17 @@ CDECLBEGINSET 6
 	push ebp
 	mov ebp, edx  ; ebp: vertical place
 	mov ebx, eax  ; ebx: vertical increment
-	mov eax, dword ptr [globaltilesizy]
+	mov eax, dword ptr [_globaltilesizy]
 	mov dword ptr [mnp2_beginvline+1], eax
 mnp2_beginvline: ; +1: y tile size
-	mov eax, 0x00000123
+	mov eax, 00000123h
 	mul ebp
-	and eax, 0x000000ff
+	and eax, 000000ffh
 	mov al, byte ptr [esi+edx]
 	cmp al, 255
 	je short mskipmask1
 mnp2_do_palookup: ; +2: addr
-	mov al, byte ptr [0xbeeff00d+eax]
+	mov al, byte ptr [eax+0000beefh]
 	mov byte ptr [edi], al
 mskipmask1:
 	add ebp, ebx
@@ -791,18 +791,18 @@ CDECLBEGINSET 6
 	mov ebp, edx  ; ebp: vertical place
 	mov ebx, eax  ; ebx: vertical increment
 	inc ecx
-	mov eax, dword ptr [globaltilesizy]
+	mov eax, dword ptr [_globaltilesizy]
 	mov dword ptr [tnp2_beginvline+1], eax
 tnp2_beginvline: ; +1: y tile size
-	mov eax, 0x00000123
+	mov eax, 00000123h
 	mul ebp
-	and eax, 0x000000ff
+	and eax, 000000ffh
 	mov al, byte ptr [esi+edx]
 	cmp al, 255
 	je short tskipmask1
 ntransrev0:
 tnp2_do_palookup: ; +2: addr
-	mov al, byte ptr [0xbeeff00d+eax]
+	mov al, byte ptr [eax+0000beefh]
 ntransrev1:
 	mov ah, byte ptr [edi]
 tnmach4: mov al, byte ptr [eax+88888888h]	;_luc[eax]