Code: Select all
Index: guiwindp.inc
===================================================================
RCS file: /cvsroot/zsnes/zsnes/src/gui/guiwindp.inc,v
retrieving revision 1.200
retrieving revision 1.201
diff -r1.200 -r1.201
5584c5584
< push ecx ;need to save register for when called by the following macro
---
> push ecx ;Needed for the macro below
5592c5592,5596
< GUIOuttextwin2 %1,%2-1,%3-1,%4
---
> push esi
> mov esi,%2
> dec esi
> GUIOuttextwin2 %1,esi,%3-1,%4
> pop esi
5597c5601
< mov ecx,%4
---
> mov ecx,%4 ;Move pointer to text into ecx
5599c5603
< cmp byte[ecx],0
---
> cmp byte[ecx],0 ;Check for null in string
5601c5605
< inc ecx
---
> inc ecx
5604c5608,5610
< sub ecx,%5
---
> push eax
> mov eax,ecx ;Move pointer to null into eax
> sub ecx,%5 ;Move ecx pointer back by length to display
5607c5613
< mov ecx,%4
---
> mov ecx,%4 ;If pointer is before beginning, reset pointer to beginning
5608a5615,5616
> sub eax,ecx ;Subtract new pointer from old null pointer which gives us length of chars
> push eax
5609a5618,5636
> pop eax
> push ebx
> pop ecx
> call BlinkCursorCheck
> cmp ebx,%4
> pop ebx
> jne %%fixreg
> cmp byte[GUIBlinkCursor],' '
> je %%three
> mov byte[GUIBlinkCursor],' '
> jmp %%four
> %%three
> mov byte[GUIBlinkCursor],'_'
> %%four
> imul eax,6
> add eax,%2
> push ecx
> mov ecx,eax
> GUIOuttextwin2c %1,ecx,%3,GUIBlinkCursor
5610a5638,5639
> %%fixreg
> pop eax
6323a6353,6415
> BlinkCursorCheck:
> cmp dword[GUIInputBox],0
> jne .checkboxes
> mov ebx,0
> ret
>
> .checkboxes
> cmp dword[GUIInputBox],1
> jne .notBox1
> mov ebx,SRAMPath
> ret
> .notBox1
> cmp dword[GUIInputBox],2
> jne .notBox2
> mov ebx,SnapPath
> ret
> .notBox2
> cmp dword[GUIInputBox],3
> jne .notBox3
> mov ebx,SPCPath
> ret
> .notBox3
> cmp dword[GUIInputBox],4
> jne .notBox4
> mov ebx,BSXPath
> ret
> .notBox4
> cmp dword[GUIInputBox],5
> jne .notBox5
> mov ebx,SGPath
> ret
> .notBox5
> cmp dword[GUIInputBox],6
> jne .notBox6
> mov ebx,STPath
> ret
> .notBox6
> cmp dword[GUIInputBox],7
> jne .notBox7
> mov ebx,GNextPath
> ret
> .notBox7
> cmp dword[GUIInputBox],8
> jne .notBox8
> mov ebx,FEOEZPath
> ret
> .notBox8
> cmp dword[GUIInputBox],9
> jne .notBox9
> mov ebx,SJNSPath
> ret
> .notBox9
> cmp dword[GUIInputBox],10
> jne .notBox10
> mov ebx,MDHPath
> ret
> .notBox10
> cmp dword[GUIInputBox],11
> jne .notBox11
> mov ebx,SPL4Path
> .notBox11
> ret
>
6361,6362c6453,6454
< DrawGUIWinBox 19,7,94,101,106,177
< DrawGUIWinBox 19,7,119,101,131,177
---
> DrawGUIWinBox 19,7,94,107,106,177
> DrawGUIWinBox 19,7,119,107,131,177
6365,6366c6457,6458
< DrawGUIWinBox 19,7,154,101,166,177
< DrawGUIWinBox 19,7,179,101,191,177
---
> DrawGUIWinBox 19,7,154,107,166,177
> DrawGUIWinBox 19,7,179,107,191,177
6374,6375c6466,6467
< DrawGUIWinBox 19,8,95,100,105,167
< DrawGUIWinBox 19,8,120,100,130,167
---
> DrawGUIWinBox 19,8,95,106,105,167
> DrawGUIWinBox 19,8,120,106,130,167
6378,6379c6470,6471
< DrawGUIWinBox 19,8,155,100,165,167
< DrawGUIWinBox 19,8,180,100,190,167
---
> DrawGUIWinBox 19,8,155,106,165,167
> DrawGUIWinBox 19,8,180,106,190,167
6383,6385c6475,6477
< GUIOuttextwin2d 19,77,19,SRAMPath,26
< GUIOuttextwin2d 19,77,39,SnapPath,26
< GUIOuttextwin2d 19,77,59,SPCPath,26
---
> GUIOuttextwin2d 19,77,19,SRAMPath,25
> GUIOuttextwin2d 19,77,39,SnapPath,25
> GUIOuttextwin2d 19,77,59,SPCPath,25
6410c6502
<
---
> NEWSYM GUIBlinkCursor, times 2 db 0