mirror of
https://github.com/1dot13/source.git
synced 2026-08-19 14:20:30 +02:00
Added: Ctrl+Shift+E now fill LBE items in sector with other items and places them in vehicles first.
Added: Right-Click on remove attachments button on sector inventory screen will not empty LBE items in sector Changed: SLAY_STAYS_FOREVER disables Slay's hourly chance to leave when unattended Added: SLAY_HOURLY_CHANCE_TO_LEAVE setting to Ja2_Options.ini Fixed: a bunch of array index out of bounds bugs Fixed: a bunch of typos in if contitions Fixed: BuildListFile() function loading items from index 1 instead 0 Added translation: Polish text for some map inventory screen items Added translation: English texts for new functionality for other language files Cleaned up some old TODOs git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8404 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -2925,7 +2925,7 @@ SOLDIERTYPE * FindSoldierByProfileID2( UINT8 ubProfileID, BOOLEAN fPlayerMercsOn
|
||||
|
||||
BOOLEAN FindSoldier( SOLDIERTYPE **ppSoldier, UINT16 usSoldierIndex, BOOLEAN fPlayerMercsOnly)
|
||||
{
|
||||
SOLDIERTYPE Menptr[ TOTAL_SOLDIERS ];
|
||||
//SOLDIERTYPE Menptr[ TOTAL_SOLDIERS ];
|
||||
|
||||
*ppSoldier = NULL;
|
||||
|
||||
@@ -12009,11 +12009,15 @@ static int l_SetStartMission(lua_State *L)
|
||||
|
||||
if ( idMission != -1 )
|
||||
{
|
||||
if ( gBriefingRoomData[idMission].CheckMission != MISSIONSTART || gBriefingRoomData[idMission].CheckMission != MISSIONEND || gBriefingRoomData[idMission].CheckMission == MISSIONNOSTARTED )
|
||||
{
|
||||
gBriefingRoomData[idMission].CheckMission = MISSIONSTART; //set start mission
|
||||
gBriefingRoomData[idMission].Hidden = TRUE; // set next mission
|
||||
}
|
||||
if (
|
||||
(gBriefingRoomData[idMission].CheckMission != MISSIONSTART)
|
||||
|| (gBriefingRoomData[idMission].CheckMission != MISSIONEND)
|
||||
|| (gBriefingRoomData[idMission].CheckMission == MISSIONNOSTARTED)
|
||||
)
|
||||
{
|
||||
gBriefingRoomData[idMission].CheckMission = MISSIONSTART; //set start mission
|
||||
gBriefingRoomData[idMission].Hidden = TRUE; // set next mission
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user