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

MERGED bugfixes from revision: 4966

Browse Source 
- Nullpointer check-fix (by tazpn)
o random null pointer check

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4978 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-02-29 00:57:48 +00:00
parent b95ae8b528
commit 9e84dc989e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/EditorMercs.cpp
+1 -1
View File
@@ -1657,7 +1657,7 @@ void IndicateSelectedMerc( INT16 sID )
} }
} }
//if we made it this far, then we have a new merc cursor indicator to draw. //if we made it this far, then we have a new merc cursor indicator to draw.
if( gpSelected->pSoldier ) if( gpSelected == NULL || gpSelected->pSoldier )
gsSelectedMercGridNo = gpSelected->pSoldier->sGridNo; gsSelectedMercGridNo = gpSelected->pSoldier->sGridNo;
else else
{ {