Commit graph

59 commits

Author SHA1 Message Date
Lwmte
ba6c260b92 Further code organizing 2021-09-08 18:19:06 +03:00
Lwmte
9f60b228a7 Manually fix merge conflicts 2021-08-28 21:43:47 +03:00
MontyTRC89
d0da243f73 Refactored switches 2021-08-28 06:37:22 +02:00
MontyTRC89
82898fe37b Refactoring switches; Moved crowbar switch and underwater switches to separated files; 2021-08-26 05:46:10 +02:00
MontyTRC89
a12247a287 Refactoring switches; Fixed ID_JUMP_SWITCH and ID_LEVER_SWITCH; 2021-08-25 09:42:17 +02:00
MontyTRC89
5129f0e064 Fixed ID_COG_SWITCH 2021-08-25 08:16:35 +02:00
MontyTRC89
a4467c2a4b Moving to stringed keys for game strings 2021-06-19 07:11:22 +02:00
MontyTRC89
4baeab5ab9 Potentially fixed ID_PULLEY 2021-06-08 06:32:51 +02:00
MontyTRC89
6ed2dfd28d Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 05:33:17 +02:00
Trxye
c0ca04a806 clean up ring inventory code; fix KillItem(); 2021-05-26 01:58:30 -05:00
MontyTRC89
b2f102ae63 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
Trxye
d7fa758df7 fix inventory drawing; implement inventory in game code; 2021-05-20 14:19:11 -05:00
KrysB4k
735e73f1ea Removed duplicate function GetFloorAndTestTriggers, fix pushblock issues
GetFloorAndItemTriggers() was removed in favor of TestTriggersAtXYZ() from switch.cpp, which does the same. All calls to GetFloorAndItemTriggers were replaced with TestTriggersAtXYZ.

Pushables pulling bug was fixed in TestBlockPull(). PushableBlockControl() now calls ItemNewRoom() to signal change of room membership of pushable.
2020-12-19 23:02:55 +01:00
Woops
47fc1ecb13 remove bitshifts 2020-10-16 12:06:33 -05:00
asasas9500
7218086a0f Fix phd_sin() and phd_cos() 2020-10-05 22:24:57 -03:00
Woops
6ada970725 Lara refactor: lara_cheat, move the rest of the functions out of laramisc.cpp and delete it. fix includes. 2020-08-16 16:01:58 -05:00
MontyTRC89
490d6c8da2 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-08-06 20:41:46 +02:00
MontyTRC89
d235b53094 Decompiled ID_SAS_DRAG_BLOKE and ID_SAS_DYING; 2020-08-06 20:41:07 +02:00
Woops
b1efaf61eb clean up remove comments 2020-08-06 03:34:49 -05:00
Sezz
5d4dc8ffdd Updated animation and state names to follow a consistent system. 2020-08-04 20:32:07 +10:00
MontyTRC89
689ec226e7 Frames refactoring 2020-07-25 18:02:35 +02:00
MontyTRC89
83bba01a99 Moving all globals of level under LEVEL struct; Fixed severe performance issue; 2020-07-21 09:56:47 +02:00
MontyTRC89
9867a6d24c Pathfinding refactoring 2020-07-11 21:16:04 +02:00
MontyTRC89
36fe66d617 Hairs done on GPU now 2020-07-07 07:32:33 +02:00
Raildex
d2d6e5f30c Made g_Inventory a constant object.
Fixed shadow intensity
Fixed CameraViewConstantBuffer
2020-06-16 19:45:06 +02:00
Woops
d5b8760aa4 fix stupid gliding issue 2020-06-15 12:29:30 -05:00
Woops
f7d1739ac7 fix hang if no door is triggered for cogswitch 2020-06-14 02:42:12 -05:00
Woops
f92093541f Fix cogwheel ungrab being skipped 2020-06-13 14:51:13 -05:00
TokyoSU
900235c967 Implemented Baboon
- Fixed AIObject not being initialized !
- Fixed ITEM_DEACTIVATED (cause im french and ITEM_DESACTIVATED is more appropriate)
2020-06-04 12:49:08 +02:00
TokyoSU
0ccf99dcd4 Finished Moving Function
- Moved Some Function to here respective file (new cpp/h).
- Changed effect_routines to function<void(ITEM_INFO*)>.
- Fixed ActivateCamera() not using ITEM_INFO* Argument for effect_routines[].
- Fixed ActivateKey() not using ITEM_INFO* Argument for effect_routines[].
- Fixed ActivateKey() and ActivateCamera() being defined 2 time.
- Commented the new level loader, for later.
2020-06-04 11:00:08 +02:00
TokyoSU
b615a98c46 (Broken) Deleted Global Folder
- No more enums.h, constants.h, macro.h, etc...
- moved all structure in types.h to there respective file.
2020-05-30 15:55:23 +02:00
TokyoSU
cd1d5f5482 Refactor include and moving some structure to right file
- started moving structure out of types.h.
- fixed ExtraAnim using 0 instead of -1.
- changed void(*)(); to function<> for lara routines.
- changed short(*)() effect to function<> for CreatureEffect/CreatureEffect2.
- renamed guardian to laserhead.
- moved some structure to their right place.
- renamed TYPE_ZONE to ZoneTypeEnum.
- fixed zoneType not using ZoneTypeEnum as variable.
- fixed LOT.zone not using ZoneEnumType.
- changed "variable : 1" to bool in some structure.
- implemented @krys new collision structure and improved it a bit (but commented for "later")
- level need #pragma pack(push, 1) #pragma pack(pop) to work (for structure), else it crash at LoadTexturesInfos().

Co-Authored-By: krys <krys@users.noreply.github.com>
2020-05-28 15:17:34 +02:00
TokyoSU
29f0724693 New project format (#206)
* Starting Reformat the project

- New Import Method, no more "../../" in import,
- New Entity Folder Structure, less compile time

* Refactoring the Project

- added precompiled header with default import like microsoft or directx.
- fix many double import.
- fix math.h confliting math.h from
microsoft.
- fix effects.h confliting Effects.h from DirectX.
- refactored TR4 entity folder and how it's loaded.

* Update Some Code Before Switching to Master

* Finished the NewProjectFormat Template

- need to finish entity in the master later.

* Added Monty NewFileFormat

* Fixed Monty NewFileFormat Include

* Revert "Fixed Monty NewFileFormat Include"

This reverts commit ebf0afca10.

* Trying to fix conflits for NewFileFormat

* Fixed .filters

* Last Commit in NewProjectFormat
2020-05-27 09:21:20 +02:00
MontyTRC89
5f63d6acba Merged LARA_INFO and LaraExtraInfo into LaraInfo 2020-04-27 14:01:00 +02:00
MontyTRC89
4d219d43cd Refactored math code and spheres 2020-04-27 06:33:42 +02:00
MontyTRC89
6b819c2855 Started math refactoring 2020-04-25 16:23:53 +02:00
MontyTRC89
f3bb956927 First EXE build successfully 2020-04-24 19:15:05 +02:00
MontyTRC89
6bff6caed2 Decompiled input 2020-04-23 19:22:01 +02:00
MontyTRC89
9a78144600 Decompiled level loading functions; Moved lot of vars in DLL; Added Zlib; 2020-04-22 14:12:10 +02:00
MontyTRC89
30997878af Moved many camera vars in DLL 2020-04-12 07:08:22 +02:00
MontyTRC89
c7e221495c Fixed LEVER_SWITCH 2020-04-07 21:55:05 +02:00
MontyTRC89
0f5589c72f Refactored some code in TestTriggers; Fixed CROWDOVE_SWITCH; 2020-04-07 19:20:32 +02:00
MontyTRC89
3cabd868ba Refactoring 1 2020-04-01 13:09:14 +02:00
MontyTRC89
48e25d6a8c Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-01-12 08:12:58 +01:00
MontyTRC89
3fef37ee4a Fixed AiPickupCollision; Fixed setup flags of many objects; Fixed item savegames; Refactored inventory; Added InitialseShootSwitch; 2020-01-12 08:02:48 +01:00
asasas9500
618bf6032e Fix shoot switches again 2020-01-11 12:59:57 -03:00
MontyTRC89
30e5dc3da7 Inventory refactoring 2020-01-10 08:02:16 +01:00
asasas9500
3895ac3f66 Fix shoot switches 2020-01-08 16:09:37 -03:00
MontyTRC89
abd8c60491 Decompiled ID_TWOBLOCKS_PLATFORM and ID_RAISING_COG 2020-01-07 15:22:13 +01:00
MontyTRC89
18dcfa8053 Added TestLaraSlide, UpdateLaraRoom, TranslateItem, AnimateLara; Fixed partially pistols; 2019-12-04 18:51:23 +01:00