Merge branch 'trunk' into svn

fofix · Dec 6, 2009 · 32ef1b6 · 32ef1b6
2 parents bf620ad + 9f62dae
commit 32ef1b6
Show file tree

Hide file tree

Showing 16 changed files with 476 additions and 1,544 deletions.
diff --git a/CREDITS b/CREDITS
@@ -109,7 +109,7 @@ Death Legion, kawaii_kumiko69, gamexprt1, acrox999,
 p_025, treckzy, slash666, mrhoievo, Dillusional, 
 SneakHouse, Borisdsp, Don Tonberry, Gugered, 
 NewCreature, rock8200, Leixner, Trinidude4, ver,
-evilbobthebob, deufeufeu, max26199
+evilbobthebob, deufeufeu, max26199, Steven Knapman
 
 _%tutorial%_
 =======================================================

diff --git a/src/Drum.py b/src/Drum.py
@@ -195,7 +195,7 @@ def __init__(self, engine, playerObj, editorMode = False, player = 0):
     #if self.engine.config.get("game", "battle_Tune") == 1:
     #  self.battleObjectsEnabled.append(9)
 
-    Log.debug(self.battleObjectsEnabled)
+    Log.debug("Battle Objects Enabled: "+str(self.battleObjectsEnabled))
     self.battleNextObject   = 0
     self.battleObjects      = [0] * 3
     self.battleBeingUsed    = [0] * 2