Billi_Bob/KAZIK
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(build): rename xEnd to xRight in city_objects.inc to avoid collision with x86 XEND instruction

Browse source
This commit is contained in:
Игорь Федосеев 2026-10-13 20:22:27 +03:00
parent 881a0061dc
commit 3403696642
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src_graphics/city_objects.inc
View file

@ -118,7 +118,7 @@ ProjectCityPoint3D ENDP
DrawCityObject3D PROC uses ebx esi edi object:DWORD,firstSourceRow:DWORD DrawCityObject3D PROC uses ebx esi edi object:DWORD,firstSourceRow:DWORD
local depth:DWORD,left:DWORD,top:DWORD,widthPx:DWORD,heightPx: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 xStep:DWORD,yStep:DWORD,texColumn:DWORD,source:DWORD,row:DWORD,asset:DWORD
local sourceWidth:DWORD,sourceHeight:DWORD,sourcePitch:DWORD,cropX:DWORD,cropY:DWORD local sourceWidth:DWORD,sourceHeight:DWORD,sourcePitch:DWORD,cropX:DWORD,cropY:DWORD
IFDEF CASINO_ACTION_TEST IFDEF CASINO_ACTION_TEST
@ -224,7 +224,7 @@ city_object_project:
jle @F jle @F
mov eax, SCREEN_W mov eax, SCREEN_W
@@: @@:
mov xEnd, eax mov xRight, eax
cmp xStart, 0 cmp xStart, 0
jge @F jge @F
mov xStart, 0 mov xStart, 0
@ -242,7 +242,7 @@ city_object_project:
mov yStart, 0 mov yStart, 0
@@: @@:
mov eax, xStart mov eax, xStart
cmp eax, xEnd cmp eax, xRight
jge city_object_done jge city_object_done
mov eax, yStart mov eax, yStart
cmp eax, yEnd cmp eax, yEnd
@ -334,7 +334,7 @@ city_object_next_row:
jb city_object_row jb city_object_row
city_object_next_column: city_object_next_column:
inc ebx inc ebx
cmp ebx, xEnd cmp ebx, xRight
jb city_object_column jb city_object_column
city_object_done: city_object_done:
ret ret