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

Bugfix: Corrected the shopkeeper interface so that the clock and town strings are displayed in the correct location.

Browse Source 
Bugfix: Added a condition so that the clock doesn't try to display on the SM Panel while in NIV mode.  It was displaying, just hidden under the radar screen.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2473 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
ChrisL
2009-01-08 16:41:34 +00:00
parent 7e7c27b61d
commit ddd90f5317
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Panels.cpp
+3 -1
View File
@@ -2734,7 +2734,9 @@ void RenderSMPanel( BOOLEAN *pfDirty )
if( fRenderRadarScreen == TRUE ) if( fRenderRadarScreen == TRUE )
{ {
// Render clock // Render clock
RenderClock( INTERFACE_CLOCK_X, INTERFACE_CLOCK_Y ); // CHRISL: If we're in NIV mode, don't render the clock on the SM panel
if(UsingNewInventorySystem() == false)
RenderClock( INTERFACE_CLOCK_X, INTERFACE_CLOCK_Y );
CreateMouseRegionForPauseOfClock( INTERFACE_CLOCK_X, INTERFACE_CLOCK_Y ); CreateMouseRegionForPauseOfClock( INTERFACE_CLOCK_X, INTERFACE_CLOCK_Y );
// CHRISL: Change function call to include X,Y coordinates. // CHRISL: Change function call to include X,Y coordinates.
RenderTownIDString( LOCATION_NAME_X, LOCATION_NAME_Y ); RenderTownIDString( LOCATION_NAME_X, LOCATION_NAME_Y );
Tactical/Interface Panels.h
+5
View File
@@ -42,6 +42,11 @@ typedef enum
#define SHOW_LOCATOR_NORMAL 1 #define SHOW_LOCATOR_NORMAL 1
#define SHOW_LOCATOR_FAST 2 #define SHOW_LOCATOR_FAST 2
extern int INTERFACE_CLOCK_X;
extern int INTERFACE_CLOCK_Y;
extern int LOCATION_NAME_X;
extern int LOCATION_NAME_Y;
BOOLEAN CreateSMPanelButtons( ); BOOLEAN CreateSMPanelButtons( );
void RemoveSMPanelButtons( ); void RemoveSMPanelButtons( );
BOOLEAN InitializeSMPanel( ); BOOLEAN InitializeSMPanel( );
Tactical/ShopKeeper Interface.cpp
+12 -4
View File
@@ -1396,9 +1396,13 @@ void HandleShopKeeperInterface()
fInterfacePanelDirty = DIRTYLEVEL0; fInterfacePanelDirty = DIRTYLEVEL0;
} }
RenderClock( CLOCK_X, CLOCK_Y ); // CHRISL: If in NIV mode, don't display the clock
//RenderClock( CLOCK_X, CLOCK_Y );
if( UsingNewInventorySystem() == false )
RenderClock( INTERFACE_CLOCK_X, INTERFACE_CLOCK_Y );
// CHRISL: Added X,Y parameters to allow control of TownID string placement. // CHRISL: Added X,Y parameters to allow control of TownID string placement.
RenderTownIDString( CLOCK_X, (CLOCK_Y - 29) ); //RenderTownIDString( CLOCK_X, (CLOCK_Y - 29) );
RenderTownIDString( LOCATION_NAME_X, LOCATION_NAME_Y );
//ATM: //ATM:
// RenderSkiAtmPanel(); // RenderSkiAtmPanel();
@@ -1543,9 +1547,13 @@ BOOLEAN RenderShopKeeperInterface()
CrossOutUnwantedItems( ); CrossOutUnwantedItems( );
//Render the clock and the town name //Render the clock and the town name
RenderClock( CLOCK_X, CLOCK_Y ); // CHRISL: If in NIV mode, don't display the clock
//RenderClock( CLOCK_X, CLOCK_Y );
if( UsingNewInventorySystem() == false )
RenderClock( INTERFACE_CLOCK_X, INTERFACE_CLOCK_Y );
// CHRISL: Added X,Y parameters to allow control of TownID string placement. // CHRISL: Added X,Y parameters to allow control of TownID string placement.
RenderTownIDString( CLOCK_X, (CLOCK_Y - 29) ); RenderTownIDString( LOCATION_NAME_X, LOCATION_NAME_Y );
//RenderTownIDString( CLOCK_X, (CLOCK_Y - 29) );
// RenderTacticalInterface( ); // RenderTacticalInterface( );
// RenderSMPanel( &fDirty ); // RenderSMPanel( &fDirty );