1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from 1dot13/bugfix

Browse Source 
r9402: Fixed nullptr dereference & assertion error
This commit is contained in:
Asdow
2022-10-10 07:48:13 +03:00
committed by GitHub
parent 41e0cedb7a 5197ef21e5
commit 9cc567644f
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+2 -2
View File
@@ -55,8 +55,8 @@
#endif
CHAR8 czVersionNumber[16] = { "Build 21.07.13" }; //YY.MM.DD
CHAR8 czVersionNumber[16] = { "Build 10.10.22" }; //YY.MM.DD
CHAR16 zTrackingNumber[16] = { L"Z" };
CHAR16 zRevisionNumber[16] = { L"Revision 9141" };
CHAR16 zRevisionNumber[16] = { L"Revision 9402" };
// SAVE_GAME_VERSION is defined in header, change it there
Strategic/Map Screen Interface.cpp
+2 -3
View File
@@ -6731,11 +6731,10 @@ void TurnOnSectorLocator( UINT8 ubProfileID )
if ( ( ubProfileID == SKYRIDER ) && fSkyRiderSetUp )
{
// if helicopter position is being shown, don't do this, too, cause the helicopter icon is on top and it looks
// like crap. I tried moving the heli icon blit to before, but that screws up it's blitting.
if ( gusMapDisplayColourMode != MAP_DISPLAY_AIRSPACE && gusMapDisplayColourMode != MAP_DISPLAY_AIRSPACE_COLOURED_SAMS )
// like crap. I tried moving the heli icon blit to before, but that screws up it's blitting.
if ( gusMapDisplayColourMode != MAP_DISPLAY_AIRSPACE && gusMapDisplayColourMode != MAP_DISPLAY_AIRSPACE_COLOURED_SAMS && iHelicopterVehicleId != -1 )
{
// can't use his profile, he's where his chopper is
Assert( iHelicopterVehicleId != -1 );
gsSectorLocatorX = pVehicleList[ iHelicopterVehicleId ].sSectorX;
gsSectorLocatorY = pVehicleList[ iHelicopterVehicleId ].sSectorY;
}
Strategic/strategicmap.cpp
+1 -2
View File
@@ -4937,9 +4937,8 @@ BOOLEAN OKForSectorExit( INT8 bExitDirection, INT32 usAdditionalData, UINT32 *pu
for ( pSoldier = MercPtrs[cnt]; cnt <= gTacticalStatus.Team[gbPlayerNum].bLastID; ++cnt, ++pSoldier )
{
// If we are controllable
//if ( OK_CONTROLLABLE_MERC( pSoldier) && pSoldier->bAssignment == CurrentSquad( ) )
if ( OK_CONTROLLABLE_MERC( pSoldier ) && (pSoldier->bAssignment == CurrentSquad( ) ||
(pSoldier->bAssignment == VEHICLE && GetSoldierStructureForVehicle( pSoldier->iVehicleId )->bAssignment == CurrentSquad( ))) )
(pSoldier->bAssignment == VEHICLE && pSoldier->iVehicleId != iHelicopterVehicleId && GetSoldierStructureForVehicle( pSoldier->iVehicleId )->bAssignment == CurrentSquad( ))) )
{
//Need to keep a copy of a good soldier, so we can access it later, and
//not more than once.