Finished first pass-through for all elements.

Will get a few more places later.

1 files changed, 29 insertions, 28 deletions

diff --git a/src/simulation/elements/WIRE.cpp b/src/simulation/elements/WIRE.cpp
index d381c73..c4ccd25 100644
--- a/src/simulation/elements/WIRE.cpp
+++ b/src/simulation/elements/WIRE.cpp
@@ -48,46 +48,47 @@ Element_WIRE::Element_WIRE()
 
 //#TPT-Directive ElementHeader Element_WIRE static int update(UPDATE_FUNC_ARGS)
 int Element_WIRE::update(UPDATE_FUNC_ARGS)
- {
-    int s,r,rx,ry,count;    
-    /*
-    0:  wire
-    1:  spark head
-    2:  spark tail
+{
+	int s,r,rx,ry,count;    
+	/*
+	  0:  wire
+	  1:  spark head
+	  2:  spark tail
     
-    tmp is previous state, ctype is current state
-    */
-    //parts[i].tmp=parts[i].ctype;
-    parts[i].ctype=0;
-    if(parts[i].tmp==1)
+	  tmp is previous state, ctype is current state
+	*/
+	//parts[i].tmp=parts[i].ctype;
+	parts[i].ctype=0;
+	if (parts[i].tmp==1)
 	{
 		parts[i].ctype=2;
 	}
-    if(parts[i].tmp==2)
+	else if (parts[i].tmp==2)
 	{
 		parts[i].ctype=0;
 	}
-    
-    count=0;
-    for(rx=-1; rx<2; rx++)
-        for(ry=-1; ry<2; ry++)
-        {
-            if(x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
-            {
-                r = pmap[y+ry][x+rx];
+	count=0;
+	for (rx=-1; rx<2; rx++)
+		for (ry=-1; ry<2; ry++)
+		{
+			if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
+			{
+				r = pmap[y+ry][x+rx];
 				if (!r)
 					continue;
-				if((r&0xFF)==PT_SPRK && parts[r>>8].life==3 && parts[r>>8].ctype==PT_PSCN)
+				if ((r&0xFF)==PT_SPRK && parts[r>>8].life==3 && parts[r>>8].ctype==PT_PSCN)
 				{
 					parts[i].ctype=1;
 					return 0;
 				}
-				else if((r&0xFF)==PT_NSCN && parts[i].tmp==1){sim->create_part(-1, x+rx, y+ry, PT_SPRK);}
-                else if((r&0xFF)==PT_WIRE && parts[r>>8].tmp==1 && !parts[i].tmp){count++;}
-            }
-        }
-    if(count==1 || count==2)
-        parts[i].ctype=1;
+				else if ((r&0xFF)==PT_NSCN && parts[i].tmp==1)
+					sim->create_part(-1, x+rx, y+ry, PT_SPRK);
+				else if ((r&0xFF)==PT_WIRE && parts[r>>8].tmp==1 && !parts[i].tmp)
+					count++;
+			}
+		}
+	if (count==1 || count==2)
+		parts[i].ctype=1;
 	return 0;
 }
 
@@ -124,4 +125,4 @@ int Element_WIRE::graphics(GRAPHICS_FUNC_ARGS)
 }
 
 
-Element_WIRE::~Element_WIRE() {}
\ No newline at end of file
+Element_WIRE::~Element_WIRE() {}