cleaned up the macro a little, and used macro for Input borders, saves 219 lines of code!

This commit is contained in:
ipher
2005-02-24 14:03:29 +00:00
parent 53752655a5
commit 1bbdb16393

View File

@@ -990,10 +990,10 @@ mov dl,[GUIWincol]
DrawGUIWinBox %1,%2,%3+1,%2-1,%3+5,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox %1,%2+1,%3+1,%2+18,%3+6,dl
DrawGUIWinBox %1,%2+1,%3+8,%2+18,%3-8,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox %1,%2+1,%3+1,%2+19,%3+5,dl
DrawGUIWinBox %1,%2+22,%3+1,%2-23,%3+5,dl
%endmacro
%macro DGOptnsDrawBox 3
@@ -1341,248 +1341,29 @@ DisplayGUIInput:
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,5,78,107,78,dl
mov dl,[GUIWincol] ; Up
DrawGUIWinBox 3,45,99,64,99,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,44,100,43,106,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,45,107,64,107,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,66,100,65,106,dl
mov dl,[GUIWincol] ; Down
DrawGUIWinBox 3,45,109,64,109,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,44,110,43,116,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,45,117,64,117,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,66,110,65,116,dl
mov dl,[GUIWincol] ; Left
DrawGUIWinBox 3,45,119,64,119,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,44,120,43,126,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,45,127,64,127,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,66,120,65,126,dl
mov dl,[GUIWincol] ; Right
DrawGUIWinBox 3,45,129,64,129,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,44,130,43,136,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,45,137,64,137,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,66,130,65,136,dl
mov dl,[GUIWincol] ; Start
DrawGUIWinBox 3,45,139,64,139,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,44,140,43,146,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,45,147,64,147,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,66,140,65,146,dl
mov dl,[GUIWincol] ; Select
DrawGUIWinBox 3,45,149,64,149,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,44,150,43,156,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,45,157,64,157,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,66,150,65,156,dl
mov dl,[GUIWincol] ; A
DrawGUIWinBox 3,85,99,104,99,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,84,100,83,106,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,85,107,104,107,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,106,100,105,106,dl
mov dl,[GUIWincol] ; B
DrawGUIWinBox 3,85,109,104,109,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,84,110,83,116,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,85,117,104,117,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,106,110,105,116,dl
mov dl,[GUIWincol] ; X
DrawGUIWinBox 3,85,119,104,119,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,84,120,83,126,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,85,127,104,127,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,106,120,105,126,dl
mov dl,[GUIWincol] ; Y
DrawGUIWinBox 3,85,129,104,129,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,84,130,83,136,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,85,137,104,137,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,106,130,105,136,dl
mov dl,[GUIWincol] ; L
DrawGUIWinBox 3,85,139,104,139,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,84,140,83,146,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,85,147,104,147,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,106,140,105,146,dl
mov dl,[GUIWincol] ; R
DrawGUIWinBox 3,85,149,104,149,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,84,150,83,156,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,85,157,104,157,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,106,150,105,156,dl
mov dl,[GUIWincol] ; Turbo X
DrawGUIWinBox 3,125,99,144,99,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,124,100,123,106,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,125,107,144,107,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,146,100,145,106,dl
mov dl,[GUIWincol] ; Turbo Y
DrawGUIWinBox 3,125,109,144,109,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,124,110,123,116,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,125,117,144,117,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,146,110,145,116,dl
mov dl,[GUIWincol] ; Turbo L
DrawGUIWinBox 3,125,119,144,119,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,124,120,123,126,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,125,127,144,127,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,146,120,145,126,dl
mov dl,[GUIWincol] ; DL
DrawGUIWinBox 3,125,139,144,139,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,124,140,123,146,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,125,147,144,147,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,146,140,145,146,dl
mov dl,[GUIWincol] ; DR
DrawGUIWinBox 3,125,149,144,149,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,124,150,123,156,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,125,157,144,157,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,146,150,145,156,dl
mov dl,[GUIWincol] ; Turbo A
DrawGUIWinBox 3,165,99,184,99,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,164,100,163,106,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,165,107,184,107,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,186,100,185,106,dl
mov dl,[GUIWincol] ; Turbo B
DrawGUIWinBox 3,165,109,184,109,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,164,110,163,116,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,165,117,184,117,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,186,110,185,116,dl
mov dl,[GUIWincol] ; Turbo R
DrawGUIWinBox 3,165,119,184,119,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,164,120,163,126,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,165,127,184,127,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,186,120,185,126,dl
mov dl,[GUIWincol] ; UL
DrawGUIWinBox 3,165,139,184,139,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,164,140,163,146,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,165,147,184,147,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,186,140,185,146,dl
mov dl,[GUIWincol] ; UR
DrawGUIWinBox 3,165,149,184,149,dl
mov dl,[GUIWincol]
add dl,1
DrawGUIWinBox 3,164,150,163,156,dl
mov dl,[GUIWincol]
add dl,4
DrawGUIWinBox 3,165,157,184,157,dl
mov dl,[GUIWincol]
add dl,3
DrawGUIWinBox 3,186,150,185,156,dl
DGOptnsBorderBox 3,44,99
DGOptnsBorderBox 3,44,109
DGOptnsBorderBox 3,44,119
DGOptnsBorderBox 3,44,129
DGOptnsBorderBox 3,44,139
DGOptnsBorderBox 3,44,149
DGOptnsBorderBox 3,84,99
DGOptnsBorderBox 3,84,109
DGOptnsBorderBox 3,84,119
DGOptnsBorderBox 3,84,129
DGOptnsBorderBox 3,84,139
DGOptnsBorderBox 3,84,149
DGOptnsBorderBox 3,124,99
DGOptnsBorderBox 3,124,109
DGOptnsBorderBox 3,124,119
DGOptnsBorderBox 3,124,139
DGOptnsBorderBox 3,124,149
DGOptnsBorderBox 3,164,99
DGOptnsBorderBox 3,164,109
DGOptnsBorderBox 3,164,119
DGOptnsBorderBox 3,164,139
DGOptnsBorderBox 3,164,149
; End draw borders
ret