Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-10 20:46:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement

Browse source
This commit is contained in:
Woops 2020-08-28 12:05:25 -05:00
parent 5a6d35fce6
commit 4c3a3cbbd1
6 changed files with 1080 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TR5Main/Game/lara.cpp
View file

@ -31,6 +31,7 @@
#include "upv.h" #include "upv.h"
#include "kayak.h" #include "kayak.h"
#include "minecart.h" #include "minecart.h"
//#include "rubberboat.h"
using std::function; using std::function;
@ -431,7 +432,7 @@ void LaraAboveWater(ITEM_INFO* item, COLL_INFO* coll)
// return; // return;
// break; // break;
//case ID_RUBBERBOAT: //case ID_RUBBER_BOAT:
// if (RubberBoatControl()) // if (RubberBoatControl())
// return; // return;
// break; // break;

1059
TR5Main/Objects/TR3/Vehicles/rubberboat.cpp
View file

File diff suppressed because it is too large Load diff

5
TR5Main/Objects/TR3/Vehicles/rubberboat.h
View file

@ -1 +1,6 @@
#pragma once #pragma once
void InitialiseRubberBoat(short itemNum);
void RubberBoatCollision(short itemNum, ITEM_INFO *lara, COLL_INFO *coll);
void RubberBoatControl(short itemNum);
void DrawRubberBoat(ITEM_INFO *item);

13
TR5Main/Objects/TR3/tr3_objects.cpp
View file

@ -372,6 +372,19 @@ static void StartVehicles(OBJECT_INFO* obj)
obj->saveFlags = true; obj->saveFlags = true;
} }
obj = &Objects[ID_RUBBER_BOAT];
if (obj->loaded)
{
obj->initialise = InitialiseRubberBoat;
obj->control = RubberBoatControl;
obj->collision = RubberBoatCollision;
obj->drawRoutine = DrawRubberBoat;
obj->savePosition = 1;
obj->saveFlags = 1;
obj->saveAnim = 1;
g_Level.Bones[obj->boneIndex + (1 * 4)] |= ROT_Z;
}
obj = &Objects[ID_KAYAK]; obj = &Objects[ID_KAYAK];
if (obj->loaded) if (obj->loaded)
{ {

2
TR5Main/Objects/objectslist.h
View file

@ -60,7 +60,7 @@ typedef enum GAME_OBJECT_ID
ID_MOTORBIKE_LARA_ANIMS, ID_MOTORBIKE_LARA_ANIMS,
ID_MOTORBIKE, ID_MOTORBIKE,
ID_RUBBER_BOAT_LARA_ANIMS, ID_RUBBER_BOAT_LARA_ANIMS,
ID_RUBBER_BOAT_BOAT, // TR3 / (TR4 TRNG) ID_RUBBER_BOAT, // TR3 / (TR4 TRNG)
ID_BIGGUN_ANIMS, ID_BIGGUN_ANIMS,
ID_BIGGUN, // TR3 ID_BIGGUN, // TR3

2
TR5Main/Scripting/GameLogicScript.cpp
View file

@ -76,7 +76,7 @@ GameScript::GameScript(sol::state* lua)
{"MOTORBIKE_LARA_ANIMS", ID_MOTORBIKE_LARA_ANIMS}, {"MOTORBIKE_LARA_ANIMS", ID_MOTORBIKE_LARA_ANIMS},
{"MOTORBIKE", ID_MOTORBIKE}, {"MOTORBIKE", ID_MOTORBIKE},
{"RUBBER_BOAT_LARA_ANIMS", ID_RUBBER_BOAT_LARA_ANIMS}, {"RUBBER_BOAT_LARA_ANIMS", ID_RUBBER_BOAT_LARA_ANIMS},
{"RUBBER_BOAT_BOAT", ID_RUBBER_BOAT_BOAT}, {"RUBBER_BOAT_BOAT", ID_RUBBER_BOAT},
{"VEHICLE_SMASHABLE_FLOOR", ID_VEHICLE_SMASHABLE_FLOOR}, {"VEHICLE_SMASHABLE_FLOOR", ID_VEHICLE_SMASHABLE_FLOOR},
{"VEHICLE_SMASHABLE_WALL", ID_VEHICLE_SMASHABLE_WALL}, {"VEHICLE_SMASHABLE_WALL", ID_VEHICLE_SMASHABLE_WALL},
{"WOLF", ID_WOLF}, {"WOLF", ID_WOLF},