Convert all files to space-based indentation

WohlSoft · Sep 13, 2018 · 3ad29d3 · 3ad29d3 · Wohlstand · Sep 13, 2018
1 parent a749cd8
commit 3ad29d3
Show file tree

Hide file tree

Showing 133 changed files with 9,508 additions and 9,505 deletions.
diff --git a/LunaDll/Autocode/Autocode.cpp b/LunaDll/Autocode/Autocode.cpp
diff --git a/LunaDll/Autocode/Autocode.h b/LunaDll/Autocode/Autocode.h
diff --git a/LunaDll/Autocode/AutocodeManager.cpp b/LunaDll/Autocode/AutocodeManager.cpp
diff --git a/LunaDll/Autocode/AutocodeManager.h b/LunaDll/Autocode/AutocodeManager.h
@@ -16,41 +16,41 @@
 
 struct AutocodeManager {
 
-	AutocodeManager();
-
-	// File funcs
-	void ReadFile(std::wstring dir_path); // Load level codes from dir_path
-	void ReadWorld(std::wstring dir_path); // Load worldwide codes from dir_path
-	void ReadGlobals(std::wstring dir_path); // Load global codes from dir_path
-	void Parse(std::wifstream* open_file, bool add_to_globals);
-
-	// Management funcs
-	void Clear(bool clear_global_codes);
-	void ForceExpire(int section);
-	void ClearExpired();	
-	void DeleteEvent(std::wstring event_reference_name);		// Look up event with given name and expire it
-	void DoEvents(bool init);
-	void ActivateCustomEvents(int new_section, int eventcode);
-	Autocode* GetEventByRef(std::wstring event_reference_name);	// Return ptr to event with the given ref, or NULL if it fails
-	Autocode* FindMatching(int section, std::wstring string);
-
-	// Variable bank funcs
-	double GetVar(std::wstring var_name);		// returns 0 if var doesn't exist in bank
-	bool VarExists(std::wstring var_name);
-	bool VarOperation(std::wstring var_name, double value, OPTYPE operation_to_do);
-
-	// Members
-	bool					m_Enabled;			// Whether or not individual level scripts enabled
-	bool					m_GlobalEnabled;	// Whether or not global game scripts enabled
-	std::list<Autocode*>	m_Autocodes;
-	std::list<Autocode*>	m_InitAutocodes;
-	std::list<Autocode*>	m_CustomCodes;
-	std::list<Autocode*>	m_GlobalCodes;
-
-	std::map<std::wstring, double> m_UserVars;
-
-	// Hearts manager stuff
-	int m_Hearts;
+    AutocodeManager();
+
+    // File funcs
+    void ReadFile(std::wstring dir_path); // Load level codes from dir_path
+    void ReadWorld(std::wstring dir_path); // Load worldwide codes from dir_path
+    void ReadGlobals(std::wstring dir_path); // Load global codes from dir_path
+    void Parse(std::wifstream* open_file, bool add_to_globals);
+
+    // Management funcs
+    void Clear(bool clear_global_codes);
+    void ForceExpire(int section);
+    void ClearExpired();	
+    void DeleteEvent(std::wstring event_reference_name);		// Look up event with given name and expire it
+    void DoEvents(bool init);
+    void ActivateCustomEvents(int new_section, int eventcode);
+    Autocode* GetEventByRef(std::wstring event_reference_name);	// Return ptr to event with the given ref, or NULL if it fails
+    Autocode* FindMatching(int section, std::wstring string);
+
+    // Variable bank funcs
+    double GetVar(std::wstring var_name);		// returns 0 if var doesn't exist in bank
+    bool VarExists(std::wstring var_name);
+    bool VarOperation(std::wstring var_name, double value, OPTYPE operation_to_do);
+
+    // Members
+    bool					m_Enabled;			// Whether or not individual level scripts enabled
+    bool					m_GlobalEnabled;	// Whether or not global game scripts enabled
+    std::list<Autocode*>	m_Autocodes;
+    std::list<Autocode*>	m_InitAutocodes;
+    std::list<Autocode*>	m_CustomCodes;
+    std::list<Autocode*>	m_GlobalCodes;
+
+    std::map<std::wstring, double> m_UserVars;
+
+    // Hearts manager stuff
+    int m_Hearts;
 };
 
 #endif
diff --git a/LunaDll/Autocode/Commands/AC_HeartSystem.cpp b/LunaDll/Autocode/Commands/AC_HeartSystem.cpp
@@ -7,49 +7,49 @@
 
 void Autocode::HeartSystem() {
 
-	PlayerMOB* sheath = Player::Get(1);
-	if(sheath != 0) {
-
-		// Don't run for demo or iris
-		if(!Player::UsesHearts(sheath))
-			return;
-
-		// Detect extra heart pickup and hold displayed hearts at 2
-		if(sheath->Hearts > 2) {
-			gAutoMan.m_Hearts++;
-			sheath->Hearts = 2;
-			sheath->CurrentPowerup = (sheath->CurrentPowerup > 2 ? sheath->CurrentPowerup : 2);
-		}
-		if(sheath->Hearts == 2 && gAutoMan.m_Hearts < 2)
-			gAutoMan.m_Hearts = 2;
-
-		// Limit tracked max hearts
-		if(gAutoMan.m_Hearts > Param2)
-			gAutoMan.m_Hearts = (int)Param2;
-
-		// If damaged, take hearts from extra hearts
-		if(sheath->Hearts == 1 && gAutoMan.m_Hearts > 2) {
+    PlayerMOB* sheath = Player::Get(1);
+    if(sheath != 0) {
+
+        // Don't run for demo or iris
+        if(!Player::UsesHearts(sheath))
+            return;
+
+        // Detect extra heart pickup and hold displayed hearts at 2
+        if(sheath->Hearts > 2) {
+            gAutoMan.m_Hearts++;
+            sheath->Hearts = 2;
+            sheath->CurrentPowerup = (sheath->CurrentPowerup > 2 ? sheath->CurrentPowerup : 2);
+        }
+        if(sheath->Hearts == 2 && gAutoMan.m_Hearts < 2)
+            gAutoMan.m_Hearts = 2;
+
+        // Limit tracked max hearts
+        if(gAutoMan.m_Hearts > Param2)
+            gAutoMan.m_Hearts = (int)Param2;
+
+        // If damaged, take hearts from extra hearts
+        if(sheath->Hearts == 1 && gAutoMan.m_Hearts > 2) {
             //char* dbg = "HEART SET";
-			sheath->Hearts = 2;
-			sheath->CurrentPowerup = (sheath->CurrentPowerup > 2 ? sheath->CurrentPowerup : 2);
-			gAutoMan.m_Hearts--;
-		}
-		else if(sheath->Hearts == 1) {
-			sheath->CurrentPowerup = 1;
-			gAutoMan.m_Hearts = 1;
-		}
-		else if(sheath->Hearts == 0) {
-			gAutoMan.m_Hearts = 0;
-		}
+            sheath->Hearts = 2;
+            sheath->CurrentPowerup = (sheath->CurrentPowerup > 2 ? sheath->CurrentPowerup : 2);
+            gAutoMan.m_Hearts--;
+        }
+        else if(sheath->Hearts == 1) {
+            sheath->CurrentPowerup = 1;
+            gAutoMan.m_Hearts = 1;
+        }
+        else if(sheath->Hearts == 0) {
+            gAutoMan.m_Hearts = 0;
+        }
 
         std::wstringstream gAutoMan_m_Hearts;
         gAutoMan_m_Hearts<<(long long)gAutoMan.m_Hearts;
-		// Display life stuff on screen
+        // Display life stuff on screen
         Renderer::Get().AddOp(new RenderStringOp(std::wstring(
                                   std::wstring(L"HP: ")+std::wstring(gAutoMan_m_Hearts.str())
                                   )
                               ,3, (float)Target, (float)Param1));
 
-	}//if heartuser
+    }//if heartuser
 
 }
diff --git a/LunaDll/Autocode/Commands/AC_LunaControl.cpp b/LunaDll/Autocode/Commands/AC_LunaControl.cpp
@@ -3,20 +3,20 @@
 #include "../../Globals.h"
 
 void Autocode::LunaControl(LunaControlAct act, int val) {
-	switch(act) {
+    switch(act) {
 
-	case LCA_DemoCounter:
-		break;
+    case LCA_DemoCounter:
+        break;
 
-	case LCA_SMBXHUD:
-		if(val == 1)
-			gSMBXHUDSettings.skip = true;
-		else
-			gSMBXHUDSettings.skip = false;
-		break;
-	
-	case LCA_Invalid:
-	default:
-		return;
-	}
+    case LCA_SMBXHUD:
+        if(val == 1)
+            gSMBXHUDSettings.skip = true;
+        else
+            gSMBXHUDSettings.skip = false;
+        break;
+    
+    case LCA_Invalid:
+    default:
+        return;
+    }
 }