Christian Semmler
fa126f77ce
Merge remote-tracking branch 'isle/master' into mergeisle7
2025-05-09 09:27:32 -07:00
Florian Kaiser
3811d61ea4
Rename c_bit5 to c_ctrl in LegoInputManager, change m_unk0x6c to m_isAccelerating and clear some local unknowns ( #1458 )
2025-05-09 07:40:00 -07:00
Florian Kaiser
711134b3b8
Replace m_unk0x04 and m_unk0x08 with m_modelDataLength and m_modelDataOffset ( #1456 )
2025-05-09 07:35:11 -07:00
Christian Semmler
44d131ad18
Merge from isledecomp/isle
2025-02-17 17:52:38 -07:00
jonschz
777dfa82ec
Match Infocenter::HandleControl ( #1386 )
...
* Add BETA10 references
* Refactor non-existent getters
* Infocenter::HandleControl maybe down to entropy
* Rename variable
* More refactoring
* Refactor public variable
* 100 %
* Fix clang-format
* Fix clang-format
---------
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
Co-authored-by: Christian Semmler <mail@csemmler.com>
2025-02-18 01:12:51 +01:00
jonschz
d88ab0a50a
Match Act2Brick::Create ( #1385 )
...
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
2025-02-15 16:47:55 +01:00
Christian Semmler
00dee618c0
Merge remote-tracking branch 'isle/master' into mergeisle
2025-01-22 16:34:28 -07:00
Christian Semmler
49cb120795
Order symbols until end of LegoOmni ( #1371 )
...
* Order
* Improve
* Move function
* Order until end of LegoOmni
* Remove header
2025-01-22 22:22:58 +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
5c57b805de
Fix regression in LegoWorld::Enable ( #1329 )
...
* Fix regression in `LegoWorld::Enable`
* Update legoworld.cpp
2025-01-11 11:39:27 -07:00
Christian Semmler
ab8a382a24
Merge remote-tracking branch 'isle/master' into isleupd2
2025-01-11 10:28:06 -07:00
Christian Semmler
33d8192d75
Implement/match LegoWorld::ActorExists ( #1330 )
2025-01-11 17:55:19 +01:00
MS
4d3481d2bd
LegoWorld::Add to 100% ( #1328 )
2025-01-11 10:51:02 -05:00
Christian Semmler
ee2bcb4d53
Order symbols in LegoWorld ( #1321 )
...
* Partially order `LegoWorld` symbols
* Further order `LegoWorld`
2025-01-10 01:31:45 +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
Anonymous Maarten
b97aea42d2
Use SDL_KeyCode in LEGO1.dll ( #51 )
...
* Pass SDL_Keycode in LEGO1.dll
* ISLE.EXE: use iniparser for getting isle.mediaPath
* Use SDL_isdigit instead of isdigit
* clang-format
* hdPath is a better default for mediaPath
* Replaced a stray 'A' with SDLK_A
* Use SDL_Keycode to store the ogel cheat code
2024-12-29 18:56:47 +01:00
Christian Semmler
b0a4d0e06b
Merge remote-tracking branch 'isle/master' into isle-merge3
2024-12-29 09:21:06 -07:00
Christian Semmler
d97ce96768
Use Windows virtual key macros for keys ( #1302 )
...
* Use Windows virtual key macros for keys
* Add `VK_OEM_MINUS`
* Fix missing key
* Name variable
2024-12-29 17:14:36 +01:00
Christian Semmler
9b96f3c338
Match LegoWorld::Find ( #1301 )
2024-12-28 21:17:03 +01:00
Christian Semmler
a97934e188
Match LegoNavController::ProcessKeyboardInput ( #1298 )
2024-12-28 18:30:07 +01:00
Christian Semmler
e4e8ad6da5
Match LegoWorld::Tickle ( #1297 )
2024-12-28 18:23:27 +01:00
Christian Semmler
63bfb95d80
Match LegoActor::SetROI ( #1295 )
2024-12-28 17:43:06 +01:00
Christian Semmler
7d90befd05
Merge remote-tracking branch 'isle/master' into merge-isle-2
2024-12-27 10:48:38 -07:00
Anonymous Maarten
65adfe7d64
More use of SDL ( #47 )
...
* Use SDL_GetPerformance(Counter|Frequency) in MxStopWatch
* Fix flic.h for gcc Linux compiler
* cmake: remove left-over message
* Replace some more stricmp with SDL_strcasecmp
* Pass SDL_Window* to LEGO1.DLL, and pass window events through SDL event handler
* clang-format
* Use SDL_Timer for unknown input dragging events
* Fix naming
---------
Co-authored-by: Christian Semmler <mail@csemmler.com>
2024-12-27 18:44:14 +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
Anonymous Maarten
b4d2ea72af
Fix -Wwrite-strings warnings ( #1267 )
...
warning: ISO C++ forbids converting a string constant to 'LegoChar*'
2024-12-23 17:11:38 -07:00
Christian Semmler
69bac21488
Merge remote-tracking branch 'isle/master' into merge
2024-12-23 09:38:55 -07:00
Christian Semmler
b03de35e30
Further accuracy improvement on LegoNavController::Notify ( #1255 )
...
* Further accuracy improvement on `LegoNavController::Notify`
* Use enum
2024-12-21 23:38:22 +01:00
Christian Semmler
a987533ba1
Fix a bug in LegoNavController, improve accuracy ( #1254 )
...
* Fix a bug in `LegoNavController`, improve accuracy
* Fix
2024-12-21 23:17:45 +01: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
Christian Semmler
bcc41256f8
Add LegoOmni::World enum ( #1252 )
2024-12-21 18:08:55 +01:00
Christian Semmler
e73f60e2c6
merge from isle/master
2024-12-20 11:54:06 -07: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
Ramen2X
4cd4b55ae7
replace directinput joystick APIs with SDL ( #41 )
2024-12-19 19:25:49 -05: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
cfa3769abf
Use macros for Seek modes ( #1235 )
...
* Use macros for `Seek` modes
* Fix syntax
* Use `OF_READ`
* Add names to skip.yml
* Revert "Add names to skip.yml"
This reverts commit 28b6f577dc0c47070064070f4655a15dab3bda25.
2024-12-16 22:13:52 +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
1bfeebd004
Implement most of LegoJetski, refactor ( #1214 )
...
* Implement most of `LegoJetski`, refactor
* Fix
2024-12-12 21:17:25 +01: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
jonschz
07def56326
Implement Act2Actor::VTable0x70 ( #1201 )
...
* Implement draft of `Act2Actor::VTable0x70`
* Fix CI errors
* Implement `Act2Actor::FUN_100199f0`
* WIP: cleanup
* Address review comments
* Run formatter
---------
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
2024-12-09 22:05:08 +01:00
Christian Semmler
1aff40dd94
Implement/match several functions in Act3, refactor ( #1197 )
...
* Implement/match several functions in Act3, refactor
* Fix naming
* Rename
* Add comment
* Add annotation
* Add BETA assert
2024-12-08 18:00:57 +01:00
Christian Semmler
94ce89cbaa
(Proposal) Introduce arithmetic operators to Vector2 ( #1193 )
2024-12-07 17:26:22 +01:00