From 133f346cdb0d46570a5b0ed51f90f5a8a0d42564 Mon Sep 17 00:00:00 2001 From: Asdow <20314541+Asdow@users.noreply.github.com> Date: Fri, 4 Oct 2024 20:54:03 +0300 Subject: [PATCH] Remove DrawlapTopIcons() Empty function --- Laptop/email.cpp | 78 ----------------------------------------------- Laptop/laptop.cpp | 7 ----- Laptop/laptop.h | 2 -- 3 files changed, 87 deletions(-) diff --git a/Laptop/email.cpp b/Laptop/email.cpp index 6c12710f..08f5f618 100644 --- a/Laptop/email.cpp +++ b/Laptop/email.cpp @@ -670,13 +670,6 @@ void AddCustomEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, // add message to list AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, 0, 0, iCurrentIMPPosition, iCurrentShipmentDestinationID, EmailType, TYPE_E_NONE ); - // if we are in fact int he laptop, redraw icons, might be change in mail status - - if( fCurrentlyInLaptop ) - { - // redraw icons, might be new mail - DrawLapTopIcons(); - } } //-- @@ -721,14 +714,6 @@ void AddEmailWithSpecialData(INT32 iMessageOffset, INT32 iMessageLength, UINT8 u // add message to list AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, iFirstData, uiSecondData, -1 , -1, EmailType, EmailAIM ); - // if we are in fact int he laptop, redraw icons, might be change in mail status - - if( fCurrentlyInLaptop == TRUE ) - { - // redraw icons, might be new mail - DrawLapTopIcons(); - } - return; } @@ -761,14 +746,6 @@ void AddEmailWithSpecialDataXML(INT32 iMessageOffset, INT32 iMessageLength, UINT // add message to list AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, iFirstData, uiSecondData, -1 , -1, EmailType, EmailAIM); - // if we are in fact int he laptop, redraw icons, might be change in mail status - - if( fCurrentlyInLaptop == TRUE ) - { - // redraw icons, might be new mail - DrawLapTopIcons(); - } - return; } @@ -792,13 +769,6 @@ void AddPreReadEmailTypeXML( INT32 iMessageOffset, INT32 iMessageLength, UINT8 u // add message to list AddEmailMessage( iMessageOffset,iMessageLength, pSubject, iDate, ubSender, TRUE, 0, 0, -1, -1 , EmailType, TYPE_E_NONE ); - // if we are in fact int he laptop, redraw icons, might be change in mail status - - if( fCurrentlyInLaptop ) - { - // redraw icons, might be new mail - DrawLapTopIcons(); - } } void AddEmailTypeXML( INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 iDate, INT32 iCurrentIMPPosition, UINT8 EmailType ) @@ -830,13 +800,6 @@ void AddEmailTypeXML( INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender } AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, 0, 0, iCurrentIMPPosition, -1, EmailType, TYPE_E_NONE); - - // if we are in fact int he laptop, redraw icons, might be change in mail status - if( fCurrentlyInLaptop ) - { - // redraw icons, might be new mail - DrawLapTopIcons(); - } } #ifdef JA2UB @@ -853,14 +816,6 @@ void AddBobbyREmailJA2(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSende // add message to list AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, 0, 0, iCurrentIMPPosition, iCurrentShipmentDestinationID, EmailType, TYPE_EMAIL_BOBBY_R_L1); - // if we are in fact int he laptop, redraw icons, might be change in mail status - - if( fCurrentlyInLaptop == TRUE ) - { - // redraw icons, might be new mail - DrawLapTopIcons(); - } - return; } #endif @@ -884,14 +839,6 @@ void AddEmailWFMercAvailable(INT32 iMessageOffset, INT32 iMessageLength, UINT8 u AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, 0, 0, iCurrentIMPPosition, -1 , EmailType, TYPE_E_NONE); - // if we are in fact int he laptop, redraw icons, might be change in mail status - - if( fCurrentlyInLaptop == TRUE ) - { - // redraw icons, might be new mail - DrawLapTopIcons(); - } - return; } @@ -931,14 +878,6 @@ void AddEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, INT32 // add message to list AddEmailMessage(iMessageOffset,iMessageLength, pSubject, iDate, ubSender, FALSE, 0, 0, iCurrentIMPPosition, iCurrentShipmentDestinationID, EmailType, TYPE_E_NONE); - // if we are in fact int he laptop, redraw icons, might be change in mail status - - if( fCurrentlyInLaptop == TRUE ) - { - // redraw icons, might be new mail - DrawLapTopIcons(); - } - return; } @@ -968,13 +907,6 @@ void AddPreReadEmail(INT32 iMessageOffset, INT32 iMessageLength, UINT8 ubSender, // add message to list AddEmailMessage( iMessageOffset,iMessageLength, pSubject, iDate, ubSender, TRUE, 0, 0, -1, -1 , EmailType, TYPE_E_NONE ); - // if we are in fact int he laptop, redraw icons, might be change in mail status - - if( fCurrentlyInLaptop == TRUE ) - { - // redraw icons, might be new mail - DrawLapTopIcons(); - } return; } @@ -1956,9 +1888,6 @@ void BtnMessageXCallback(GUI_BUTTON *btn,INT32 reason) // reset page being displayed giMessagePage = 0; - // redraw icons - DrawLapTopIcons(); - // force update of entire screen fPausedReDrawScreenFlag=TRUE; @@ -2421,7 +2350,6 @@ BOOLEAN DisplayNewMailBox( void ) // printf warning string mprintf(EMAIL_WARNING_X + 60, EMAIL_WARNING_Y + 63, pNewMailStrings[0] ); - DrawLapTopIcons( ); // invalidate region InvalidateRegion( EMAIL_WARNING_X, EMAIL_WARNING_Y, EMAIL_WARNING_X + 270, EMAIL_WARNING_Y + 200 ); @@ -2883,9 +2811,6 @@ void DeleteEmail() // upadte list PlaceMessagesinPages(); - // redraw icons (if deleted message was last unread, remove checkmark) - DrawLapTopIcons(); - // if all of a sudden we are beyond last page, move back one if(iCurrentPage > iLastPage) iCurrentPage=iLastPage; @@ -3037,9 +2962,6 @@ void ViewMessageRegionCallBack( MOUSE_REGION * pRegion, INT32 iReason ) // reset page being displayed giMessagePage = 0; - // redraw icons - DrawLapTopIcons(); - // force update of entire screen fPausedReDrawScreenFlag=TRUE; diff --git a/Laptop/laptop.cpp b/Laptop/laptop.cpp index 00c2f161..27785228 100644 --- a/Laptop/laptop.cpp +++ b/Laptop/laptop.cpp @@ -837,13 +837,6 @@ BOOLEAN InitLaptopAndLaptopScreens() } -UINT32 -DrawLapTopIcons() -{ - - return (TRUE); -} - UINT32 DrawLapTopText() { diff --git a/Laptop/laptop.h b/Laptop/laptop.h index a558dd1b..fdb377f9 100644 --- a/Laptop/laptop.h +++ b/Laptop/laptop.h @@ -15,7 +15,6 @@ void ExitLaptop(); void RenderLaptop(); UINT32 ExitLaptopMode(UINT32 uiMode); void EnterNewLaptopMode(); -UINT32 DrawLapTopIcons(); UINT32 DrawLapTopText(); void ReDrawHighLight(); void DrawButtonText(); @@ -26,7 +25,6 @@ BOOLEAN IsBookMarkSet( INT32 iBookId ); BOOLEAN LeaveLapTopScreen( ); void SetLaptopExitScreen( UINT32 uiExitScreen ); void SetLaptopNewGameFlag( ); -UINT32 DrawLapTopIcons( ); void LapTopScreenCallBack(MOUSE_REGION * pRegion, INT32 iReason ); void HandleRightButtonUpEvent( void );