From 34036966423a66b3308eb8af14a63041f714a0b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=A4=D0=B5=D0=B4=D0=BE?= =?UTF-8?q?=D1=81=D0=B5=D0=B5=D0=B2?= Date: Tue, 13 Oct 2026 20:22:27 +0300 Subject: [PATCH] fix(build): rename xEnd to xRight in city_objects.inc to avoid collision with x86 XEND instruction --- src_graphics/city_objects.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src_graphics/city_objects.inc b/src_graphics/city_objects.inc index c1a4226..5bd728d 100644 --- a/src_graphics/city_objects.inc +++ b/src_graphics/city_objects.inc @@ -118,7 +118,7 @@ ProjectCityPoint3D ENDP DrawCityObject3D PROC uses ebx esi edi object:DWORD,firstSourceRow:DWORD local depth:DWORD,left:DWORD,top:DWORD,widthPx:DWORD,heightPx:DWORD - local xEnd:DWORD,yEnd:DWORD,xStart:DWORD,yStart:DWORD + local xRight:DWORD,yEnd:DWORD,xStart:DWORD,yStart:DWORD local xStep:DWORD,yStep:DWORD,texColumn:DWORD,source:DWORD,row:DWORD,asset:DWORD local sourceWidth:DWORD,sourceHeight:DWORD,sourcePitch:DWORD,cropX:DWORD,cropY:DWORD IFDEF CASINO_ACTION_TEST @@ -224,7 +224,7 @@ city_object_project: jle @F mov eax, SCREEN_W @@: - mov xEnd, eax + mov xRight, eax cmp xStart, 0 jge @F mov xStart, 0 @@ -242,7 +242,7 @@ city_object_project: mov yStart, 0 @@: mov eax, xStart - cmp eax, xEnd + cmp eax, xRight jge city_object_done mov eax, yStart cmp eax, yEnd @@ -334,7 +334,7 @@ city_object_next_row: jb city_object_row city_object_next_column: inc ebx - cmp ebx, xEnd + cmp ebx, xRight jb city_object_column city_object_done: ret