Develop

configs/TR2Main.json

@@ -31,6 +31,10 @@
         "   boots. It is used for alternative sound effects of Lara's steps.  ",
         "   The parameter can be true or false. Default value is false.       ",
         "                                                                     ",
+        " - 'bridgelightfix' is used to fix the drawbridge that create a      ",
+        "   dynamic light when triggered. (minisub is not affected)           ",
+        "   Default is true.                                                  ",
+        "                                                                     ",
         " - 'semitransparent' is used for semitransparency parameters.        ",
         "   It can contain: 'animtex', 'objects', 'statics', 'rooms'          ",
         "                                                                     ",
@@ -91,6 +95,7 @@
     "default": {
         "comment": "Default settings for all levels",
         "watercolor": "80FFFF",
+        "bridgelightfix": true,
         "semitransparent": {
             "animtex": "auto",
             "objects": [{

game/boat.h

@@ -27,9 +27,9 @@
 /*
  * Function list
  */
-//	0x0040CB10:		InitialiseBoat
+#define InitialiseBoat ((void(__cdecl*)(__int16)) 0x0040CB10)
 //	0x0040CB50:		BoatCheckGeton
-//	0x0040CCC0:		BoatCollision
+#define BoatCollision ((void(__cdecl*)(__int16,ITEM_INFO*,COLL_INFO*)) 0x0040CCC0)
 //	0x0040CE20:		TestWaterHeight
 //	0x0040CF20:		DoBoatShift
 
@@ -39,7 +39,7 @@ void __cdecl DoWakeEffect(ITEM_INFO *item); // 0x0040D0F0
 //	0x0040D2C0:		BoatDynamics
 //	0x0040D7A0:		BoatUserControl
 //	0x0040D930:		BoatAnimation
-//	0x0040DAA0:		BoatControl
+#define BoatControl ((void(__cdecl*)(__int16)) 0x0040DAA0)
 
 void __cdecl GondolaControl(__int16 itemID); // 0x0040E0D0
 

game/box.cpp

@@ -21,12 +21,100 @@
 
 #include "global/precompiled.h"
 #include "game/box.h"
+#include "3dsystem/phd_math.h"
 #include "game/control.h"
 #include "game/items.h"
 #include "game/lot.h"
 #include "game/missile.h"
+#include "specific/game.h"
 #include "global/vars.h"
 
+/*void __cdecl InitialiseCreature(__int16 itemID) {
+	ITEM_INFO *item = &Items[itemID];
+	item->pos.rotY += (GetRandomControl() - PHD_90) >> 1;
+	item->collidable = 1;
+	item->data = NULL;
+}
+
+BOOL __cdecl CreatureActive(__int16 itemID) {
+	ITEM_INFO *item = &Items[itemID];
+
+	if (CHK_ANY(item->status, ITEM_INVISIBLE)) {
+		BOOL isActive = EnableBaddieAI(itemID, FALSE);
+		if (isActive) {
+			item->status = ITEM_ACTIVE;
+			return TRUE;
+		}
+	}
+
+	return CHK_ANY(item->status, ITEM_ACTIVE);
+}
+
+void __cdecl CreatureAIInfo(ITEM_INFO *item, AI_INFO *ai) {
+	CREATURE_INFO *creature = (CREATURE_INFO*)item->data;
+	if (creature == NULL) {
+		return;
+	}
+
+	ITEM_INFO *enemy = NULL;
+	__int16 *zone = NULL;
+
+	switch (item->objectID) {
+	case ID_BANDIT1:
+	case ID_BANDIT2:
+		GetBaddieTarget(creature->item_num, 0);
+		break;
+	case ID_MONK1:
+	case ID_MONK2:
+		GetBaddieTarget(creature->item_num, 1);
+		break;
+	default:
+		creature->enemy = LaraItem;
+		break;
+	}
+
+	enemy = creature->enemy;
+	if (enemy == NULL) {
+		enemy = LaraItem;
+	}
+
+	if (creature->LOT.fly != 0) {
+		zone = FlyZones[FlipStatus];
+	} else {
+		zone = GroundZones[2 * (creature->LOT.step >> 8) + FlipStatus];
+	}
+
+	ROOM_INFO *roomSource = &RoomInfo[item->roomNumber];
+	item->boxNumber = roomSource->floor[((item->pos.z - roomSource->z) >> WALL_SHIFT) + roomSource->xSize * ((item->pos.x - roomSource->x) >> WALL_SHIFT)].box;
+	ai->zone_number = zone[item->boxNumber];
+
+	ROOM_INFO *roomTarget = &RoomInfo[enemy->roomNumber];
+	enemy->boxNumber = roomTarget->floor[((enemy->pos.z - roomTarget->z) >> WALL_SHIFT) + roomTarget->xSize * ((enemy->pos.x - roomTarget->x) >> WALL_SHIFT)].box;
+	ai->enemy_zone = zone[enemy->boxNumber];
+
+	if ( CHK_ANY(Boxes[enemy->boxNumber].overlapIndex, creature->LOT.block_mask) || creature->LOT.node[item->boxNumber].search_number == (creature->LOT.search_number | 0x8000) ) {
+		ai->enemy_zone |= 0x4000;
+	}
+
+	OBJECT_INFO *obj = &Objects[item->objectID];
+	int x = enemy->pos.x - ((obj->pivotLength * phd_cos(item->pos.rotY)) >> W2V_SHIFT) - item->pos.x;
+	int z = enemy->pos.z - ((obj->pivotLength * phd_sin(item->pos.rotY)) >> W2V_SHIFT) - item->pos.z;
+	int angle = phd_atan(z, x);
+	if (creature->enemy != NULL) {
+		ai->distance = SQR(x) + SQR(z);
+	} else {
+		ai->distance = 0x7FFFFFFF;
+	}
+	ai->angle = angle - item->pos.rotY;
+	ai->enemy_facing = angle - enemy->pos.rotY + PHD_180;
+	ai->ahead = angle > -PHD_90 && angle < PHD_90;
+	if (ai->ahead && enemy->hitPoints >= 0 && ABS(item->pos.y - enemy->pos.y) < 384) {
+		ai->bite = 1;
+	} else {
+		ai->bite = 0;
+	}
+}*/
+
 void __cdecl CreatureDie(__int16 itemID, BOOL explode) {
 	ITEM_INFO *item = &Items[itemID];
 	item->collidable = 0;
@@ -94,6 +182,73 @@ void __cdecl CreatureKill(ITEM_INFO *item, int killAnim, int killState, int lara
 	Camera.pos.roomNumber = LaraItem->roomNumber;
 }
 
+void __cdecl GetBaddieTarget(__int16 itemNum, int flags) {
+	ITEM_INFO *item = &Items[itemNum], *target = NULL, *bestItem = NULL;
+	CREATURE_INFO *creature = (CREATURE_INFO*)item->data, *creatureFound = NULL;
+	int bestDistance = 0x7FFFFFFF, distance = 0;
+	int x, y, z;
+
+	for (int i = 0; i < MAXIMUM_CREATURE_SLOTS; i++) {
+		creatureFound = &ActiveCreatures[i];
+		if (creatureFound->item_num == -1 || creatureFound->item_num == itemNum)
+			continue;
+		target = &Items[creatureFound->item_num];
+		switch (flags) {
+		case 1: // MONK
+			if (target->objectID != ID_BANDIT1 && target->objectID != ID_BANDIT2)
+				continue;
+			break;
+		case 0: // BANDIT (Mercenary)
+			if (target->objectID != ID_MONK1 && target->objectID != ID_MONK2)
+				continue;
+			break;
+		default:
+			continue;
+		}
+		x = (target->pos.x - item->pos.x) >> 6;
+		y = (target->pos.y - item->pos.y) >> 6;
+		z = (target->pos.z - item->pos.z) >> 6;
+		distance = SQR(z) + SQR(y) + SQR(x);
+		if (distance < bestDistance) {
+			bestItem = target;
+			bestDistance = distance;
+		}
+	}
+
+	if (bestItem == NULL) {
+		if (flags == 0 || MonksAttackLara) {
+			creature->enemy = LaraItem;
+		} else {
+			creature->enemy = NULL;
+		}
+		return;
+	}
+
+	if (flags == 0 || MonksAttackLara) {
+		x = (LaraItem->pos.x - item->pos.x) >> 6;
+		y = (LaraItem->pos.y - item->pos.y) >> 6;
+		z = (LaraItem->pos.z - item->pos.z) >> 6;
+		distance = SQR(z) + SQR(y) + SQR(x);
+		if (distance < bestDistance) {
+			bestItem = LaraItem;
+			bestDistance = distance;
+		}
+	}
+
+	target = creature->enemy;
+	if (target != NULL && target->status == ITEM_ACTIVE) {
+		x = (target->pos.x - item->pos.x) >> 6;
+		y = (target->pos.y - item->pos.y) >> 6;
+		z = (target->pos.z - item->pos.z) >> 6;
+		distance = SQR(z) + SQR(y) + SQR(x);
+		if (distance < (bestDistance + 0x400000)) {
+			creature->enemy = bestItem;
+		}
+	} else {
+		creature->enemy = bestItem;
+	}
+}
+
 /*
  * Inject function
  */
@@ -125,6 +280,5 @@ void Inject_Box() {
 //	INJECT(0x004100F0, CreatureVault);
 
 	INJECT(0x00410230, CreatureKill);
-
-//	INJECT(0x004103A0, GetBaddieTarget);
+	INJECT(0x004103A0, GetBaddieTarget);
 }

game/box.h

@@ -27,11 +27,10 @@
 /*
  * Function list
  */
-#define InitialiseCreature ((void(__cdecl*)(__int16)) 0x0040E190)
-
-//	0x0040E1C0:		CreatureActive
 
-#define CreatureAIInfo ((void(__cdecl*)(ITEM_INFO *, AI_INFO *)) 0x0040E210)
+#define InitialiseCreature ((void(__cdecl*)(__int16)) 0x0040E190)
+#define CreatureActive ((BOOL(__cdecl*)(__int16)) 0x0040E1C0)
+#define CreatureAIInfo ((void(__cdecl*)(ITEM_INFO*,AI_INFO*)) 0x0040E210)
 
 //	0x0040E470:		SearchLOT
 //	0x0040E670:		UpdateLOT
@@ -40,7 +39,7 @@
 //	0x0040E880:		EscapeBox
 //	0x0040E930:		ValidBox
 
-#define CreatureMood ((void(__cdecl*)(ITEM_INFO *, AI_INFO *, BOOL)) 0x0040E9E0)
+#define CreatureMood ((void(__cdecl*)(ITEM_INFO*, AI_INFO*, BOOL)) 0x0040E9E0)
 
 //	0x0040EE50:		CalculateTarget
 //	0x0040F2B0:		CreatureCreature
@@ -62,7 +61,7 @@ void __cdecl CreatureDie(__int16 itemID, BOOL explode); // 0x0040F440
 //	0x004100F0:		CreatureVault
 
 void __cdecl CreatureKill(ITEM_INFO *item, int killAnim, int killState, int laraKillState); // 0x00410230
-
-//	0x004103A0:		GetBaddieTarget
+// NOTE: 1 = Monk, 0 = Bandit
+void __cdecl GetBaddieTarget(__int16 itemNum, int flags); // 0x004103A0
 
 #endif // BOX_H_INCLUDED

game/cinema.cpp

@@ -51,6 +51,16 @@ int __cdecl StartCinematic(int levelID) {
 		return 2;
 	}
 
+	// NOTE: fix lara hair waving in air,
+	// Caused by the cheat fly mode being not reset when cutscene is played !
+	if (Lara.water_status == LWS_Cheat) {
+		Lara.water_status = LWS_AboveWater;
+		LaraItem->currentAnimState = AS_STOP;
+		LaraItem->goalAnimState = AS_STOP;
+		LaraItem->animNumber = 11;
+		LaraItem->frameNumber = Anims[LaraItem->animNumber].frameBase;
+	}
+
 	InitCinematicRooms();
 	InitialisePlayer1(Lara.item_number);
 	Camera.targetAngle = CineTargetAngle;