Merge branch 'master' of https://github.com/isledecomp/isle into renaming

.clang-format

@@ -19,6 +19,7 @@ ContinuationIndentWidth: 4
 IncludeBlocks: Regroup
 IndentAccessModifiers: false
 IndentWidth: 4
+InsertNewlineAtEOF: true
 PointerAlignment: Left
 SpaceAfterCStyleCast: true
 TabWidth: 4

CONTRIBUTING.md

@@ -25,7 +25,12 @@ This repository currently has only one goal: accuracy to the original executable
 
 In general, we're not exhaustively strict about coding style, but there are some preferable guidelines to follow that have been adopted from what we know about the original codebase:
 
-- Indent: 2 spaces
+### Formatting
+
+We are currently using [clang-format](https://clang.llvm.org/docs/ClangFormat.html) with a configuration file that aims to replicate the code formatting employed by the original developers. There are [integrations](https://clang.llvm.org/docs/ClangFormat.html#vim-integration) available for most editors and IDEs. The required `clang-format` version is `17.x`.
+
+### Naming conventions
+
 - `PascalCase` for classes, function names, and enumerations.
 - `m_camelCase` for member variables.
 - `g_camelCase` for global variables.

LEGO1/ambulance.cpp

@@ -18,4 +18,4 @@ Ambulance::Ambulance()
 	this->m_unk172 = 0;
 	this->m_unk13c = 40.0;
 	this->m_unk17c = 1.0;
-}
+}

LEGO1/carrace.cpp

@@ -4,4 +4,4 @@
 CarRace::CarRace()
 {
 	// TODO
-}
+}

LEGO1/define.h

@@ -5,4 +5,4 @@ extern const char* g_parseExtraTokens;
 extern const char* g_strWORLD;
 extern const char* g_strACTION;
 
-#endif // DEFINE_H
+#endif // DEFINE_H

LEGO1/dunebuggy.cpp

@@ -9,4 +9,4 @@ DuneBuggy::DuneBuggy()
 {
 	this->m_unk13c = 25.0;
 	this->m_unk164 = 1.0;
-}
+}

LEGO1/gifmanager.cpp

@@ -22,4 +22,4 @@ GifMapEntry* GifMap::FindNode(const char*& string)
 			current = current->m_left;
 	}
 	return ret;
-}
+}

LEGO1/gifmanager.h

@@ -66,4 +66,4 @@ class GifManager : public GifManagerBase {
 	undefined m_unk[0x1c];
 };
 
-#endif // GIFMANAGER_H
+#endif // GIFMANAGER_H

LEGO1/jetski.cpp

@@ -8,4 +8,4 @@ Jetski::Jetski()
 	this->m_unk13c = 25.0;
 	this->m_unk150 = 2.0;
 	this->m_unk148 = 1;
-}
+}

LEGO1/jukebox.cpp

@@ -4,4 +4,4 @@
 JukeBox::JukeBox()
 {
 	// TODO
-}
+}

LEGO1/legoentity.cpp

@@ -147,3 +147,4 @@ MxLong LegoEntity::Notify(MxParam& p)
 
 	return 0;
 }
+

LEGO1/legoflctexturepresenter.cpp

@@ -4,4 +4,4 @@
 LegoFlcTexturePresenter::LegoFlcTexturePresenter()
 {
 	// TODO
-}
+}

LEGO1/legoinputmanager.cpp

@@ -236,4 +236,4 @@ void LegoInputManager::KillTimer()
 		LegoOmni* omni = LegoOmni::GetInstance();
 		::KillTimer(omni->GetWindowHandle(), m_timer);
 	}
-}
+}

LEGO1/legometerpresenter.cpp

@@ -3,4 +3,4 @@
 #include "decomp.h"
 
 // Uncomment when member class variables are fleshed out.
-// DECOMP_SIZE_ASSERT(LegoMeterPresenter, 0x94); // 0x1000a163
+// DECOMP_SIZE_ASSERT(LegoMeterPresenter, 0x94); // 0x1000a163

LEGO1/legonavcontroller.cpp

@@ -224,4 +224,4 @@ float LegoNavController::CalculateNewVel(float p_targetVel, float p_currentVel,
 	}
 
 	return newVel;
-}
+}

LEGO1/legopathactor.cpp

@@ -164,4 +164,4 @@ void LegoPathActor::VTable0xa4()
 void LegoPathActor::VTable0xa8()
 {
 	// TODO
-}
+}

LEGO1/legostate.cpp

@@ -39,4 +39,4 @@ LegoFileStream* LegoFileStream::FUN_10006030(MxString p_str)
 	Write(data, (MxS16) fullLength);
 
 	return this;
-}
+}

LEGO1/mxatomidcounter.h

@@ -43,4 +43,4 @@ struct MxAtomIdCounterCompare {
 
 class MxAtomIdCounterSet : public set<MxAtomIdCounter*, MxAtomIdCounterCompare> {};
 
-#endif // MXATOMIDCOUNTER_H
+#endif // MXATOMIDCOUNTER_H

LEGO1/mxaudiomanager.cpp

@@ -75,4 +75,4 @@ MxResult MxAudioManager::InitPresenters()
 void MxAudioManager::Destroy()
 {
 	Destroy(FALSE);
-}
+}

LEGO1/mxbackgroundaudiomanager.cpp

@@ -105,4 +105,4 @@ void MxBackgroundAudioManager::DestroyMusic()
 		Streamer()->Close(m_script.GetInternal());
 		m_musicEnabled = FALSE;
 	}
-}
+}

LEGO1/mxcompositemediapresenter.cpp

@@ -4,4 +4,4 @@
 MxCompositeMediaPresenter::MxCompositeMediaPresenter()
 {
 	// TODO
-}
+}

LEGO1/mxcontrolpresenter.cpp

@@ -11,4 +11,4 @@ MxControlPresenter::MxControlPresenter()
 	this->m_unk52 = 0;
 	this->m_unk58 = 0;
 	this->m_unk54 = 0;
-}
+}

LEGO1/mxdsactionlist.cpp

@@ -20,4 +20,4 @@ void MxDSActionList::Destroy(MxDSAction* p_action)
 {
 	if (p_action)
 		delete p_action;
-}
+}

LEGO1/mxdsanim.cpp

@@ -38,4 +38,4 @@ MxDSAction* MxDSAnim::Clone()
 		*clone = *this;
 
 	return clone;
-}
+}

LEGO1/mxdsevent.cpp

@@ -38,4 +38,4 @@ MxDSAction* MxDSEvent::Clone()
 		*clone = *this;
 
 	return clone;
-}
+}

LEGO1/mxdsmediaaction.cpp

@@ -91,4 +91,4 @@ void MxDSMediaAction::CopyMediaSrcPath(const char* p_mediaSrcPath)
 	}
 	else
 		this->m_mediaSrcPath = NULL;
-}
+}

LEGO1/mxdsmultiaction.cpp

@@ -151,4 +151,4 @@ void MxDSMultiAction::SetAtomId(MxAtomId p_atomId)
 	MxDSAction* action;
 	while (cursor.Next(action))
 		action->SetAtomId(p_atomId);
-}
+}

LEGO1/mxdsobject.cpp

@@ -191,4 +191,4 @@ MxDSObject* DeserializeDSObjectDispatch(char** p_source, MxS16 p_flags)
 	}
 
 	return obj;
-}
+}

LEGO1/mxdsparallelaction.cpp

@@ -84,4 +84,4 @@ MxLong MxDSParallelAction::GetDuration()
 		this->m_duration *= this->m_loopCount;
 
 	return this->m_duration;
-}
+}

LEGO1/mxdsselectaction.cpp

@@ -129,4 +129,4 @@ void MxDSSelectAction::Deserialize(char** p_source, MxS16 p_unk24)
 	}
 
 	*p_source += extraFlag;
-}
+}

LEGO1/mxdsserialaction.cpp

@@ -78,4 +78,4 @@ MxLong MxDSSerialAction::GetDuration()
 	}
 
 	return this->m_duration;
-}
+}

LEGO1/mxdssound.cpp

@@ -60,4 +60,4 @@ MxDSAction* MxDSSound::Clone()
 		*clone = *this;
 
 	return clone;
-}
+}

LEGO1/mxdsstill.cpp

@@ -38,4 +38,4 @@ MxDSAction* MxDSStill::Clone()
 		*clone = *this;
 
 	return clone;
-}
+}

LEGO1/mxdsstreamingaction.cpp

@@ -89,4 +89,4 @@ void MxDSStreamingAction::FUN_100CD2D0()
 
 	this->m_duration -= duration;
 	this->m_unka8 += duration;
-}
+}

LEGO1/mxhashtable.h

@@ -42,10 +42,8 @@ class HashTableParent : public MxCore {
 		m_customDestructor = Destroy;
 	}
 
-	// OFFSET: LEGO1 0x100afd30
 	static void Destroy(T*){};
 
-	// OFFSET: LEGO1 0x100afcd0
 	virtual MxS8 Compare(T*, T*) = 0;
 
 protected:
@@ -72,7 +70,6 @@ class MxHashTable : protected HashTableParent<T> {
 
 	virtual MxS8 Compare(T*, T*) = 0;
 
-	// OFFSET: LEGO1 0x100afdc0
 	virtual MxU32 Hash(T*) = 0;
 
 	// FIXME: use of friend here?
@@ -154,7 +151,6 @@ class MxHashTableCursor : public MxCore {
 };
 
 template <class T>
-// OFFSET: LEGO1 0x100b0bd0
 MxHashTable<T>::~MxHashTable()
 {
 	for (int i = 0; i < m_numSlots; i++) {
@@ -175,7 +171,6 @@ MxHashTable<T>::~MxHashTable()
 }
 
 template <class T>
-// OFFSET: LEGO1 0x100b7ab0
 inline void MxHashTable<T>::Resize()
 {
 	// Save a reference to the current table
@@ -185,10 +180,10 @@ inline void MxHashTable<T>::Resize()
 
 	switch (m_resizeOption) {
 	case HASH_TABLE_OPT_EXPAND_ADD:
-		m_numSlots = old_size + m_increaseAmount;
+		m_numSlots += m_increaseAmount;
 		break;
 	case HASH_TABLE_OPT_EXPAND_MULTIPLY:
-		m_numSlots = old_size * m_increaseFactor;
+		m_numSlots *= m_increaseFactor;
 		break;
 	}
 
@@ -212,7 +207,6 @@ inline void MxHashTable<T>::Resize()
 }
 
 template <class T>
-// OFFSET: LEGO1 0x100b7b80
 inline void MxHashTable<T>::_NodeInsert(MxHashTableNode<T>* p_node)
 {
 	int bucket = p_node->m_hash % m_numSlots;

LEGO1/mxmatrix.h

@@ -65,4 +65,4 @@ class MxMatrixData : public MxMatrix {
 	};
 };
 
-#endif // MXMATRIX_H
+#endif // MXMATRIX_H

LEGO1/mxmediamanager.cpp

@@ -99,4 +99,4 @@ void MxMediaManager::StopPresenters()
 
 	while (cursor.Next(presenter))
 		presenter->EndAction();
-}
+}

LEGO1/mxmidipresenter.cpp

@@ -36,4 +36,4 @@ void MxMIDIPresenter::DoneTickle()
 	if (!MusicManager()->GetMIDIInitialized()) {
 		this->EndAction();
 	}
-}
+}

LEGO1/mxmusicmanager.cpp

@@ -143,4 +143,4 @@ MxResult MxMusicManager::Create(MxU32 p_frequencyMS, MxBool p_createThread)
 		m_criticalSection.Leave();
 
 	return status;
-}
+}

LEGO1/mxmusicmanager.h

@@ -40,4 +40,4 @@ class MxMusicManager : public MxAudioManager {
 	void InitData();
 };
 
-#endif // MXMUSICMANAGER_H
+#endif // MXMUSICMANAGER_H

LEGO1/mxnotificationmanager.cpp

@@ -186,4 +186,4 @@ MxResult MxNotificationManager::Send(MxCore* p_listener, MxNotificationParam* p_
 	}
 
 	return FAILURE;
-}
+}

LEGO1/mxregion.cpp

@@ -37,4 +37,4 @@ MxBool MxRegion::vtable20()
 {
 	// TODO
 	return FALSE;
-}
+}

LEGO1/mxsemaphore.cpp

@@ -26,4 +26,4 @@ void MxSemaphore::Wait(MxU32 p_timeoutMS)
 void MxSemaphore::Release(MxU32 p_releaseCount)
 {
 	ReleaseSemaphore(m_hSemaphore, p_releaseCount, NULL);
-}
+}

LEGO1/mxsemaphore.h

@@ -21,4 +21,4 @@ class MxSemaphore {
 	HANDLE m_hSemaphore;
 };
 
-#endif // MX_SEMAPHORE_H
+#endif // MX_SEMAPHORE_H

LEGO1/mxstreamer.cpp

@@ -184,4 +184,4 @@ MxStreamerSubClass1::MxStreamerSubClass1(undefined4 size)
 	for (int i = 0; i >= 0; i--) {
 		ptr[i] = 0;
 	}
-}
+}

LEGO1/mxthread.cpp

@@ -96,4 +96,4 @@ MxResult MxTickleThread::Run()
 		Sleep(timeRemainingMS);
 	}
 	return MxThread::Run();
-}
+}

LEGO1/mxtype17notificationparam.cpp

@@ -1,3 +1,3 @@
 #include "mxtype17notificationparam.h"
 
-DECOMP_SIZE_ASSERT(MxType17NotificationParam, 0x2c)
+DECOMP_SIZE_ASSERT(MxType17NotificationParam, 0x2c)

LEGO1/mxtype17notificationparam.h

@@ -17,4 +17,4 @@ class MxType17NotificationParam : public MxNotificationParam {
 	MxU16 m_unk28;
 };
 
-#endif // MXTYPE17NOTIFICATIONPARAM_H
+#endif // MXTYPE17NOTIFICATIONPARAM_H

LEGO1/mxunklist.h

@@ -35,4 +35,4 @@ class MxUnkList {
 	MxU32 m_count;
 };
 
-#endif // MXUNKLIST_H
+#endif // MXUNKLIST_H

LEGO1/mxvariabletable.h

@@ -21,4 +21,13 @@ class MxVariableTable : public MxHashTable<MxVariable> {
 	virtual MxU32 Hash(MxVariable*);                // +0x18
 };
 
+// OFFSET: LEGO1 0x100b0bd0 TEMPLATE
+// MxHashTable<MxVariable>::~MxHashTable<MxVariable>
+
+// OFFSET: LEGO1 0x100b7ab0 TEMPLATE
+// MxHashTable<MxVariable>::Resize
+
+// OFFSET: LEGO1 0x100b7b80 TEMPLATE
+// MxHashTable<MxVariable>::_NodeInsert
+
 #endif // MXVARIABLETABLE_H

LEGO1/pizzamissionstate.cpp

@@ -10,4 +10,4 @@ PizzaMissionStateEntry* PizzaMissionState::GetState(MxU8 id)
 		if (m_state[i].m_id == id)
 			return m_state + i;
 	return NULL;
-}
+}

LEGO1/racestate.cpp

@@ -20,4 +20,4 @@ RaceStateEntry* RaceState::GetState(MxU8 id)
 		if (m_state[i].m_id == id)
 			return m_state + i;
 	}
-}
+}

LEGO1/radio.cpp

@@ -4,4 +4,4 @@
 Radio::~Radio()
 {
 	// TODO
-}
+}

LEGO1/score.cpp

@@ -324,4 +324,4 @@ MxBool Score::VTable0x64()
 	DeleteScript();
 	m_unkf8 = 2;
 	return TRUE;
-}
+}