From 6a7a183273c02986a2f130a67af349ae7d3a6ae8 Mon Sep 17 00:00:00 2001 From: pagefault <> Date: Tue, 15 Apr 2003 18:59:28 +0000 Subject: [PATCH] Added option for small message text --- zsnes/src/gui/gui.asm | 2 +- zsnes/src/gui/guikeys.inc | 4 ++++ zsnes/src/gui/guimouse.inc | 1 + zsnes/src/gui/guiwindp.inc | 22 +++++++++++----------- zsnes/src/video/procvid.asm | 5 +++++ 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm index cabf7826..610aecb9 100644 --- a/zsnes/src/gui/gui.asm +++ b/zsnes/src/gui/gui.asm @@ -581,7 +581,7 @@ NEWSYM GUIWBAdd, db 25 NEWSYM GrayscaleMode, db 0 NEWSYM MouseWheel, db 1 -NEWSYM AlternateTimer, db 0 +NEWSYM SmallMsgText, db 0 NEWSYM AllowMultipleInst, db 0 NEWSYM FilteredGUI, db 0 NEWSYM BilinearFilter, db 0 diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc index 9f3b2119..64c6e438 100644 --- a/zsnes/src/gui/guikeys.inc +++ b/zsnes/src/gui/guikeys.inc @@ -909,6 +909,10 @@ GUIOptionKeys: jne .nosavepath xor byte[DontSavePath],1 .nosavepath + cmp dh,'S' + jne .nosmallmsgtext + xor byte[SmallMsgText],1 +.nosmallmsgtext %ifdef __WIN32__ cmp dh,'I' jne .noscreensaver diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc index 57c11909..de2726f7 100644 --- a/zsnes/src/gui/guimouse.inc +++ b/zsnes/src/gui/guimouse.inc @@ -2266,6 +2266,7 @@ DisplayGUIOptionClick: GUIClickCButton 11,146,byte[LatestSave] GUIClickCButton 11,156,byte[AutoState] GUIClickCButton 11,166,byte[DontSavePath] + GUIClickCButton 11,176,byte[SmallMsgText] %ifdef __WIN32__ GUIClickCButtonW 11,186,byte[DisableScreenSaver] %endif diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc index 2b4d18fd..7785c7d6 100644 --- a/zsnes/src/gui/guiwindp.inc +++ b/zsnes/src/gui/guiwindp.inc @@ -1417,7 +1417,7 @@ DisplayGUIOption: GUIOuttextwin2u 4,26,151,GUIOptionTextH,9 GUIOuttextwin2u 4,26,161,GUIOptionTextI,15 GUIOuttextwin2u 4,26,171,GUIOptionTextJ,0 -; GUIOuttextwin2u 4,26,181,GUIOptionTextK,1 + GUIOuttextwin2u 4,26,181,GUIOptionTextK,1 %ifdef __WIN32__ GUIOuttextwin2u 4,26,191,GUIOptionTextL,1 %endif @@ -1443,7 +1443,7 @@ DisplayGUIOption: GUIOuttextwin2 4,25,150,GUIOptionTextH GUIOuttextwin2 4,25,160,GUIOptionTextI GUIOuttextwin2 4,25,170,GUIOptionTextJ -; GUIOuttextwin2 4,25,180,GUIOptionTextK + GUIOuttextwin2 4,25,180,GUIOptionTextK %ifdef __WIN32__ GUIOuttextwin2 4,25,190,GUIOptionTextL %endif @@ -1547,18 +1547,18 @@ DisplayGUIOption: mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox14 GUIDisplayIconWin 4,11,166,[GUITemp] -%ifdef __WIN32__ -; mov dword[GUITemp],GUIIconDataCheckBoxUC -; cmp byte[AlternateTimer],0 -; je .nocheckbox16 -; mov dword[GUITemp],GUIIconDataCheckBoxC -;.nocheckbox16 -; GUIDisplayIconWin 4,11,186,[GUITemp] mov dword[GUITemp],GUIIconDataCheckBoxUC - cmp byte[DisableScreenSaver],0 + cmp byte[SmallMsgText],0 je .nocheckbox15 mov dword[GUITemp],GUIIconDataCheckBoxC .nocheckbox15 + GUIDisplayIconWin 4,11,176,[GUITemp] +%ifdef __WIN32__ + mov dword[GUITemp],GUIIconDataCheckBoxUC + cmp byte[DisableScreenSaver],0 + je .nocheckbox16 + mov dword[GUITemp],GUIIconDataCheckBoxC +.nocheckbox16 GUIDisplayIconWin 4,11,186,[GUITemp] %endif cmp byte[frameskip],0 @@ -1624,7 +1624,7 @@ GUIOptionTextG db 'OLD GFX MODE 2',0 GUIOptionTextH db 'START AT LATEST SAVE',0 GUIOptionTextI db 'AUTO STATE SAVE/LOAD',0 GUIOptionTextJ db 'DON',39,'T SAVE CUR PATH',0 -GUIOptionTextK db 'BLANK SPACE',0 +GUIOptionTextK db 'USE SMALL MESSAGE TEXT',0 GUIOptionTextL db 'DISABLE SCREENSAVER',0 GUIOptionText8 db '-',0 GUIOptionText9 db '+',0 diff --git a/zsnes/src/video/procvid.asm b/zsnes/src/video/procvid.asm index 6f9ca591..905c15cc 100644 --- a/zsnes/src/video/procvid.asm +++ b/zsnes/src/video/procvid.asm @@ -54,6 +54,7 @@ EXTSYM ChatNick EXTSYM StringLength EXTSYM chatstrLt EXTSYM GUIOn,FilteredGUI,HalfTrans +EXTSYM SmallMsgText EXTSYM ClearScreen EXTSYM Mode7HiRes,mosenng,mosszng,intrlng,mode7hr ;,VESAAddr EXTSYM GUICPC, newgfx16b @@ -3572,6 +3573,8 @@ NEWSYM copyvid add esi,[vidbuffer] cmp edi,CSStatus je .fivex5b + cmp byte[SmallMsgText],1 + je .fivex5b call OutputGraphicString.no16bit jmp .nfivex5b .fivex5b @@ -3589,6 +3592,8 @@ NEWSYM copyvid add esi,[vidbuffer] cmp edi,CSStatus je .fivex5 + cmp byte[SmallMsgText],1 + je .fivex5 call OutputGraphicString16b jmp .nfivex5 .fivex5