Annotations and repository metadata

.clang-format

@@ -17,7 +17,6 @@ BraceWrapping:
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 EmptyLineBeforeAccessModifier: Always
-IncludeBlocks: Regroup
 IndentAccessModifiers: false
 IndentWidth: 4
 InsertBraces: true
@@ -32,6 +31,7 @@ QualifierOrder:
   - volatile
   - type
 RemoveSemicolon: true
+SortIncludes: Never
 SpaceAfterCStyleCast: true
 TabWidth: 4
 UseTab: ForContinuationAndIndentation

.gitattributes

@@ -1,7 +1,27 @@
-*.MD    text eol=lf diff=markdown
-*.cpp   text eol=lf diff=cpp
-*.h     text eol=lf diff=cpp
-*.py    text eol=lf diff=python
-*.html  text eol=lf diff=html
+*       text=auto eol=lf
+
+*.MD    diff=markdown
+*.cpp   diff=cpp
+*.h     diff=cpp
+*.py    diff=python
+*.html  diff=html
+
+# These historical inputs are intentionally stored with CRLF bytes.
+.editorconfig                         -text
+3rdparty/dx5/inc/d3dvec.inl          -text
+3rdparty/smartheap/SMRTHEAP.HPP      -text
+*.mak                                 -text
+
+*.ani   binary
+*.bmp   binary
+*.cur   binary
+*.DTA   binary
+*.GS    binary
+*.gsi   binary
+*.ico   binary
+*.lbw   binary
+*.lib   binary
+*.LIB   binary
 *.mdp   binary
-*.mak   text eol=crlf
+*.png   binary
+*.tex   binary

.gitignore

@@ -6,6 +6,7 @@ Release/
 /.vs
 /.vscode
 /.idea
+/.cache
 .env
 .venv
 env/
@@ -14,9 +15,10 @@ ENV/
 VENV/
 env.bak/
 venv.bak/
-/build/
+/build*
 /build_debug/
 /legobin/
+/legobin
 *.swp
 LEGO1PROGRESS.*
 ISLEPROGRESS.*

CONFIG/library_dx.h

@@ -0,0 +1,10 @@
+// DirectX library data (dxguid.lib) referenced by CONFIG
+
+// GLOBAL: CONFIG 0x4064e8
+// IID_IDirectDraw2
+
+// GLOBAL: CONFIG 0x406518
+// IID_IDirectDrawSurface3
+
+// GLOBAL: CONFIG 0x406848
+// IID_IDirect3D2

ISLE/library_msvc.h

@@ -1,4 +1,3 @@
-
 // For ISLE symbols only
 
 // aka `operator new`
@@ -321,6 +320,9 @@
 // GLOBAL: ISLE 0x410d98
 // ___small_block_heap
 
+// GLOBAL: ISLE 0x4115d0
+// __iob
+
 // GLOBAL: ISLE 0x411850
 // __cflush
 
@@ -330,6 +332,12 @@
 // GLOBAL: ISLE 0x41288c
 // ___unguarded_readlc_active
 
+// GLOBAL: ISLE 0x412890
+// ___piob
+
+// GLOBAL: ISLE 0x4138a0
+// __nstream
+
 // GLOBAL: ISLE 0x4138a4
 // __crtheap
 
@@ -339,8 +347,22 @@
 // GLOBAL: ISLE 0x4139b0
 // __nhandle
 
+// GLOBAL: ISLE 0x4139b4
+// ___onexitend
+
+// GLOBAL: ISLE 0x4139b8
+// ___onexitbegin
+
 // GLOBAL: ISLE 0x4139bc
 // __FPinit
 
 // GLOBAL: ISLE 0x4139c0
 // __acmdln
+
+/// Globals from libraries without symbols
+
+// STRING: ISLE 0x40f4a4
+// "\0"
+
+// STRING: ISLE 0x40f4a8
+// L"\0"

ISLE/library_smartheap.h

@@ -1,5 +1,3 @@
-
-
 // LIBRARY: ISLE 0x402f10
 // ?shi_New@@YAPAXKIPAU_SHI_Pool@@@Z
 
@@ -252,6 +250,9 @@
 // GLOBAL: ISLE 0x4102fc
 // _MemDefaultPool
 
+// GLOBAL: ISLE 0x410308
+// __shi_freeFns
+
 // GLOBAL: ISLE 0x41031c
 // __shi_compactPoolFn
 

LEGO1/lego/legoomni/include/act2actor.h

@@ -87,7 +87,7 @@ class Act2Actor : public LegoAnimActor {
 	LegoEntity* m_nextEntity;           // 0x4c
 };
 
-// TEMPLATE: LEGO1 0x100194f0
-// list<LegoBoundaryEdge,allocator<LegoBoundaryEdge> >::list<LegoBoundaryEdge,allocator<LegoBoundaryEdge> >
+// TEMPLATE: LEGO1 0x100194f0 SYMBOL
+// ??0?$list@ULegoBoundaryEdge@@V?$allocator@ULegoBoundaryEdge@@@@@@QAE@ABV?$allocator@ULegoBoundaryEdge@@@@@Z
 
 #endif // ACT2ACTOR_H

LEGO1/lego/legoomni/include/act3actors.h

@@ -178,14 +178,14 @@ class Act3Brickster : public Act3Actor {
 // FUNCTION: LEGO1 0x1003ff10
 // Act3Actor::`vbase destructor'
 
-// TEMPLATE: LEGO1 0x10042c20
-// list<Act3Ammo *,allocator<Act3Ammo *> >::~list<Act3Ammo *,allocator<Act3Ammo *> >
+// TEMPLATE: LEGO1 0x10042c20 SYMBOL
+// ??1?$list@PAVAct3Ammo@@V?$allocator@PAVAct3Ammo@@@@@@QAE@XZ
 
 // TEMPLATE: LEGO1 0x10042c90
 // List<Act3Ammo *>::~List<Act3Ammo *>
 
-// TEMPLATE: LEGO1 0x10042ee0
-// list<Act3Ammo *,allocator<Act3Ammo *> >::erase
+// TEMPLATE: LEGO1 0x10042ee0 SYMBOL
+// ?erase@?$list@PAVAct3Ammo@@V?$allocator@PAVAct3Ammo@@@@@@QAE?AViterator@1@V21@@Z
 
 // GLOBAL: LEGO1 0x100d7660
 // Act3Actor::`vbtable'

LEGO1/lego/legoomni/include/legoanimmmpresenter.h

@@ -2,9 +2,7 @@
 #define LEGOANIMMMPRESENTER_H
 
 // MxDSActionListCursor needs to be included before std::list
-// clang-format off
 #include "mxdsmultiaction.h"
-// clang-format on
 #include "mxcompositepresenter.h"
 
 class LegoAnimPresenter;

LEGO1/lego/legoomni/include/legocachesoundmanager.h

@@ -75,53 +75,53 @@ class LegoCacheSoundManager {
 // TODO: Function names subject to change.
 
 // clang-format off
-// TEMPLATE: LEGO1 0x10029c30
-// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::~_Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >
+// TEMPLATE: LEGO1 0x10029c30 SYMBOL
+// ??1?$_Tree@ULegoCacheSoundEntry@@U1@U_Kfn@?$set@ULegoCacheSoundEntry@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@QAE@XZ
 
-// TEMPLATE: LEGO1 0x10029d10
-// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::iterator::_Inc
+// TEMPLATE: LEGO1 0x10029d10 SYMBOL
+// ?_Inc@iterator@?$_Tree@ULegoCacheSoundEntry@@U1@U_Kfn@?$set@ULegoCacheSoundEntry@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@QAEXXZ
 
-// TEMPLATE: LEGO1 0x10029d50
-// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::erase
+// TEMPLATE: LEGO1 0x10029d50 SYMBOL
+// ?erase@?$_Tree@ULegoCacheSoundEntry@@U1@U_Kfn@?$set@ULegoCacheSoundEntry@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@QAE?AViterator@1@V21@@Z
 
-// TEMPLATE: LEGO1 0x1002a1b0
-// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Erase
+// TEMPLATE: LEGO1 0x1002a1b0 SYMBOL
+// ?_Erase@?$_Tree@ULegoCacheSoundEntry@@U1@U_Kfn@?$set@ULegoCacheSoundEntry@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@IAEXPAU_Node@1@@Z
 
-// TEMPLATE: LEGO1 0x1002a210
-// list<LegoCacheSoundEntry,allocator<LegoCacheSoundEntry> >::~list<LegoCacheSoundEntry,allocator<LegoCacheSoundEntry> >
+// TEMPLATE: LEGO1 0x1002a210 SYMBOL
+// ??1?$list@ULegoCacheSoundEntry@@V?$allocator@ULegoCacheSoundEntry@@@@@@QAE@XZ
 
-// TEMPLATE: LEGO1 0x1002a2a0
-// set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::~set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >
+// TEMPLATE: LEGO1 0x1002a2a0 SYMBOL
+// ??1?$set@ULegoCacheSoundEntry@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@QAE@XZ
 
 // TEMPLATE: LEGO1 0x1002a2f0
 // Set<LegoCacheSoundEntry,Set100d6b4cComparator>::~Set<LegoCacheSoundEntry,Set100d6b4cComparator>
 
 // TEMPLATE: LEGO1 0x1002a340
 // List<LegoCacheSoundEntry>::~List<LegoCacheSoundEntry>
 
-// TEMPLATE: LEGO1 0x1003dab0
-// list<LegoCacheSoundEntry,allocator<LegoCacheSoundEntry> >::_Buynode
+// TEMPLATE: LEGO1 0x1003dab0 SYMBOL
+// ?_Buynode@?$list@ULegoCacheSoundEntry@@V?$allocator@ULegoCacheSoundEntry@@@@@@IAEPAU_Node@1@PAU21@0@Z
 
-// TEMPLATE: LEGO1 0x1003d450
-// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::insert
+// TEMPLATE: LEGO1 0x1003d450 SYMBOL
+// ?insert@?$_Tree@ULegoCacheSoundEntry@@U1@U_Kfn@?$set@ULegoCacheSoundEntry@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@QAE?AU?$pair@Viterator@?$_Tree@ULegoCacheSoundEntry@@U
 
-// TEMPLATE: LEGO1 0x1003d6f0
-// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::iterator::_Dec
+// TEMPLATE: LEGO1 0x1003d6f0 SYMBOL
+// ?_Dec@iterator@?$_Tree@ULegoCacheSoundEntry@@U1@U_Kfn@?$set@ULegoCacheSoundEntry@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@QAEXXZ
 
-// TEMPLATE: LEGO1 0x1003d740
-// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Buynode
+// TEMPLATE: LEGO1 0x1003d740 SYMBOL
+// ?_Buynode@?$_Tree@ULegoCacheSoundEntry@@U1@U_Kfn@?$set@ULegoCacheSoundEntry@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@IAEPAU_Node@1@PAU21@W4_Redbl@1@@Z
 
-// TEMPLATE: LEGO1 0x1003d760
-// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Insert
+// TEMPLATE: LEGO1 0x1003d760 SYMBOL
+// ?_Insert@?$_Tree@ULegoCacheSoundEntry@@U1@U_Kfn@?$set@ULegoCacheSoundEntry@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@IAE?AViterator@1@PAU_Node@1@0ABULegoCacheSoundEntry@@
 
-// TEMPLATE: LEGO1 0x1003d9f0
-// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Lrotate
+// TEMPLATE: LEGO1 0x1003d9f0 SYMBOL
+// ?_Lrotate@?$_Tree@ULegoCacheSoundEntry@@U1@U_Kfn@?$set@ULegoCacheSoundEntry@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@IAEXPAU_Node@1@@Z
 
-// TEMPLATE: LEGO1 0x1003da50
-// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Rrotate
+// TEMPLATE: LEGO1 0x1003da50 SYMBOL
+// ?_Rrotate@?$_Tree@ULegoCacheSoundEntry@@U1@U_Kfn@?$set@ULegoCacheSoundEntry@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@USet100d6b4cComparator@@V?$allocator@ULegoCacheSoundEntry@@@@@@IAEXPAU_Node@1@@Z
 
 // GLOBAL: LEGO1 0x100f31cc
-// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry> >::_Nil
+// _Tree<LegoCacheSoundEntry,LegoCacheSoundEntry,set<LegoCacheSoundEntry,Set100d6b4cComparator,allocator<LegoCacheSoundEntry>>::_Kfn,Set100d6b4cComparator,allocator<LegoCacheSoundEntry>>::_Nil
 // clang-format on
 
 #endif // LEGOCACHESOUNDMANAGER_H

LEGO1/lego/legoomni/include/legoextraactor.h

@@ -90,11 +90,11 @@ class LegoExtraActor : public virtual LegoAnimActor {
 // GLOBAL: LEGO1 0x100d6bf0
 // LegoExtraActor::`vbtable'{for `LegoExtraActor'}
 
-// TEMPLATE: LEGO1 0x1002b200
-// vector<unsigned char *,allocator<unsigned char *> >::vector<unsigned char *,allocator<unsigned char *> >
+// TEMPLATE: LEGO1 0x1002b200 SYMBOL
+// ??0?$vector@PAEV?$allocator@PAE@@@@QAE@ABV0@@Z
 
-// TEMPLATE: LEGO1 0x1002b270
-// vector<unsigned char *,allocator<unsigned char *> >::size
+// TEMPLATE: LEGO1 0x1002b270 SYMBOL
+// ?size@?$vector@PAEV?$allocator@PAE@@@@QBEIXZ
 
 // TEMPLATE: LEGO1 0x1002b720
 // ?uninitialized_copy@@YAPAPAEPAPAE00@Z

LEGO1/lego/legoomni/include/legomain.h

@@ -152,17 +152,22 @@ class LegoOmni : public MxOmni {
 	// FUNCTION: BETA10 0x100e5400
 	LegoTextureContainer* GetTextureContainer() { return m_textureContainer; }
 
+	// FUNCTION: BETA10 0x100e5430
 	ViewLODListManager* GetViewLODListManager() { return m_viewLODListManager; }
 
 	// FUNCTION: BETA10 0x100969b0
 	LegoWorld* GetCurrentWorld() { return m_currentWorld; }
 
+	// FUNCTION: BETA10 0x100e5310
 	LegoNavController* GetNavController() { return m_navController; }
+
+	// FUNCTION: BETA10 0x100e5340
 	LegoPathActor* GetUserActor() { return m_userActor; }
 
 	// FUNCTION: BETA10 0x100e53a0
 	LegoPlantManager* GetPlantManager() { return m_plantManager; }
 
+	// FUNCTION: BETA10 0x100e52e0
 	LegoAnimationManager* GetAnimationManager() { return m_animationManager; }
 
 	// FUNCTION: BETA10 0x100e53d0
@@ -176,7 +181,11 @@ class LegoOmni : public MxOmni {
 
 	MxTransitionManager* GetTransitionManager() { return m_transitionManager; }
 	MxDSAction& GetCurrentAction() { return m_action; }
+
+	// FUNCTION: BETA10 0x100e5370
 	LegoCharacterManager* GetCharacterManager() { return m_characterManager; }
+
+	// FUNCTION: BETA10 0x100e5460
 	LegoWorldList* GetWorldList() { return m_worldList; }
 
 	void SetNavController(LegoNavController* p_navController) { m_navController = p_navController; }

LEGO1/lego/legoomni/include/legopathactor.h

@@ -225,14 +225,14 @@ class LegoPathActor : public LegoActor {
 // TEMPLATE: LEGO1 0x10018b70
 // List<LegoBoundaryEdge>::~List<LegoBoundaryEdge>
 
-// TEMPLATE: LEGO1 0x10018bc0
-// list<LegoBoundaryEdge,allocator<LegoBoundaryEdge> >::~list<LegoBoundaryEdge,allocator<LegoBoundaryEdge> >
+// TEMPLATE: LEGO1 0x10018bc0 SYMBOL
+// ??1?$list@ULegoBoundaryEdge@@V?$allocator@ULegoBoundaryEdge@@@@@@QAE@XZ
 
-// TEMPLATE: LEGO1 0x1002ef10
-// list<LegoPathBoundary *,allocator<LegoPathBoundary *> >::~list<LegoPathBoundary *,allocator<LegoPathBoundary *> >
+// TEMPLATE: LEGO1 0x1002ef10 SYMBOL
+// ??1?$list@PAVLegoPathBoundary@@V?$allocator@PAVLegoPathBoundary@@@@@@QAE@XZ
 
-// TEMPLATE: LEGO1 0x1002ef80
-// list<LegoPathBoundary *,allocator<LegoPathBoundary *> >::insert
+// TEMPLATE: LEGO1 0x1002ef80 SYMBOL
+// ?insert@?$list@PAVLegoPathBoundary@@V?$allocator@PAVLegoPathBoundary@@@@@@QAE?AViterator@1@V21@ABQAVLegoPathBoundary@@@Z
 
 // TEMPLATE: LEGO1 0x1002efd0
 // List<LegoPathBoundary *>::~List<LegoPathBoundary *>

LEGO1/lego/legoomni/src/actors/radio.cpp

@@ -102,6 +102,7 @@ MxLong Radio::Notify(MxParam& p_param)
 }
 
 // FUNCTION: LEGO1 0x1002ca70
+// FUNCTION: BETA10 0x100f1a76
 void Radio::Play()
 {
 	if (!m_state->IsActive()) {
@@ -123,6 +124,7 @@ void Radio::Play()
 }
 
 // FUNCTION: LEGO1 0x1002cb70
+// FUNCTION: BETA10 0x100f1c02
 void Radio::Stop()
 {
 	if (m_state->IsActive()) {

LEGO1/lego/legoomni/src/common/legoobjectfactory.cpp

@@ -5,7 +5,6 @@
 // but were included from one of the higher level classes. We should attempt
 // to reverse engineer the inclusion "graph" at some point. Until then, to maintain
 // correct order in the binary, we include them in the order we want here.
-// clang-format off
 #include "mxpresenter.h"
 #include "legoentity.h"
 #include "legopathactor.h"
@@ -29,7 +28,6 @@
 #include "pizzeria.h"
 #include "buildings.h"
 #include "jukebox.h"
-// clang-format on
 
 #include "act2actor.h"
 #include "act2brick.h"

LEGO1/lego/legoomni/src/entity/legoactor.cpp

@@ -120,6 +120,7 @@ void LegoActor::ParseAction(char* p_extra)
 }
 
 // FUNCTION: LEGO1 0x1002d660
+// FUNCTION: BETA10 0x1003d617
 const char* LegoActor::GetActorName(MxU8 p_id)
 {
 	return g_actorNames[p_id];

LEGO1/lego/legoomni/src/race/raceskel.cpp

@@ -16,6 +16,7 @@ RaceSkel::RaceSkel()
 }
 
 // FUNCTION: LEGO1 0x10071ad0
+// FUNCTION: BETA10 0x100f1333
 RaceSkel::~RaceSkel()
 {
 }