mirror of
https://github.com/1dot13/source.git
synced 2026-09-16 14:47:17 +02:00
- bugfix: CTD when Skyrider is escorted to his heli in drassen (before Skyrider talks to the mercs)
- changed: Location of the Heli information box in Strategy Screen in High Resolution git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@701 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -74,9 +74,9 @@ INT32 iZoomY = 0;
|
|||||||
#define VERT_SCROLL 10
|
#define VERT_SCROLL 10
|
||||||
|
|
||||||
// the pop up for helicopter stuff
|
// the pop up for helicopter stuff
|
||||||
#define MAP_HELICOPTER_ETA_POPUP_X 400
|
#define MAP_HELICOPTER_ETA_POPUP_X (400 + iScreenWidthOffset)
|
||||||
#define MAP_HELICOPTER_ETA_POPUP_Y 250
|
#define MAP_HELICOPTER_ETA_POPUP_Y (250 + iScreenHeightOffset)
|
||||||
#define MAP_HELICOPTER_UPPER_ETA_POPUP_Y 50
|
#define MAP_HELICOPTER_UPPER_ETA_POPUP_Y (50 + iScreenHeightOffset)
|
||||||
#define MAP_HELICOPTER_ETA_POPUP_WIDTH 120
|
#define MAP_HELICOPTER_ETA_POPUP_WIDTH 120
|
||||||
#define MAP_HELICOPTER_ETA_POPUP_HEIGHT 68
|
#define MAP_HELICOPTER_ETA_POPUP_HEIGHT 68
|
||||||
|
|
||||||
|
|||||||
@@ -293,7 +293,8 @@ INT32 AddVehicleToList( INT16 sMapX, INT16 sMapY, INT16 sGridNo, UINT8 ubType )
|
|||||||
|
|
||||||
if( !pGroup )
|
if( !pGroup )
|
||||||
{
|
{
|
||||||
if( gfEditMode )
|
// WANNE: Commented the following line, because we got a CTD when skyrider sees his heli in drassen!
|
||||||
|
//if( gfEditMode )
|
||||||
{
|
{
|
||||||
//This is okay, no groups exist, so simply return.
|
//This is okay, no groups exist, so simply return.
|
||||||
return iVehicleIdValue;
|
return iVehicleIdValue;
|
||||||
|
|||||||
Reference in New Issue
Block a user