1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

- A few adjustments and minor fixes (by Buggler)

Browse Source 
o Externalised Laptop 'Lock&Release' feature
o Minor Fix for Tactical 'Lock&Release' feature
o Show 'Page Numbers' in BobbyR Item Selection Page, AIM Profile Page
o Change Low Stat Color to Dark Grey (Previous: same color w Medium Stat) & its Criteria to < 20 (Previous: <50) for AIM Member Stats
o Laptop\AIM Member Screen: Hotkey BACKSPACE - Back to AIM Mug Shot Index. Close Window if in Conference Mode
o Laptop\MERC Screen: Hotkey BACKSPACE - Back to Merc Homepage
o Repeat Keys for 'Next' & 'Previous' in BobbyR Item Selection Page, AIM Profile Page, Merc Profile Page, Strategic Sector Inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5614 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-10-08 11:00:58 +00:00
parent 5238ceb3b5
commit 902cd02298
8 changed files with 155 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/laptop.cpp
+9 -21
View File
@@ -82,6 +82,7 @@
#include "cheats.h"
#include "Strategic Status.h"
#include "Arms Dealer Init.h"
#include "GameSettings.h"
#endif
#include "connect.h"
@@ -504,9 +505,6 @@ BOOLEAN gfWWWaitSubSitesVisitedFlags[LAPTOP_MODE_SIRTECH - LAPTOP_MODE_WWW ];
//INT32 iBookMarkList[MAX_BOOKMARKS];
// flag to see if mouse is captured in the laptop's area or not
BOOLEAN fMouseCaptured;
// mouse regions
MOUSE_REGION gEmailRegion;
MOUSE_REGION gWWWRegion;
@@ -802,8 +800,6 @@ UINT32 LaptopScreenInit()
gfAtLeastOneMercWasHired = FALSE;
fMouseCaptured = TRUE;
//No longer inits the laptop screens, now InitLaptopAndLaptopScreens() does
#ifdef JA2UB
InitJa25SaveStruct();
@@ -1058,6 +1054,12 @@ INT32 EnterLaptop()
fShowAtmPanelStartButton = TRUE;
// lock cursor to screen
if ( gGameExternalOptions.fLaptopMouseCaptured == TRUE )
{
RestrictMouseCursor( &LaptopScreenRect );
}
InvalidateRegion(0,0,SCREEN_WIDTH, SCREEN_HEIGHT);
return( TRUE );
@@ -1065,9 +1067,6 @@ INT32 EnterLaptop()
void ExitLaptop()
{
fMouseCaptured = TRUE;
// exit is called due to message box, leave
if( fExitDueToMessageBox )
{
@@ -1102,7 +1101,6 @@ void ExitLaptop()
//}
// release cursor
fMouseCaptured = false;
FreeMouseCursor( );
// set the fact we are currently not in laptop, for rendering purposes
@@ -2179,14 +2177,6 @@ UINT32 LaptopScreenHandle()
RestoreBackgroundRects();
// lock cursor to screen
if ( fMouseCaptured == TRUE )
{
RestrictMouseCursor( &LaptopScreenRect );
}
// handle animated cursors
HandleAnimatedCursors( );
// Deque all game events
@@ -6013,18 +6003,16 @@ void HandleKeyBoardShortCutsForLapTop( UINT16 usEvent, UINT32 usParam, UINT16 us
MarkButtonsDirty( );
}
}
else if( ( ( usEvent == KEY_DOWN ) || ( usEvent == KEY_REPEAT ) ) && ( ( usParam == 'z' ) || ( usParam == 'Z' ) || ( usParam == 'y' ) || ( usParam == 'Y' ) ) )
else if( ( ( usEvent == KEY_DOWN ) || ( usEvent == KEY_REPEAT ) ) && ( ( usParam == 'z' ) || ( usParam == 'y' ) ) )
{
if ( usKeyState & CTRL_DOWN )
{
if ( fMouseCaptured == TRUE )
if( IsCursorRestricted( ) )
{
fMouseCaptured = FALSE;
FreeMouseCursor( );
}
else
{
fMouseCaptured = TRUE;
RestrictMouseCursor( &LaptopScreenRect );
}