From 0b41fa2e1705510e22fedb2c83e04bd731f40833 Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Thu, 21 Jan 2016 05:32:32 +1100
Subject: [PATCH] [Glide64] Revert some of the indentation in
 Glide64/Combine.cpp

---
 Source/Glide64/Combine.cpp | 79 +++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/Source/Glide64/Combine.cpp b/Source/Glide64/Combine.cpp
index 40812f86f..a77d5ff6a 100644
--- a/Source/Glide64/Combine.cpp
+++ b/Source/Glide64/Combine.cpp
@@ -151,8 +151,8 @@ COMBINE cmb;
   cmb.tmu1_func = GR_COMBINE_FUNCTION_LOCAL, \
   cmb.tmu0_func = GR_COMBINE_FUNCTION_SCALE_OTHER, \
   cmb.tmu0_fac = GR_COMBINE_FACTOR_ONE; \
-      } \
-        else { \
+  } \
+  else { \
   USE_T0(); \
 }
 #define T0_ADD_T1() \
@@ -188,13 +188,13 @@ COMBINE cmb;
 #define T0_INTER_T1_USING_FACTOR(factor) \
   if (factor == 0xFF) { \
   USE_T1(); \
-      } \
-        else if (factor == 0x00) { \
+  } \
+  else if (factor == 0x00) { \
   USE_T0(); \
 }\
-        else {\
+  else {\
   if (factor <= 0x80) rdp.best_tex = 0; \
-        else rdp.best_tex = 1; \
+  else rdp.best_tex = 1; \
   cmb.tex |= 3, \
   cmb.tmu1_func = GR_COMBINE_FUNCTION_LOCAL, \
   cmb.tmu0_func = GR_COMBINE_FUNCTION_BLEND, \
@@ -205,13 +205,13 @@ COMBINE cmb;
 #define T1_INTER_T0_USING_FACTOR(factor)  /* inverse of above */\
   if (factor == 0xFF) { \
   USE_T0(); \
-      } \
-        else if (factor == 0x00) { \
+  } \
+  else if (factor == 0x00) { \
   USE_T1(); \
 }\
-        else {\
+  else {\
   if (factor <= 0x80) rdp.best_tex = 0; \
-        else rdp.best_tex = 1; \
+  else rdp.best_tex = 1; \
   cmb.tex |= 3, \
   cmb.tmu1_func = GR_COMBINE_FUNCTION_LOCAL, \
   cmb.tmu0_func = GR_COMBINE_FUNCTION_BLEND, \
@@ -234,8 +234,8 @@ COMBINE cmb;
 #define T0_INTER_T1_USING_T1() \
   if (!cmb.combine_ext) { \
   T0_INTER_T1_USING_FACTOR(0x7F); \
-      }\
-        else {\
+  }\
+  else {\
   rdp.best_tex = 0; \
   cmb.tex |= 3, \
   cmb.t1c_ext_a = GR_CMBX_LOCAL_TEXTURE_RGB, \
@@ -265,8 +265,8 @@ COMBINE cmb;
 #define T0_INTER_T1_USING_PRIM() \
   if (!cmb.combine_ext) { \
   T0_INTER_T1_USING_FACTOR ((rdp.prim_color&0xFF)); \
-      }\
-        else {\
+  }\
+  else {\
   rdp.best_tex = 0; \
   cmb.tex |= 3, \
   cmb.t1c_ext_a = GR_CMBX_LOCAL_TEXTURE_RGB, \
@@ -291,8 +291,8 @@ COMBINE cmb;
 #define T1_INTER_T0_USING_PRIM() /* inverse of above */\
   if (!cmb.combine_ext) { \
   T1_INTER_T0_USING_FACTOR ((rdp.prim_color&0xFF)); \
-      }\
-        else {\
+  }\
+  else {\
   rdp.best_tex = 0; \
   cmb.tex |= 3, \
   cmb.t1c_ext_a = GR_CMBX_LOCAL_TEXTURE_RGB, \
@@ -317,8 +317,8 @@ COMBINE cmb;
 #define T0_INTER_T1_USING_ENV() \
   if (!cmb.combine_ext) { \
   T0_INTER_T1_USING_FACTOR ((rdp.env_color&0xFF)); \
-      }\
-        else {\
+  }\
+  else {\
   rdp.best_tex = 0; \
   cmb.tex |= 3, \
   cmb.t1c_ext_a = GR_CMBX_LOCAL_TEXTURE_RGB, \
@@ -343,8 +343,8 @@ COMBINE cmb;
 #define T1_INTER_T0_USING_ENV() /* inverse of above */\
   if (!cmb.combine_ext) { \
   T1_INTER_T0_USING_FACTOR ((rdp.env_color&0xFF)); \
-      }\
-        else {\
+  }\
+  else {\
   rdp.best_tex = 0; \
   cmb.tex |= 3, \
   cmb.t1c_ext_a = GR_CMBX_LOCAL_TEXTURE_RGB, \
@@ -369,8 +369,8 @@ COMBINE cmb;
 #define T0_INTER_T1_USING_SHADEA() \
   if (!cmb.combine_ext) { \
   T0_INTER_T1_USING_FACTOR (0x7F); \
-      }\
-        else {\
+  }\
+  else {\
   rdp.best_tex = 0; \
   cmb.tex |= 3, \
   cmb.t1c_ext_a = GR_CMBX_LOCAL_TEXTURE_RGB, \
@@ -394,8 +394,8 @@ COMBINE cmb;
 #define T1_INTER_T0_USING_SHADEA() \
   if (!cmb.combine_ext) { \
   T0_INTER_T1_USING_FACTOR (0x7F); \
-      }\
-        else {\
+  }\
+  else {\
   rdp.best_tex = 0; \
   cmb.tex |= 3, \
   cmb.t1c_ext_a = GR_CMBX_LOCAL_TEXTURE_RGB, \
@@ -459,7 +459,7 @@ COMBINE cmb;
   MOD_0_FAC (lod_frac & 0xFF);
 #define T1_SUB_PRIM_MUL_PRIMLOD_ADD_T0() \
   if (cmb.combine_ext) \
-    { \
+{ \
   T1CCMBEXT(GR_CMBX_LOCAL_TEXTURE_RGB, GR_FUNC_MODE_X, \
   GR_CMBX_TMU_CCOLOR, GR_FUNC_MODE_NEGATIVE_X, \
   GR_CMBX_DETAIL_FACTOR, 0, \
@@ -472,8 +472,8 @@ COMBINE cmb;
   cmb.tex |= 3; \
   percent = (float)(lod_frac) / 255.0f; \
   cmb.dc0_detailmax = cmb.dc1_detailmax = percent; \
-    } \
-        else \
+} \
+  else \
 {  \
   T0_ADD_T1 (); \
   MOD_1 (TMOD_TEX_SUB_COL_MUL_FAC); \
@@ -483,8 +483,8 @@ COMBINE cmb;
 #define PRIM_INTER_T0_USING_SHADEA() \
   if (!cmb.combine_ext) { \
   USE_T0 (); \
-      }\
-        else {\
+  }\
+  else {\
   rdp.best_tex = 0; \
   cmb.tex |= 1, \
   cmb.t0c_ext_a = GR_CMBX_LOCAL_TEXTURE_RGB, \
@@ -508,8 +508,8 @@ COMBINE cmb;
   cmb.tmu1_a_func = GR_COMBINE_FUNCTION_LOCAL, \
   cmb.tmu0_a_func = GR_COMBINE_FUNCTION_SCALE_OTHER, \
   cmb.tmu0_a_fac = GR_COMBINE_FACTOR_ONE; \
-      } \
-        else { \
+  } \
+  else { \
   A_USE_T0(); \
 }
 #define A_T0_ADD_T1() \
@@ -553,11 +553,11 @@ COMBINE cmb;
 #define A_T0_INTER_T1_USING_FACTOR(factor) \
   if (factor == 0xFF) { \
   A_USE_T1(); \
-      } \
-        else if (factor == 0x00) { \
+  } \
+  else if (factor == 0x00) { \
   A_USE_T0(); \
 }\
-        else { \
+  else { \
   cmb.tex |= 3, \
   cmb.tmu1_a_func = GR_COMBINE_FUNCTION_LOCAL, \
   cmb.tmu0_a_func = GR_COMBINE_FUNCTION_BLEND, \
@@ -568,11 +568,11 @@ COMBINE cmb;
 #define A_T1_INTER_T0_USING_FACTOR(factor) /* inverse of above */\
   if (factor == 0xFF) { \
   A_USE_T0(); \
-      } \
-        else if (factor == 0x00) { \
+  } \
+  else if (factor == 0x00) { \
   A_USE_T1(); \
 }\
-        else { \
+  else { \
   cmb.tex |= 3, \
   cmb.tmu1_a_func = GR_COMBINE_FUNCTION_LOCAL, \
   cmb.tmu0_a_func = GR_COMBINE_FUNCTION_BLEND, \
@@ -583,8 +583,8 @@ COMBINE cmb;
 #define A_T0_INTER_T1_USING_SHADEA() \
   if (!cmb.combine_ext) { \
   A_T0_INTER_T1_USING_FACTOR (0x7F); \
-      }\
-        else {\
+  }\
+  else {\
   rdp.best_tex = 0; \
   cmb.tex |= 3, \
   cmb.t1a_ext_a = GR_CMBX_LOCAL_TEXTURE_ALPHA, \
@@ -630,6 +630,7 @@ COMBINE cmb;
   percent = (float)(rdp.env_color&0xFF) / 255.0f, \
   cmb.dc0_detailmax = cmb.dc1_detailmax = percent
 
+
 // UNIMP - writes to the unimplemented log, if it's enabled
 #ifdef UNIMP_LOG
 #define UNIMPMODE() { \