Merge pull request #7 from evennia/master

Some minor changes before merging
evennia · Feb 2, 2014 · ff20072 · ff20072
2 parents 45ebc2c + 985055d
commit ff20072
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/contrib/dice.py b/contrib/dice.py
@@ -150,7 +150,7 @@ def func(self):
 
         # Limit the number of dice and sides a character can roll to prevent server slow down and crashes
         ndicelimit = 10000 # Maximum number of dice
-        nsidelimit = 100000000000 # Maximum number of sides
+        nsidelimit = 10000 # Maximum number of sides
         if int(parts[0]) > ndicelimit or int(parts[2]) > nsidelimit:
             self.caller.msg("The maximum roll allowed is %sd%s." % (ndicelimit, nsidelimit))
             return

diff --git a/contrib/menu_login.py b/contrib/menu_login.py
@@ -362,4 +362,4 @@ def func(self):
         menu = MenuTree(self.caller, nodes=(START, node1a, node1b,
                                             node2a, node2b, node3),
                                             exec_end=None)
-        menu.start()
+        menu.start()
diff --git a/src/utils/evform_test.py b/src/utils/evform_test.py
@@ -7,7 +7,7 @@
 TABLECHAR = "c"
 
 FORM = """
-{c.------------------------------------------------.
+.------------------------------------------------.
 |                                                |
 |  Name: xxxxx1xxxxx    Player: xxxxxxx2xxxxxxx  |
 |        xxxxxxxxxxx                             |