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

- Bugfix: When we get 2nd robot from Madlab, 2nd robot did not have a weapon

Browse Source 
o How you can get the 2nd robot
--> Do NOT dismiss the dead robot from the merc list, otherwise you will not get a 2nd robot
--> Give Madlab another video camera and another rifle
--> Wait one day and Madlab gives you another remote control
--> Go back to the sector where first robot was destroyed and now the robot is back. It will be placed on map edge, fully functional :)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4711 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-10-14 16:52:56 +00:00
parent 069f46d92f
commit b4f6c3e3ed
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Dialogue.cpp
+13 -2
View File
@@ -3074,6 +3074,14 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
SetFactFalse( FACT_MADLAB_HAS_GOOD_CAMERA ); SetFactFalse( FACT_MADLAB_HAS_GOOD_CAMERA );
pSoldier = FindSoldierByProfileID( MADLAB, FALSE ); pSoldier = FindSoldierByProfileID( MADLAB, FALSE );
pSoldier2 = FindSoldierByProfileID( ROBOT, FALSE ); pSoldier2 = FindSoldierByProfileID( ROBOT, FALSE );
// WANNE: If we get the 2nd (repaired) robot, first recruit, then give the robot the weapon from madlab
if (gubFact[FACT_ROBOT_READY_SECOND_TIME] == TRUE)
{
RecruitEPC( ROBOT );
}
// Give the robot the weapon, we gave madlab earlier
if ( pSoldier && pSoldier2 ) if ( pSoldier && pSoldier2 )
{ {
// Give weapon to robot // Give weapon to robot
@@ -3085,8 +3093,11 @@ void HandleNPCDoAction( UINT8 ubTargetNPC, UINT16 usActionCode, UINT8 ubQuoteNum
AutoPlaceObject( pSoldier2, &( pSoldier->inv[ bSlot ] ) , FALSE ); AutoPlaceObject( pSoldier2, &( pSoldier->inv[ bSlot ] ) , FALSE );
} }
} }
// Allow robot to be controlled by remote!
RecruitEPC( ROBOT ); // WANNE: This is out first robot. Recruit it AFTER we gave him the weapon!
if (gubFact[FACT_ROBOT_READY_SECOND_TIME] == FALSE)
RecruitEPC( ROBOT );
break; break;
case NPC_ACTION_READY_ROBOT: case NPC_ACTION_READY_ROBOT: