Marco Antonio J. Costaandmajcosta 4ec012ce7b fix bug where combat doesn't end on team retreat ...

fixes issue #498 where retreating from combat in a sector that has a merc
inbound via the airdrop marker causes combat not to end

the reason this fails is that a the inbound soldier counts as being in
the sector being retreated from, even though he isn't

I add a check for `MercPtrs[i]->bInSector` so this doesn't happen

that way the function doesn't leave early and CheckForEndOfCombatMode is
reached

2025-09-11 22:00:32 -03:00

..

AI Viewer.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

ASD.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

ASD.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Assignments.cpp

Actually fix NOTIFY_IF_SLEEP_FAILS for multiple mercs selected

2025-08-24 07:39:00 -03:00

Assignments.h

get rid of unnecessary #defines

2025-09-05 20:31:11 -03:00

Auto Resolve.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Auto Resolve.h

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

Campaign Init.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Campaign Init.h

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

Campaign Types.h

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

CMakeLists.txt

New feature: transport groups (#172)

2023-07-04 20:58:56 -07:00

Creature Spreading.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Creature Spreading.h

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

Facilities.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Facilities.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Game Clock.cpp

Added Right Click to time compression to fast forward a single hour

2025-08-24 15:06:10 -03:00

Game Clock.h

Added Right Click to time compression to fast forward a single hour

2025-08-24 15:06:10 -03:00

Game Event Hook.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Game Event Hook.h

New feature: transport groups (#172)

2023-07-04 20:58:56 -07:00

Game Events.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Game Events.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Game Init.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Game Init.h

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

Hourly Update.cpp

Added Right Click to time compression to fast forward a single hour

2025-08-24 15:06:10 -03:00

Ja25 Strategic Ai.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Ja25 Strategic Ai.h

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

Luaglobal.cpp

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

Luaglobal.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

LuaInitNPCs.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

LuaInitNPCs.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Map Screen Helicopter.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Map Screen Helicopter.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Map Screen Interface Border.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Map Screen Interface Border.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Map Screen Interface Bottom.cpp

Added Right Click to time compression to fast forward a single hour

2025-08-24 15:06:10 -03:00

Map Screen Interface Bottom.h

make conditional CHINESE preprocessor def into global constant

2024-12-31 16:28:44 -03:00

Map Screen Interface Map Inventory.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Map Screen Interface Map Inventory.h

New Feature: gear templates allow us to save and load a merc's equipment, thereby speeding up the equipment process.

2017-08-06 21:06:49 +00:00

Map Screen Interface Map.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Map Screen Interface Map.h

Widescreen UI patch (by Asdow).

2021-11-21 12:56:27 +00:00

Map Screen Interface TownMine Info.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Map Screen Interface TownMine Info.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Map Screen Interface.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Map Screen Interface.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

MapScreen Quotes.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

MapScreen Quotes.h

MERGED source code from development trunk revision 4545 up to latest current revision 4882

2012-01-18 11:19:01 +00:00

mapscreen.cpp

Actually fix NOTIFY_IF_SLEEP_FAILS for multiple mercs selected

2025-08-24 07:39:00 -03:00

mapscreen.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Meanwhile.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Meanwhile.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Merc Contract.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Merc Contract.h

New Trait: Snitch (Trait 22) (by anv)

2014-01-01 12:02:23 +00:00

MilitiaIndividual.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

MilitiaIndividual.h

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

MilitiaSquads.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

MilitiaSquads.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

MiniEvents.cpp

More unused stuff removal (#49)

2023-01-03 15:51:48 +02:00

MiniEvents.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Player Command.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Player Command.h

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

PreBattle Interface.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

PreBattle Interface.h

Battle Panel Multi Resolution (#203)

2023-08-20 20:52:34 +03:00

Queen Command.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Queen Command.h

added new option in Skills_Settings.ini: [Covert Ops] COVERT_TURNCOATS_ACTIVATE_IN_AUTORESOLVE

2022-04-14 06:50:44 +00:00

Quest Debug System.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Quest Debug System.h

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

Quests.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Quests.h

Prisoner feature bugfix (#110)

2023-01-22 23:35:08 +02:00

QuestText.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Rebel Command.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Rebel Command.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Reinforcement.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Reinforcement.h

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

Scheduling.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Scheduling.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Strategic AI.cpp

fully externalize bQueenLosingControlOfSector

2025-09-02 20:01:47 -03:00

Strategic AI.h

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

Strategic Event Handler.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Strategic Event Handler.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Strategic Merc Handler.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Strategic Merc Handler.h

MERGED source code from development trunk revision 4545 up to latest current revision 4882

2012-01-18 11:19:01 +00:00

Strategic Mines LUA.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Strategic Mines LUA.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Strategic Mines.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Strategic Mines.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Strategic Movement Costs.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Strategic Movement.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Strategic Movement.h

New feature: transport groups (#172)

2023-07-04 20:58:56 -07:00

Strategic Pathing.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Strategic Pathing.h

Fix: incorrect path rebuilding in RebuildWayPointsForGroupPath(), incorrect GroupAtFinalDestination() detection (by sun_alf)

2022-03-26 21:00:13 +00:00

Strategic Status.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Strategic Status.h

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

Strategic Town Loyalty.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Strategic Town Loyalty.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

strategic town reputation.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

strategic town reputation.h

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

Strategic Transport Groups.cpp

Convert INVTYPE boolean fields to flagmask (#325)

2024-08-22 08:48:29 +03:00

Strategic Transport Groups.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Strategic Turns.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Strategic Turns.h

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

strategic.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

strategic.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

strategicmap.cpp

fix bug where combat doesn't end on team retreat

2025-09-11 22:00:32 -03:00

strategicmap.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Town Militia.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

Town Militia.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

UndergroundInit.cpp

Provide MAX_TACTICAL_ENEMIES to lua

2024-12-24 00:16:09 +02:00

UndergroundInit.h

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

XML_Army.cpp

More unused stuff removal (#49)

2023-01-03 15:51:48 +02:00

XML_Bloodcats.cpp

More unused stuff removal (#49)

2023-01-03 15:51:48 +02:00

XML_CoolnessBySector.cpp

More unused stuff removal (#49)

2023-01-03 15:51:48 +02:00

XML_Creatures.cpp

add newline at end of file where it's lacking

2024-12-14 19:05:48 -03:00

XML_ExtraItems.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

XML_Facilities.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

XML_FacilityTypes.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

XML_Minerals.cpp

More unused stuff removal (#49)

2023-01-03 15:51:48 +02:00

XML_SectorNames.cpp

More unused stuff removal (#49)

2023-01-03 15:51:48 +02:00

XML_SquadNames.cpp

Fixes Upper/Lower Casing for include paths (#487)

2025-08-16 22:01:12 -03:00

XML_UniformColors.cpp

More unused stuff removal (#49)

2023-01-03 15:51:48 +02:00