Commit graph

39 commits

Author SHA1 Message Date
hispidence
2353be1fc2 Fix assignment-addition operator of GAME_OBJECT_ID, thus fixing a stack overflow. The operator was calling itself... Silly me D: 2021-08-01 20:49:28 +01:00
hispidence
6e8886dadd Make the GAME_OBJECT_ID compound addition-assignment operator take references, as is the canonical implementation (and so we don't return a reference to a local, as cppcheck very correctly warned me about). 2021-07-24 14:10:16 +01:00
hispidence
53b971c033 Remove 'typedef' from enums and structs. This was required in C, but in C++ all it does is generate thousands of warnings. 2021-07-18 15:22:15 +01:00
hispidence
2dbaac0572 Add += operator and from_underlying function, because for some reason C++ doesn't like implicitly converting between an enum and its own underlying type.
These ONLY work for the type itself and its underlying type - this means the compiler will notify us if we try and use an int or long instead of a bool, and we can double check to make sure it is intended.
2021-07-11 16:50:29 +01:00
hispidence
af75b4f55d Make GAME_OBJECT_ID a short in its underlying type (since that's the type that's mostly used to refer to it) and remove typedef to make VC++ stop giving tons of warnings. 2021-07-11 13:07:50 +01:00
Trxye
55b517010d diary bs 2021-06-15 14:09:49 -05:00
MontyTRC89
00a5c93eb4 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-06-06 06:49:58 +02:00
MontyTRC89
b3f1f246e1 Partially fixed ID_GUIDE; Restored flipeffects processing; Fixed LARA_INFO struct for flipeffect 30 Lara location; 2021-06-06 06:49:49 +02:00
Trxye
61db16c17e implement waterskins 2021-06-05 15:27:19 -05:00
MontyTRC89
42ce51dd9e Fix merge conflicts 2021-05-21 05:38:20 +02:00
MontyTRC89
27776a9c12 Fixed baddy slot code; Added missing slots for inventory; 2021-05-21 05:32:34 +02:00
Trxye
d7fa758df7 fix inventory drawing; implement inventory in game code; 2021-05-20 14:19:11 -05:00
MontyTRC89
c707f533c8 Possibly fixed DoRayBox and GetTargetOnLOS for working like in original game; Fixed ID_TROOPS; 2021-05-07 06:06:30 +02:00
MontyTRC89
2fb28b84a3 Baddy 1 & 2 tested and fixed 2021-04-21 13:37:42 +02:00
MontyTRC89
0c52fd8e69 Tested, cleaned and fixed ID_SCORPION and ID_SMALL_SCORPION 2020-12-26 14:44:05 +01:00
asasas9500
10b99e0111 Fix bomb 2020-12-23 11:04:21 -03:00
MontyTRC89
55044709db Fixed ID_BAT (but see notes in tr4_bat.cpp) 2020-12-01 18:35:21 +01:00
MontyTRC89
6784cf2869 Fixed CreatureAnimation(); Improved ID_CROCODILE; 2020-11-29 06:56:37 +01:00
Woops
b212151874 fix TR1 torso, port centaur 2020-11-16 02:33:04 -06:00
Woops
a63aaf8305 bacon lara works now 2020-11-13 16:02:08 -06:00
asasas9500
543ec74272 Improve new floordata static functions; Rework bridges 2020-11-10 22:31:29 -03:00
asasas9500
c252205ca6 Add more bridge slots; Allow optional floor and ceiling overriding 2020-09-28 21:01:16 -03:00
asasas9500
0e6e42b619 Remove ControlXRayMachine(); Move bridges to generic objects folder; Merge bridges 2020-09-27 20:44:17 -03:00
Raildex
1dd79a0379 Added Sprite Sequences for Kayak Paddle 2020-09-22 08:24:36 +02:00
Woops
2f7b52c352 port train 2020-09-20 10:07:15 -05:00
Raildex
f1ed2241cc IDs for new Sprite Sequences 2020-09-14 20:42:08 +02:00
MontyTRC89
bc79021dcf Working on climbable pushables 2020-09-07 20:01:28 +02:00
MontyTRC89
3e3450a695 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main
# Conflicts:
#	TR5Main/TR5Main.vcxproj.filters
2020-09-01 20:37:04 +02:00
MontyTRC89
f923f514ec First ID_VON_CROY implementation; Added friendly to ITEM_INFO; 2020-08-29 09:39:10 +02:00
Woops
0cf06102ee implement 2020-08-28 12:05:25 -05:00
Woops
8855f60c9e implement 2020-08-25 18:14:18 -05:00
Woops
e4bf317ce8 better things 2020-08-24 18:01:12 -05:00
Woops
fece17e9da implement 2020-08-24 13:23:21 -05:00
Raildex
7e14b0843e Added Explosion Sprites and Drips 2020-06-15 19:59:08 +02:00
Raildex
538e015950 Added new SparkParticle 2020-06-15 16:36:52 +02:00
Raildex
8e06949b8a Added new TriggerGunSmokeParticle Function 2020-06-15 16:10:09 +02:00
Raildex
1861d92675 Added separate Fire Sprite Sequence 2020-06-15 14:53:42 +02:00
TokyoSU
2b2a58d44c Implemented Mutant and Locusts
- Added ItemNearTarget().
2020-06-10 21:38:25 +02:00
TokyoSU
977e338eb7 Implemented Big Rat (TR1) Template
- Fixed old object (added by me) missing from the lua script.
2020-06-08 13:51:44 +02:00
Renamed from TR5Main/Game/objectslist.h (Browse further)