mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +02:00
Move mapscreen bottom coordinates' initialization
Fixes radar map's initial position in strategic screen being in the top right corner.
This commit is contained in:
@@ -51,6 +51,7 @@
|
|||||||
#include "Multilingual Text Code Generator.h"
|
#include "Multilingual Text Code Generator.h"
|
||||||
#include "editscreen.h"
|
#include "editscreen.h"
|
||||||
#include "Arms Dealer Init.h"
|
#include "Arms Dealer Init.h"
|
||||||
|
#include "Map Screen Interface Bottom.h"
|
||||||
#include "MPXmlTeams.hpp"
|
#include "MPXmlTeams.hpp"
|
||||||
#include "Strategic Mines LUA.h"
|
#include "Strategic Mines LUA.h"
|
||||||
#include "UndergroundInit.h"
|
#include "UndergroundInit.h"
|
||||||
@@ -1474,6 +1475,10 @@ UINT32 InitializeJA2(void)
|
|||||||
return( ERROR_SCREEN );
|
return( ERROR_SCREEN );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// InitRadarScreenCoords() depend on Mapscreen Interface Bottom coordinates -> need to initiate them first
|
||||||
|
// before calling InitTacticalEngine()
|
||||||
|
InitMapScreenInterfaceBottomCoords();
|
||||||
|
|
||||||
// Init tactical engine
|
// Init tactical engine
|
||||||
if ( !InitTacticalEngine( ) )
|
if ( !InitTacticalEngine( ) )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4793,9 +4793,6 @@ UINT32 MapScreenHandle(void)
|
|||||||
|
|
||||||
InitPreviousPaths();
|
InitPreviousPaths();
|
||||||
|
|
||||||
// HEADROCK HAM 3.6: Init coordinates for new variable-sized message window
|
|
||||||
InitMapScreenInterfaceBottomCoords();
|
|
||||||
|
|
||||||
// if arrival sector is invalid, reset to A9
|
// if arrival sector is invalid, reset to A9
|
||||||
if ( ( gsMercArriveSectorX < 1 ) || ( gsMercArriveSectorY < 1 ) ||
|
if ( ( gsMercArriveSectorX < 1 ) || ( gsMercArriveSectorY < 1 ) ||
|
||||||
( gsMercArriveSectorX > 16 ) || ( gsMercArriveSectorY > 16 ) )
|
( gsMercArriveSectorX > 16 ) || ( gsMercArriveSectorY > 16 ) )
|
||||||
|
|||||||
Reference in New Issue
Block a user