broke stuff

build/tpt_console.py

@@ -1,17 +1,22 @@
 import tpt
+from tpt import *
 import sys
 import code
 import ctypes
 import traceback
-from threading import Thread
+DEBUG=False
-print "console module loaded."
+
+#print "console module loaded."
 #redirect stdout like this:
 class logger:
     def write(self,txt):
-        txt=txt.split("\n")[-1][:254]
+        txt=txt.strip().split("\n")[-1]
+        repr(txt)
         tpt.log(txt)
-#sys.stdout=logger()
+if(DEBUG==False):
-#sys.stderr=logger()
+    sys.stdout=logger()
+    sys.stderr=logger()
+
 
 element={"none":0,"dust":1,"watr":2,"oil":3,"fire":4,"stne":5,"lava":6,"gunp":7,
     "nitr":8,"clne":9,"gas":10,"plex":11,"goo":12,"icei":13,"metl":14,"sprk":15,
@@ -37,38 +42,11 @@ element={"none":0,"dust":1,"watr":2,"oil":3,"fire":4,"stne":5,"lava":6,"gunp":7,
     "lote":142,"frg2":143,"star":144,"frog":145,"bran":146,"wind":147,
     "num":148}
 
-class _fork(Thread):
+
-    def __init__ (self,func):
-        Thread.__init__(self)
-        self.func=func
-    def run(self):
-        self.func(self)
-def fork(func):
-    try:
-        a=fork.threads
-    except:
-        fork.threads={}
-        fork.i=0
-    tmp=_fork(func)
-    fork.threads[fork.i]=tmp
-    fork.i+=1
-    tmp.start()
-    return tmp
-    tpt.log("Thread #%d started"%(fork.i-1))
-def fork_status():
-    count=0
-    remove=[]
-    for key in fork.threads:
-        if(fork.threads[key].is_alive()):
-            count+=1
-        else:
-            remove.append[key]
-    for item in remove:
-        del fork.threads[item]
-    tpt.log("%d threads alive. %d threads stopped since last status."%(count,len(remove)))
 def fork_unblock():
     pass#i need to implement this some day.
 def error(ex):
+    traceback.print_exc()
     err=traceback.format_exc()
     sys.stdout.write(err)
 
@@ -95,7 +73,7 @@ def handle(txt):
 def _handle(txt):
     #print "handling '%s'"%txt
     try:
-        sys.stdout.write(repr(eval(tmp,handle.glob)))
+        sys.stdout.write(repr(eval(txt,handle.glob)))
     except:
         try:
             exec txt in handle.glob
@@ -103,4 +81,36 @@ def _handle(txt):
             error(ex)
 
 
+_extensions=[]
+def loadext(fname):
+    ext=__import__(fname)
+    ext.init()
+    _extensions.append(ext)
 
+def keypress(key):
+    unload=[]
+    for item in _extensions:
+        try:
+            item.key(key)
+        except Exception as ex:
+            error(ex)
+            unload.append(item)
+    for item in unload:
+        item.exit()
+        _extensions.remove(item)
+                
+
+def step():
+    unload=[]
+    for item in _extensions:
+        try:
+            item.step()
+        except Exception as ex:
+            error(ex)
+            unload.append(item)
+    for item in unload:
+        try:
+            item.exit()
+        except Exception as ex:
+            error(ex)
+        _extensions.remove(item)

src/elements/watr.c

@@ -9,10 +9,15 @@ int update_WATR(UPDATE_FUNC_ARGS) {
 				r = pmap[y+ry][x+rx];
 				if ((r>>8)>=NPART || !r)
 					continue;
-				if ((r&0xFF)==PT_SALT && 1>(rand()%250))
+				/*if ((r&0xFF)==PT_SALT && 1>(rand()%250))
 				{
 					part_change_type(i,x,y,PT_SLTW);
 					part_change_type(r>>8,x+rx,y+ry,PT_SLTW);
+				}*/
+                if ((r&0xFF)==PT_SALT)
+                {
+                    parts[i].life = 100;
+                    kill_part(r>>8);
                 }
 				if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && (legacy_enable||parts[i].temp>(273.15f+12.0f)) && 1>(rand()%500))
 				{

src/graphics.c

@@ -2913,6 +2913,12 @@ void draw_parts(pixel *vid)
 			}
 		}
 #endif
+        if (parts[i].type==PT_WATR){
+            if(parts[i].life==0)
+                blendpixel(vid,x+nx,y+ny,0,255,0,255);
+            else
+                blendpixel(vid,x+nx,y+ny,255,0,0,255);
+        }
 	}
 #ifdef OpenGL
 	glFlush ();