Christian Semmler
00dee618c0
Merge remote-tracking branch 'isle/master' into mergeisle
2025-01-22 16:34:28 -07:00
Christian Semmler
fc03e7a682
Improve order until legomain.cpp ( #1350 )
...
* Fix `LegoBackgroundColor` order
* Order
* Improve order in Act3Actors
* Improve order
* Add BETA annotation
* Order more
* More order
* More order
* Order
* Match/order
* Remove blank line
* Modern compiler fix
* vtable annotation
2025-01-17 18:33:27 -07:00
Christian Semmler
e1ce96c473
Order symbols until end of LegoGameState ( #1340 )
...
* Order `Ambulance`
* More ordering
* Order until `LegoGameState`
* Move
2025-01-17 03:42:38 +01:00
Christian Semmler
70b0f76fa1
Move Read/Write functions to LegoStorage base class, match Act1State::Serialize ( #1335 )
...
* Move Read/Write function to LegoStorage base class
* Proper const use for vector / BETA match
* Match `Act1State::Serialize`
2025-01-17 00:13:23 +01:00
Christian Semmler
83fb9f04a7
Merge remote-tracking branch 'isle/master'
2025-01-15 16:53:43 -07:00
Christian Semmler
77a3dc0795
Match Serialize functions to BETA10 ( #1334 )
...
* Begin refactor Serialize functions
* Match more Serialize functions
* Match `LegoVehicleBuildState::Serialize`
* Match `LegoGameState::Username::Serialize`
* Match `LegoGameState::ScoreItem::Serialize`
* Match `LegoGameState::History::Serialize`
* Var name
* Var name
* Revert "Var name"
This reverts commit 1c0cccfba799450cfe4f75566dc1f32db1c76a6b.
* Add other Serialize implementations
* Add remaining Serialize implementations
* Add Read for char*
* Improvements
2025-01-16 00:52:29 +01:00
Christian Semmler
ab8a382a24
Merge remote-tracking branch 'isle/master' into isleupd2
2025-01-11 10:28:06 -07:00
Christian Semmler
ac3a551bcc
Improve symbol order until LegoActor, match LegoPlantManager::ScheduleAnimation ( #1327 )
...
* Order `LegoCarBuild`, `LegoPlantManager`
* Order until `LegoActor`
2025-01-11 01:42:03 +01:00
Christian Semmler
5cd365c4f1
Order until the end of LegoAnimActor ( #1319 )
2025-01-09 01:28:43 +01:00
Christian Semmler
a31900a6d4
Merge remote-tracking branch 'isle/master' into isleupd
2025-01-06 16:15:16 -07:00
Christian Semmler
4c32abd16d
Add BETA10 macro to enable conditional compilation for BETA10 targets ( #1270 )
...
* Add BETA10 macro to enable conditional compilation for BETA10 targets
* Adjustments to CMakeLists.txt
2025-01-07 00:06:07 +01:00
Christian Semmler
7c452e9453
Order functions in binary up to end of Act2Actor ( #1312 )
...
* Order more functions
* Order LegoRaceActor
* Further ordering
* Order `Act2Actor`
* Fix
2025-01-05 21:00:50 +01:00
Christian Semmler
c54805fde8
Order functions in binary up to the end of Helicopter; refactor vector/matrix classes ( #1309 )
...
* Order experimentation
* Revert IslePathActor
* Fix order
* Fix inlining
* Fixes
* WIP
* WIP
* Refactor
* Refactor
* Fix operators
* Remove obsolete inline keyword
* Fix ctors
* Refactor
* Rename files
* Refactor
* Remove empty line
2025-01-04 15:07:04 -07:00
Christian Semmler
10d318a5de
Fix inlining in Helicopter::FUN_100042a0 ( #1307 )
2025-01-01 21:09:18 +01:00
Christian Semmler
7d90befd05
Merge remote-tracking branch 'isle/master' into merge-isle-2
2024-12-27 10:48:38 -07:00
Christian Semmler
667ea3ff82
Various matches with BETA functions ( #1281 )
...
* Match functions to BETA
* Improve `Matrix4::FromQuaternion`
* Improve `Matrix4::ToQuaternion` match
* Fix bug that was fixed in retail
* Match `Vector4::NormalizeQuaternion`
2024-12-25 22:05:28 +01:00
jonschz
70baf8cecc
Fix float constants and conversions ( #1279 )
...
* Fix legoplants warnings, add BETA10 references
* Fix warnings in various header files, improve match
* Fix floats in legoactors.cpp
* Fix `legolocations.cpp`
* fix typo
---------
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
2024-12-25 21:01:00 +01:00
Christian Semmler
6b3fcafbe1
Match Helicopter::HandleEndAnim ( #1276 )
2024-12-25 18:39:51 +01:00
Christian Semmler
e54bfb5656
Merge remote-tracking branch 'isle/master' into isle-merge
2024-12-25 08:56:17 -07:00
Anonymous Maarten
bb4db6caac
Use SDL3 functions in more locations ( #44 )
...
* Use strcasecmp, strncasecmp, strlwr, strupr and itoa from SDL
* Use SDL_GetTicks instead of timeGetTime
* Use MxDSFile::OPEN_READ instead of OF_READ
* Use SDL_IOStream to read bitmaps
* Use SDL_LogXXX instead of OutputDebugString
* Undo mxvideoparam.h change
* Revert "Undo mxvideoparam.h change"
This reverts commit 4a20cf6c46 .
* Fix _MxTrace
* Reapply "Undo mxvideoparam.h change"
This reverts commit b3a09dc520 .
* fix _MxTrace
* Use __declspec(dllexport) for exporting symbols from dll
Refactored CMake script such that all objects are passed to the lego1 library.
* clang-format
* fix msvc build
* MSVC fixed for real now?
* Forgot about d3drm_guid
* Fix naming issue
* Use Uint64 in LegoCarBuild::Tickle for dTime
2024-12-24 18:04:46 -07:00
Christian Semmler
c2c9c75f1a
Fix Vector2/Vector3 order ( #1272 )
...
* Fix Vector2/Vector3 order
* Refactor vector classes to be const and reference param consistent
* Add BETA10 annotations and fixes
2024-12-24 22:21:26 +01:00
Christian Semmler
7c41ff4569
Order compilation units according to retail, match and align Score class ( #1271 )
...
* Initial changes for ordering, Score
* Add mxdebug
* Match `Score::Paint`
* Refactor
* Add BETA asserts
* BETA match
2024-12-24 19:38:15 +01:00
Joshua Peisach
bb29d289fe
SkateBoard: name m_unk0x160 -> m_pizzaVisible ( #1269 )
2024-12-24 07:50:37 -07:00
Christian Semmler
69bac21488
Merge remote-tracking branch 'isle/master' into merge
2024-12-23 09:38:55 -07:00
jonschz
3e6d789324
Add all BETA10 ClassName() functions and vtables ( #1258 )
...
* Add all BETA10 `ClassName()` functions and vtables
* Run formatter, fix copy error
* Fix copy error
* Add BETA10 library functions
---------
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
2024-12-22 08:13:34 -07:00
Christian Semmler
fe2a65c8da
Implement/match LegoNavController::Notify ( #1253 )
...
* Implement/match `LegoNavController::Notify`
* Move function
* Add to total function count
* Add OPT:REF to lego1
2024-12-21 22:41:47 +01:00
jonschz
3e427ab03e
Improve Helicopter::Animate() ( #1251 )
...
* Small improvements
* More improvements
* Small drive-by refactor
* Do not inline `UnknownMx4DPointFloat::FUN_10004520()`
* Fix `Act3Brickster::Animate`
* Fixes
---------
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
Co-authored-by: Christian Semmler <mail@csemmler.com>
2024-12-21 17:21:22 +01:00
Christian Semmler
e73f60e2c6
merge from isle/master
2024-12-20 11:54:06 -07:00
Christian Semmler
2b4f71e17d
Implement/match Act3Cop::FUN_10040360 ( #1247 )
...
* Implement/match `Act3Cop::FUN_10040360`
* Remove comments
* Modern compiler fix
2024-12-20 19:49:18 +01:00
jonschz
7ed2ac9ccc
Progress on Helicopter::FUN_100042a0 ( #1242 )
...
* Implement `LegoCameraController::FUN_100123b0`
* Improve `UnknownMx4DPointFloat::Unknown7` match, add BETA10
* Add draft for `FUN_100042a0`
* Improve match
* Match
* Use better naming
* Remove comments
---------
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
Co-authored-by: Christian Semmler <mail@csemmler.com>
2024-12-20 01:27:14 +01:00
Christian Semmler
cb38cf7673
Implement/match Act3Brickster::FUN_100417c0 ( #1240 )
...
* Implement/match `Act3Brickster::FUN_100417c0`
* Move function
* Rename var
* Revert "Rename var"
This reverts commit c9ca75ae7f1d894f976ce6d383d5b4d13ead99a5.
2024-12-19 20:22:34 +01:00
Christian Semmler
90c687bde0
Implement/match Act3Brickster::FUN_10042300 ( #1238 )
...
* Implement/match `Act3Brickster::FUN_10042300`
* Add comment about assignment operator
* Add another comment
* Fix
* add back BETA annotation
2024-12-17 23:16:00 +01:00
Christian Semmler
66e3c9a2e1
Implement/match Act3Brickster::Animate ( #1237 )
...
* Implement/match `Act3Brickster::Animate`
* Improve loop
2024-12-17 19:11:47 +01:00
Christian Semmler
f51b1867ee
Use SDL3 for filesystem access ( #36 )
...
* Use SDL IOStream in for MXIOINFO
* Use SDL IOStream for WDB file
* Use SDL IOStream for LegoStorage
* Update README.md
* Fixes
* Add names to skip.yml
* Add #include <stdio.h> where necessary
2024-12-16 22:25:52 +01:00
Christian Semmler
615c3a5047
Implement/match Act3Cop::Animate ( #1233 )
...
* Implement/match `Act3Cop::Animate`
* Fix
2024-12-15 19:48:47 +01:00
jonschz
2e7f2edbf1
Implement/match Act3Cop::ParseAction ( #1230 )
...
* Implement/match `Act3Cop::ParseAction`
* Fix formatting
* Address review comment
---------
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
2024-12-15 18:09:29 +01:00
Christian Semmler
661c76c6e0
Implement/match Act3Shark::Animate ( #1231 )
...
* Implement/match `Act3Shark::Animate`
* Add BETA annotation
* Raise max functions
* Mark as FUNCTION
2024-12-15 17:18:25 +01:00
jonschz
ace2a9f047
Add g_copDest ( #1229 )
...
* Implement `AddCop` and `g_copDest`
* Fix formatting
---------
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
2024-12-15 05:50:52 -07:00
Christian Semmler
16730ef9c1
Implement/match Act3Ammo::FUN_10053db0 ( #1227 )
2024-12-14 21:36:14 +01:00
Christian Semmler
67b4553eaa
Implement/match LegoPathController::FUN_1004a380 ( #1226 )
2024-12-14 20:02:48 +01:00
jonschz
5a6415e0cf
Implement/match Act2Actor::FUN_10019b90 ( #1222 )
...
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
2024-12-13 16:19:55 -07:00
Christian Semmler
1aeb458be1
Implement/match Act3Ammo::Animate ( #1221 )
...
* Implement/match `Act3Ammo::Animate`
* Match
* Rename
* Rename
* Rename
2024-12-13 22:56:26 +01:00
Christian Semmler
6da2faa48c
Refactor actor states, define enum ( #1220 )
...
* Refactor actor states, define enum
* Revert
* Rename `UpdateState` to `Animate`
2024-12-13 20:30:50 +01:00
Christian Semmler
ce3f71ea0f
Rename LegoPathActor::VTable0x70 to UpdateState ( #1219 )
2024-12-13 19:20:03 +01:00
Christian Semmler
263d7d1e4f
Implement/match Act3::GoodEnding ( #1218 )
2024-12-13 18:49:45 +01:00
Christian Semmler
de7bc813ca
Implement/match LegoAct2::BadEnding ( #1217 )
...
* Implement/match `LegoAct2::BadEnding`
* Name some vars
2024-12-13 17:26:06 +01:00
Christian Semmler
32392a8e55
Fix Act2Actor::FUN_10019700 ( #1216 )
2024-12-13 17:12:53 +01:00
jonschz
054f56fd9f
Implement Act2Actor::FUN_10019700 ( #1215 )
...
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
2024-12-12 17:54:51 -07:00
Christian Semmler
aceba71fbb
Implement/match Act3Brickster::HitActor ( #1212 )
...
* Implement/match `Act3Brickster::HitActor`
* Fixes
* Fixes
* Fixes
* Add `Act3Cop::VTable0x9c`
* Fix
2024-12-12 17:10:44 +01:00
Christian Semmler
fe57a94416
Implement/match Act3Brickster::ParseAction ( #1211 )
2024-12-12 16:06:15 +01:00