X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=mudpy;h=7a5d5b20aabfddc1c636ad90722787fea03c94ac;hp=431c9a021bbe0baddee4f193c5505fb659e94a91;hb=138ac7e001abf8940f3cb2a419ef3dd3556d0086;hpb=74d37bfacdd2d7c13192fe2cd5e34f03cc2e399f

diff --git a/mudpy b/mudpy
index 431c9a0..7a5d5b2 100755
--- a/mudpy
+++ b/mudpy
@@ -9,6 +9,7 @@ import mudpy
 
 # a consistent list so we can reimport these on reload
 importlist = [
+	"argv",
 	"create_pidfile",
 	"daemonize",
 	"log",
@@ -20,7 +21,6 @@ importlist = [
 for item in importlist: exec("from mudpy import " + item)
 
 # log an initial message
-from sys import argv
 log("Started mudpy with command line: " + " ".join(argv))
 
 # fork and disassociate
@@ -31,21 +31,15 @@ create_pidfile(universe)
 
 # loop indefinitely while the world is not flagged for termination or
 # there are connected users
-while not universe.terminate_world or universe.userlist:
+while not universe.terminate_flag or universe.userlist:
 
 	# the world was flagged for a reload of all code/data
-	if universe.reload_modules:
+	if universe.reload_flag:
 
 		# reload the mudpy module
 		reload(mudpy)
 		for item in importlist: exec("from mudpy import " + item)
 
-		# move data into new persistent objects
-		reload_data()
-
-		# reset the reload flag
-		universe.reload_modules = False
-
 	# do what needs to be done on each pulse
 	on_pulse()