- updated config module to be python 2.5 compatible

- updated documentation a bit

BUILD.txt

@@ -20,5 +20,3 @@ Linux
     you need python (>= 2.6, <3.0), python-pygame (>=1.9), python-numpy (>= 1.5), python-stdeb (>= 0.6)
     rm -r build deb_dist dist
     python setup.py --command-packages=stdeb.command bdist_deb
-
-

INSTALL.txt

@@ -27,15 +27,17 @@ A. Source Archive
 
    3. Install Ultimate Smash Friends (optional)*
       a. Sytem-wide
-         # python setup.py --record install_files
+         # python2 setup.py --record install_files
       b. User-Specific
-         $ python setup.py --record install_files --home=~
+         $ python2 setup.py --record install_files --home=~
 
    4. Run
       a. If you installed as listed above:
-         $ ultimate-smash-friends.pyw
+         $ ultimate-smash-friends
       b. If you did not install:
-         $ ./ultimate-smash-friends.pyw
+         $ ./ultimate-smash-friends
+      c. Alternatively, you may launch a game with:
+         $ python2 -m usf.main
 
    5. Uninstall
       a. If installed by using step 3 above:
@@ -70,7 +72,7 @@ C. Arch Linux PKGBUILD
       $ makepkg -si
 
    3. Run
-      $ ultimate-smash-friends.pyw
+      $ ultimate-smash-friends
 
    4. Uninstall
       # pacman -Rsn usf-bzr

README.txt

@@ -1,7 +1,7 @@
-UltimateSmashFriends
+Ultimate Smash Friends
 ====================
 
-UltimateSmashFriends is a game which aim at creating quick and fun multiplayer
+Ultimate Smash Friends is a game which aim at creating quick and fun multiplayer
 entertainment. With nice 2d bitmap graphics and arcade gameplay we hope to
 deliver hours of fun.
 
@@ -10,19 +10,34 @@ How to install
 
 see INSTALL file if you have not already installed the game.
 
+Configuring
+===========
+
+Global configuration resides in the system.cfg file. If this file does not exist
+(because you didn't install Ultimate Smash Friends), you can generate it from the
+commmand line as follows:
+$ python2 -m usf.config
+
+Local Configuration resides in user.cfg, whose location depends on your platform
 
 Launching the game
 ==================
 
-Just launch ultimate-smash-friends.py, by double clicking it or from a shell
-with ./ultimate-smash-friends.py in the ultimate smash friends path. Then use
-the menu to lauch a game.
+In a graphical desktop environment, the game may be launched by double-clicking
+on the 'ultimate-smash-friends' script.
+
+Alternatively, the game may be launched from a terminal by typing the following:
+python2 -m usf.main
+
+Or, from within the ultimate-smash-friends directory:
+./ultimate-smash-friends
 
 You can directly launch a game by passing level and player parameters, separate
 players name by a comma, like this:
 
 ./ultimate-smash-friends --level rizland --players xeon,blob
 
+
 (--level can be abreviated as -l and --players as -p)
 you can add an artificial intelligence player by adding "AI" before the name of
 the character, e.g:

usf/config.py

@@ -35,6 +35,7 @@
     where filename is an optional name for the config file (system.cfg by default)
 """
 
+from __future__ import with_statement
 import os
 import sys
 import platform