Tennix 1.1 "Classic Championship Tour 2011" releasedtennix-1.1
authorThomas Perl <m@thp.io>
Thu, 10 Feb 2011 11:38:50 +0000 (10 12:38 +0100)
committerThomas Perl <m@thp.io>
Thu, 10 Feb 2011 11:38:50 +0000 (10 12:38 +0100)
Updated artwork; re-enabled credits; multiplayer docs

17 files changed:
README
README.Multiplayer [deleted file]
credits.h
data/btnplay.png
data/btnquit.png
data/btnresume.png
data/cursor.png
data/cursor.svg
data/sidebar.png
data/tennix.svg
data/tennixlogo.png
game.c
graphics.cc
makefile
tennix.6
tennix.cc
tennix.h

diff --git a/README b/README
index 3c9d759..743a0e5 100644 (file)
--- a/README
+++ b/README
@@ -1,16 +1,17 @@
 
 
 
-          thpinfo.com presents
-          ****** *****  **   **  **   **  **  **   **
-            **   **     ***  **  ***  **  **  *** ***
-            ==   ====   == = ==  == = ==  ==    ===
-            ##   ##     ##  ###  ##  ###  ##  ### ###
-            ##   #####  ##   ##  ##   ##  ##  ##   ##
-                  2009 World Tennix Championship Tour
+                 thp.io presents...
+
+                 ****** *****  **   **  **   **  **  **   **
+                   **   **     ***  **  ***  **  **  *** ***
+                   ==   ====   == = ==  == = ==  ==    ===
+                   ##   ##     ##  ###  ##  ###  ##  ### ###
+                   ##   #####  ##   ##  ##   ##  ##  ##   ##
+                         Classic Championship Tour 2011
+
+               Copyright (C) 2003, 2007-2011 Thomas Perl <thp.io>
 
- Copyright (C) 2003, 2007, 2008, 2009 Thomas Perl <thp@thpinfo.com>
 
 
 LICENSE
@@ -69,6 +70,7 @@ INSTALLATION AND BUILD INSTRUCTIONS
      · SDL_image >= 1.2.6  (www.libsdl.org/projects/SDL_image)
      · SDL_mixer >= 1.2.8  (www.libsdl.org/projects/SDL_mixer)
      · SDL_ttf   >= 2.0.9  (www.libsdl.org/projects/SDL_ttf)
+     · SDL_net   >= 1.2.7  (www.libsdl.org/projects/SDL_net)
 
    (Tennix might compile and work with earlier versions of the respective
    libraries, but the versions here have been the ones that I've tested it
@@ -84,7 +86,7 @@ INSTALLATION AND BUILD INSTRUCTIONS
    command line:
 
     aptitude install libsdl1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev \
-                     libsdl-ttf2.0-dev python-dev
+                     libsdl-ttf2.0-dev libsdl-net1.2-dev python-dev
 
 
 PLAYING TENNIX
@@ -109,14 +111,32 @@ PLAYING TENNIX
 
    FUNCTION KEYS
 
-   Y  .... Make screenshot (save as screenshot.bmp)
    F  .... Toggle fullscreen (X11 only)
+   P  .... Pause game
+
+
+NETWORK MULTIPLAYER
+===================
+
+   This is done using two computers, the first is the faster one and the second
+   one is the slower one. If both computers are equally powerful, just chose
+   the faster one randomly.
 
-   Bonus (because you took the time to look at the README file):
-   Obviously, there are some hidden easter eggs that are still not available
-   via the UI, due to the fact that we didn't implement the UI for it yet :)
-   Think about [r]ain and fog (think fog[t], even..). Wind is also available,
-   but it's so broken, you'll have to look up the keys in game.c.
+   On the faster computer, use:
+     ./tennix -m REMOTEHOST
+
+   On the slower computer, use:
+     ./tennix -s REMOTEHOST
+
+   So, if your faster computer is called "fast.lan" and the slower computer is
+   called "slow.lan", you could use the following setup:
+
+     user@fast:~$ ./tennix -m slow.lan
+     user@slow:~$ ./tennix -s fast.lan
+
+   You have to configure each opponent in the input device selection screen
+   using "Network player" as input device. Make sure that you do the reverse
+   on the opposite computer.
 
 
 DEVELOPMENT/DEBUGGING
@@ -155,7 +175,6 @@ CREDITS
 CONTACT
 =======
 
-    E-Mail: Thomas Perl <thp@thpinfo.com>
+    E-Mail: Thomas Perl <m//thp.io>
     URL: http://icculus.org/tennix/
 
-
diff --git a/README.Multiplayer b/README.Multiplayer
deleted file mode 100644 (file)
index c4194eb..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-
-This is done using two computers, the first is the faster one
-and the second one is the slower one. If both computers are
-equally powerful, just chose the faster one randomly.
-
-On the faster computer, use:
-  ./tennix -m REMOTEHOST
-
-On the slower computer, use:
-  ./tennix -s REMOTEHOST
-
-So, if your faster computer is called "fast.lan" and the slower
-computer is called "slow.lan", you could use the following setup:
-
-  user@fast:~$ ./tennix -m slow.lan
-  user@slow:~$ ./tennix -s fast.lan
-
-     -- thp, Wed Aug  5 15:09:59 CEST 2009
-
index 262c73b..2c646ed 100644 (file)
--- a/credits.h
+++ b/credits.h
 #define CREDITS_OFFSET 500
 
 const char* credits_text[] = {
-    "Tennix 2009 World Tennis Championship Tour",
-    "Version " VERSION " (2009-02-24)",
+    "Tennix Classic Championship Tour 2011",
+    "Version " VERSION " (2011-02-10)",
     CREDITS_EMPTY_TEXT,
     "Code, graphics and idea by",
-    "Thomas Perl (thpinfo.com)",
+    "Thomas Perl (thp.io)",
     CREDITS_EMPTY_TEXT,
     "Public domain artwork by",
     "http://en.wikipedia.org/wiki/User:Ivan",
dissimilarity index 99%
index 4bbf921..cc7f888 100644 (file)
Binary files a/data/btnplay.png and b/data/btnplay.png differ
dissimilarity index 98%
index 4f3d02d..9839e8b 100644 (file)
Binary files a/data/btnquit.png and b/data/btnquit.png differ
dissimilarity index 98%
index 70bb044..82c15b9 100644 (file)
Binary files a/data/btnresume.png and b/data/btnresume.png differ
dissimilarity index 99%
index 021e2cf..2307d64 100644 (file)
Binary files a/data/cursor.png and b/data/cursor.png differ
index 6b8a2e9..f74bf69 100644 (file)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -13,7 +14,7 @@
    height="32"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.48.0 r9654"
    version="1.0"
    inkscape:export-filename="/home/thp/cursor.png"
    inkscape:export-xdpi="90"
        y1="20"
        x2="20"
        y2="12"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.94701252,-0.32119666,0.32119666,0.94701252,-2.9556229,4.684563)" />
     <filter
        inkscape:collect="always"
        id="filter4842"
      objecttolerance="10"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.9243098"
-     inkscape:cx="45.567901"
-     inkscape:cy="12.5"
+     inkscape:zoom="11.313708"
+     inkscape:cx="31.795486"
+     inkscape:cy="12.430234"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g4876"
      showgrid="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="725"
-     inkscape:window-x="0"
-     inkscape:window-y="25">
+     inkscape:window-width="1381"
+     inkscape:window-height="970"
+     inkscape:window-x="148"
+     inkscape:window-y="93"
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
        id="grid2383"
     <g
        id="g4876">
       <path
-         id="path4780"
-         d="M 7,1.15625 C 6.2474843,1.3374523 5.6740213,2.0224519 5.5625,2.78125 C 5.5647221,3.737414 5.7323392,4.6937557 5.9900292,5.6125973 C 7.2609088,9.7404913 8.732035,13.803075 10.104645,17.897329 C 10.365566,18.900748 10.744993,19.890365 10.83682,20.927304 C 10.933788,22.0534 10.972008,23.183273 10.90625,24.3125 C 10.994627,25.312091 10.392945,26.292269 10.71875,27.28125 C 11.16192,28.019689 12.115706,27.866722 12.8125,27.65625 C 13.753562,27.399762 14.640974,27.01284 15.544753,26.651187 C 16.228634,26.275859 17.489974,26.082738 17.647674,27.118895 C 17.576098,27.941145 17.148524,28.927509 17.901629,29.606326 C 18.532578,30.244403 19.532181,30.14569 20.333599,29.955663 C 21.222948,29.664322 22.098053,29.286177 22.897843,28.798728 C 23.772884,28.263687 24.297448,27.261846 24.34375,26.25 C 24.328624,25.385008 24.012229,24.547132 23.53125,23.84375 C 23.12982,23.401496 22.014992,23.036013 22.332949,22.326002 C 23.009333,21.713169 24.001094,21.883293 24.830113,21.694406 C 25.686904,21.537611 26.728282,20.702066 26.34375,19.75 C 25.709988,18.885475 24.863222,18.16176 23.928815,17.636395 C 22.928978,17.000765 22.019898,16.227095 21.035848,15.564755 C 20.113396,14.859806 19.177956,14.155199 18.40625,13.28125 C 17.497262,12.337683 16.554546,11.411534 15.868888,10.284379 C 14.69165,8.4859629 13.466469,6.7172012 12.196465,4.9837402 C 11.493694,4.0997067 10.708158,3.2843408 9.9283634,2.4695495 C 9.2733393,1.7480382 8.4044087,1.2002746 7.4118502,1.13806 C 7.274341,1.1030216 7.1372677,1.1473182 7,1.15625 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;filter:url(#filter4842)" />
-      <path
          sodipodi:nodetypes="cscssss"
          id="path2393"
-         d="M 7.125,2.15625 C 6.2924048,2.7733117 6.4886341,3.9582099 6.78125,4.8125 C 8.1213945,8.8935124 9.5018218,12.961302 10.858368,17.036685 C 11.203242,18.123671 11.525908,19.217358 11.84375,20.3125 C 11.977213,21.766206 12.071275,23.227675 12,24.6875 C 11.579353,25.418242 11.479366,27.010976 12.682807,26.9375 C 13.749353,26.849793 14.632213,26.112225 15.6875,25.9375 C 16.479252,25.664333 17.555395,25.164942 18.28125,25.8125 C 18.988113,26.503091 18.439537,27.523195 18.46875,28.3125 C 18.860029,29.237928 20.161296,29.064491 20.84375,28.5625 C 21.623186,28.193932 22.522287,27.857363 23,27.09375 C 23.512516,26.208613 23.332902,25.029817 22.629621,24.299924 C 21.988673,23.82912 21.093695,23.296582 21.125,22.375 C 21.295906,21.366356 22.455684,21.115587 23.319331,21.065552 C 24.035865,20.993323 25.18111,20.846629 25.09375,19.879693 C 24.714625,19.005763 23.690815,18.589481 22.951002,18.042051 C 21.55125,16.94559 20.086255,15.920019 18.831886,14.651101 C 17.558969,13.458204 16.368442,12.178363 15.296899,10.801072 C 14.416876,9.7360517 13.688258,8.5606424 12.91137,7.4220417 C 11.846626,5.9359029 10.735114,4.4643498 9.360245,3.2478524 C 8.7656277,2.665511 8.0332198,1.9763205 7.125,2.15625 z"
-         style="fill:url(#linearGradient4761);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.79999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         d="m 4.4844216,4.4380325 c -0.59028,0.8517919 -0.023863,1.9108772 0.527643,2.6259133 2.5799412,3.4343202 5.1937834,6.8431792 7.7874494,10.2668992 0.675736,0.918617 1.332593,1.850713 1.98535,2.785737 0.593316,1.33381 1.151813,2.687627 1.553206,4.092993 -0.163646,0.827132 0.253246,2.367586 1.369319,1.911462 0.981861,-0.42563 1.581036,-1.407688 2.524285,-1.91211 0.662059,-0.513 1.520777,-1.331583 2.416164,-0.95148 0.891224,0.426956 0.69937,1.569208 0.980557,2.307307 0.66779,0.750714 1.844399,0.168505 2.329454,-0.526089 0.619753,-0.599391 1.363108,-1.206914 1.570238,-2.083505 0.201056,-1.002854 -0.347666,-2.061497 -1.248121,-2.526824 -0.758207,-0.239986 -1.776811,-0.456843 -2.043174,-1.339647 -0.162123,-1.010093 0.855655,-1.620092 1.657468,-1.944876 0.655367,-0.29855 1.692811,-0.80532 1.299503,-1.692961 C 26.554024,14.745003 25.450755,14.679623 24.57431,14.398826 22.896547,13.810059 21.179769,13.309382 19.584294,12.5106 17.995671,11.789768 16.457146,10.960136 15,10 13.824526,9.274073 12.756978,8.3949757 11.655541,7.5662404 10.169872,6.5008406 8.6445986,5.4642753 6.9518456,4.7538404 6.2016895,4.3933449 5.2867243,3.9759198 4.4844216,4.4380325 z"
+         style="fill:url(#linearGradient4761);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.79999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
          id="path4776"
-         d="M 7,1.15625 C 6.2474843,1.3374523 5.6740213,2.0224519 5.5625,2.78125 C 5.5647221,3.737414 5.7323392,4.6937557 5.9900292,5.6125973 C 7.2609088,9.7404913 8.732035,13.803075 10.104645,17.897329 C 10.365566,18.900748 10.744993,19.890365 10.83682,20.927304 C 10.933788,22.0534 10.972008,23.183273 10.90625,24.3125 C 10.994627,25.312091 10.392945,26.292269 10.71875,27.28125 C 11.16192,28.019689 12.115706,27.866722 12.8125,27.65625 C 13.753562,27.399762 14.640974,27.01284 15.544753,26.651187 C 16.228634,26.275859 17.489974,26.082738 17.647674,27.118895 C 17.576098,27.941145 17.148524,28.927509 17.901629,29.606326 C 18.532578,30.244403 19.532181,30.14569 20.333599,29.955663 C 21.222948,29.664322 22.098053,29.286177 22.897843,28.798728 C 23.772884,28.263687 24.297448,27.261846 24.34375,26.25 C 24.328624,25.385008 24.012229,24.547132 23.53125,23.84375 C 23.12982,23.401496 22.014992,23.036013 22.332949,22.326002 C 23.009333,21.713169 24.001094,21.883293 24.830113,21.694406 C 25.686904,21.537611 26.728282,20.702066 26.34375,19.75 C 25.709988,18.885475 24.863222,18.16176 23.928815,17.636395 C 22.928978,17.000765 22.019898,16.227095 21.035848,15.564755 C 20.113396,14.859806 19.177956,14.155199 18.40625,13.28125 C 17.497262,12.337683 16.554546,11.411534 15.868888,10.284379 C 14.69165,8.4859629 13.466469,6.7172012 12.196465,4.9837402 C 11.493694,4.0997067 10.708158,3.2843408 9.9283634,2.4695495 C 9.2733393,1.7480382 8.4044087,1.2002746 7.4118502,1.13806 C 7.274341,1.1030216 7.1372677,1.1473182 7,1.15625 z"
-         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#484848;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         d="M 4.0448483,3.5311696 C 3.3904081,3.9444759 3.0673511,4.7773735 3.2054624,5.5317851 3.5146835,6.4365706 3.9805927,7.2884002 4.5197572,8.0757855 7.0491619,11.57675 9.7472251,14.951547 12.362165,18.387979 c 0.56939,0.866444 1.246574,1.681753 1.666596,2.634252 0.453529,1.035282 0.852635,2.093009 1.153065,3.183523 0.40476,0.918238 0.149789,2.039738 0.775988,2.871667 0.656872,0.556967 1.510986,0.105752 2.103256,-0.317375 0.808814,-0.545164 1.524927,-1.196617 2.264655,-1.829398 0.52709,-0.575101 1.659565,-1.163127 2.141719,-0.232526 0.19632,0.801671 0.108219,1.873105 1.039453,2.274059 0.802465,0.401608 1.717395,-0.01294 2.415312,-0.450314 0.748647,-0.56156 1.455923,-1.200749 2.056767,-1.919259 0.656822,-0.787751 0.831802,-1.904995 0.550649,-2.878098 -0.292157,-0.8143 -0.86091,-1.506154 -1.542327,-2.017776 -0.52221,-0.289882 -1.695358,-0.27792 -1.622301,-1.052436 0.443704,-0.797613 1.437557,-0.955054 2.161979,-1.40021 0.761029,-0.423686 1.478853,-1.549444 0.808896,-2.327552 -0.877863,-0.615154 -1.912216,-1.028543 -2.965856,-1.225942 -1.151021,-0.280805 -2.260431,-0.721487 -3.40508,-1.032657 C 20.864935,12.29663 19.752744,11.929818 18.741219,11.350047 17.577326,10.748441 16.387086,10.174164 15.375721,9.326965 13.683216,8.0019671 11.954834,6.7204517 10.195343,5.4867635 9.2458613,4.8753004 8.240056,4.3554502 7.2398725,3.8343001 6.3878095,3.3614114 5.3889815,3.12177 4.4290331,3.3816585 4.2875559,3.3926442 4.1719737,3.4786211 4.0448483,3.5311696 z"
+         style="fill:none;stroke:#484848;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
     </g>
   </g>
 </svg>
dissimilarity index 98%
index f1e4414..f89cfe7 100644 (file)
Binary files a/data/sidebar.png and b/data/sidebar.png differ
index 710e564..055d97e 100644 (file)
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    height="1052.3622047"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docbase="/home/thp/src/tennix/data"
+   inkscape:version="0.48.0 r9654"
    sodipodi:docname="tennix.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs4">
     <linearGradient
        inkscape:collect="always"
+       id="linearGradient4073">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4075" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4077" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
        id="linearGradient12186">
       <stop
          style="stop-color:#8ae234;stop-opacity:1;"
        fx="318.72839"
        fy="498.87436"
        r="13.081475" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3251"
+       id="radialGradient4069"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.49317376,0.65025823,-0.47658218,-0.33616337,980.71916,160.21106)"
+       cx="325.09344"
+       cy="571.14868"
+       fx="325.09344"
+       fy="571.14868"
+       r="14.484375" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3238"
+       id="radialGradient4071"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0472545,0.1070136,-0.3757488,1.0270592,172.3901,-47.607388)"
+       cx="318.72839"
+       cy="498.87436"
+       fx="318.72839"
+       fy="498.87436"
+       r="13.081475" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4073"
+       id="linearGradient4079"
+       x1="209.73761"
+       y1="558.97728"
+       x2="324.51552"
+       y2="558.97728"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4073"
+       id="linearGradient4091"
+       gradientUnits="userSpaceOnUse"
+       x1="209.73761"
+       y1="558.97728"
+       x2="324.51552"
+       y2="558.97728" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4073"
+       id="linearGradient4097"
+       gradientUnits="userSpaceOnUse"
+       x1="209.73761"
+       y1="558.97728"
+       x2="324.51552"
+       y2="558.97728" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4073"
+       id="linearGradient4099"
+       gradientUnits="userSpaceOnUse"
+       x1="209.73761"
+       y1="558.97728"
+       x2="324.51552"
+       y2="558.97728" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4073"
+       id="linearGradient4101"
+       gradientUnits="userSpaceOnUse"
+       x1="209.73761"
+       y1="558.97728"
+       x2="324.51552"
+       y2="558.97728" />
   </defs>
   <sodipodi:namedview
      id="base"
      objecttolerance="10"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.35355339"
-     inkscape:cx="366.56502"
-     inkscape:cy="479.03796"
+     inkscape:zoom="1"
+     inkscape:cx="503.9375"
+     inkscape:cy="632.3933"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="978"
-     inkscape:window-height="649"
-     inkscape:window-x="139"
-     inkscape:window-y="66" />
+     inkscape:window-width="1389"
+     inkscape:window-height="998"
+     inkscape:window-x="33"
+     inkscape:window-y="67"
+     showgrid="false"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata7">
     <rdf:RDF>
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1">
-    <g
+    <flowRoot
+       inkscape:export-ydpi="89.290001"
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-filename="/home/thp/path3617.png"
+       style="fill:#3465a4;fill-opacity:1;stroke:#000000;stroke-width:0.46239156;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       transform="matrix(1.7527903,0,0,2.4789423,34.098337,-1166.507)"
+       id="flowRoot4081"
+       xml:space="preserve"><flowRegion
+         style="stroke:url(#linearGradient4091);stroke-width:0.92478317"
+         id="flowRegion4083"><rect
+           style="fill:#3465a4;fill-opacity:1;stroke:#000000;stroke-width:0.46239156;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           y="540.36218"
+           x="207"
+           height="118"
+           width="286"
+           id="rect4085" /></flowRegion><flowPara
+         style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#3465a4;fill-opacity:1;stroke:#000000;stroke-width:0.46239156;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Chicago;-inkscape-font-specification:Chicago Bold"
+         id="flowPara4087">tennix</flowPara></flowRoot>    <g
        id="g5470"
        transform="translate(37.142136,-103.6518)"
        inkscape:export-filename="/home/thp/path3617.png"
          inkscape:export-xdpi="90.010986"
          inkscape:export-filename="/home/thp/path3617.png"
          transform="matrix(3.5418355,0,0,3.5418355,-892.23318,-1259.3868)"
-         d="M 355.06861 515.33984 A 23.359777 23.359777 0 1 1  308.34905,515.33984 A 23.359777 23.359777 0 1 1  355.06861 515.33984 z"
+         d="m 355.06861,515.33984 c 0,12.90125 -10.45853,23.35978 -23.35978,23.35978 -12.90125,0 -23.35978,-10.45853 -23.35978,-23.35978 0,-12.90125 10.45853,-23.35977 23.35978,-23.35977 12.90125,0 23.35978,10.45852 23.35978,23.35977 z"
          sodipodi:ry="23.359777"
          sodipodi:rx="23.359777"
          sodipodi:cy="515.33984"
          inkscape:export-xdpi="90.010986"
          inkscape:export-filename="/home/thp/path3617.png"
          transform="matrix(3.4149575,-1.4800143,1.7296772,6.1193859,-1634.7366,-2018.325)"
-         d="M 331.80987 498.87436 A 13.081475 12.020815 0 1 1  305.64692,498.87436 A 13.081475 12.020815 0 1 1  331.80987 498.87436 z"
+         d="m 331.80987,498.87436 c 0,6.63891 -5.85678,12.02081 -13.08148,12.02081 -7.2247,0 -13.08147,-5.3819 -13.08147,-12.02081 0,-6.63891 5.85677,-12.02082 13.08147,-12.02082 7.2247,0 13.08148,5.38191 13.08148,12.02082 z"
          sodipodi:ry="12.020815"
          sodipodi:rx="13.081475"
          sodipodi:cy="498.87436"
          sodipodi:cy="515.33984"
          sodipodi:rx="23.359777"
          sodipodi:ry="23.359777"
-         d="M 355.06861 515.33984 A 23.359777 23.359777 0 1 1  308.34905,515.33984 A 23.359777 23.359777 0 1 1  355.06861 515.33984 z"
+         d="m 355.06861,515.33984 c 0,12.90125 -10.45853,23.35978 -23.35978,23.35978 -12.90125,0 -23.35978,-10.45853 -23.35978,-23.35978 0,-12.90125 10.45853,-23.35977 23.35978,-23.35977 12.90125,0 23.35978,10.45852 23.35978,23.35977 z"
          transform="matrix(3.5418355,0,0,3.5418355,-892.23318,-1259.3868)" />
       <path
          inkscape:export-ydpi="90.010986"
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="-2.7165947"
-       inkscape:original="M 311.15625 711.71875 L 293.15625 733.71875 C 303.03889 759.21278 298.59906 788.18417 288.3125 812.78125 C 274.89075 834.2859 244.38166 838.1236 233.96875 862.3125 C 226.72634 873.85852 235.77611 890.8044 249.96875 888.40625 C 263.02629 888.21902 263.45209 863.94451 277.78125 872.625 C 289.23493 882.88817 280.01534 900.11145 282.375 913.34375 C 279.88742 932.07116 305.00797 932.1259 308.46875 916.125 C 313.15189 902.94671 312.1693 888.28987 316.875 875.28125 C 329.27759 854.25997 346.64449 834.2643 348 808.75 C 351.21412 794.64246 353.08821 779.5447 346.625 766 C 339.29269 746.15472 323.49925 731.26062 312.15625 713.96875 L 311.15625 711.71875 z "
+       inkscape:original="M 311.15625 711.71875 L 293.15625 733.71875 C 303.0389 759.21279 298.59906 788.18417 288.3125 812.78125 C 274.89074 834.2859 244.38166 838.1236 233.96875 862.3125 C 226.72635 873.85853 235.77611 890.8044 249.96875 888.40625 C 263.02628 888.21905 263.45209 863.94451 277.78125 872.625 C 289.23492 882.88818 280.01534 900.11145 282.375 913.34375 C 279.88741 932.07115 305.00797 932.1259 308.46875 916.125 C 313.15188 902.9467 312.1693 888.28987 316.875 875.28125 C 329.27758 854.25996 346.64449 834.2643 348 808.75 C 351.21413 794.64249 353.08821 779.5447 346.625 766 C 339.29269 746.15471 323.49925 731.26062 312.15625 713.96875 L 311.15625 711.71875 z "
        xlink:href="#path2478"
        style="fill:url(#linearGradient4464);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="path2482"
     <path
        sodipodi:type="inkscape:offset"
        inkscape:radius="-3.453589"
-       inkscape:original="M 305.3125 624.09375 C 300.11076 624.24165 294.92314 624.89897 289.96875 625.875 C 271.34993 626.6801 249.18498 635.66679 244.875 655.75 C 242.17454 673.55976 263.62768 677.28717 273.65625 687.03125 C 285.04237 694.99115 291.82801 715.54282 277.15625 723.71875 C 258.91556 736.12766 252.0182 730.60035 231.625 734.09375 C 212.21065 733.82799 202.38876 758.91069 220.6875 769.25 C 235.56677 781.95622 253.85077 772.41849 267.84375 763.84375 C 289.10505 751.70481 296.69168 741.37613 321.5625 742.125 C 334.97838 739.63956 336.83289 749.04138 329.5625 759 C 316.22252 776.13135 285.13361 767.95837 267.625 778.8125 C 250.29312 787.36955 256.94562 812.90152 275.96875 812.3125 C 297.98542 810.56536 318.79526 800.18464 335.875 786.5 C 356.2928 771.05002 395.6859 758.60034 384.25 733.34375 C 377.59859 718.67627 360.22672 718.05151 347.40625 712.21875 C 334.0362 706.44796 340.1177 695.56863 349.46875 689.75 C 362.29881 675.8458 361.07557 652.81774 347.1875 640.03125 C 336.72134 627.62902 320.91771 623.65006 305.3125 624.09375 z "
+       inkscape:original="M 305.3125 624.09375 C 300.11076 624.24165 294.92314 624.89897 289.96875 625.875 C 271.34993 626.6801 249.18498 635.66677 244.875 655.75 C 242.17454 673.55976 263.62769 677.28717 273.65625 687.03125 C 285.04237 694.99115 291.82802 715.54283 277.15625 723.71875 C 258.91556 736.12766 252.0182 730.60033 231.625 734.09375 C 212.21065 733.82799 202.38875 758.91067 220.6875 769.25 C 235.56677 781.95622 253.85077 772.41851 267.84375 763.84375 C 289.10505 751.70481 296.69167 741.37616 321.5625 742.125 C 334.97838 739.63956 336.83288 749.04137 329.5625 759 C 316.22252 776.13135 285.1336 767.95837 267.625 778.8125 C 250.29312 787.36955 256.94561 812.90152 275.96875 812.3125 C 297.98542 810.56536 318.79526 800.18465 335.875 786.5 C 356.2928 771.05002 395.68591 758.60032 384.25 733.34375 C 377.59859 718.67627 360.22672 718.05151 347.40625 712.21875 C 334.0362 706.44796 340.11771 695.56864 349.46875 689.75 C 362.29881 675.8458 361.07557 652.81774 347.1875 640.03125 C 336.72134 627.62902 320.91771 623.65006 305.3125 624.09375 z "
        xlink:href="#path2460"
        style="fill:url(#linearGradient4438);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        id="path3461"
          style="font-size:40px;font-weight:bold;fill:#4e9a06;stroke:#000000;stroke-width:0.76856291;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Impact">tennix</flowPara></flowRoot>    <flowRoot
        xml:space="preserve"
        id="flowRoot3545"
-       transform="matrix(3.0087945,0,0,1.6023708,-401.91374,-436.0202)"
-       style="fill:#4e9a06;stroke:#000000;stroke-width:0.91086125;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       transform="matrix(1.7527903,0,0,2.4789423,33.098337,-1167.4361)"
+       style="fill:#3465a4;fill-opacity:1;stroke:url(#linearGradient4079);stroke-width:0.46239156;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        inkscape:export-filename="/home/thp/path3617.png"
-       inkscape:export-xdpi="44.34071"
-       inkscape:export-ydpi="44.34071"><flowRegion
-         id="flowRegion3547"><rect
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-ydpi="89.290001"><flowRegion
+         id="flowRegion3547"
+         style="stroke:url(#linearGradient4099);stroke-width:0.92478317"><rect
            id="rect3549"
            width="286"
            height="118"
            x="207"
            y="540.36218"
-           style="fill:#4e9a06;stroke:#000000;stroke-width:0.91086125;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></flowRegion><flowPara
+           style="fill:#3465a4;fill-opacity:1;stroke:url(#linearGradient4097);stroke-width:0.46239156;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></flowRegion><flowPara
          id="flowPara3551"
-         style="font-size:40px;font-weight:bold;fill:#4e9a06;stroke:#000000;stroke-width:0.91086125;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Impact">tennix</flowPara></flowRoot>    <path
+         style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#3465a4;fill-opacity:1;stroke:url(#linearGradient4101);stroke-width:0.46239156;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Chicago;-inkscape-font-specification:Chicago Bold">tennix</flowPara></flowRoot>    <path
        style="opacity:0.82722515;color:#000000;fill:#3465a4;fill-opacity:1;fill-rule:evenodd;stroke:#204a87;stroke-width:3.37861681;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
        d="M 115.5504,698.24394 C 104.34486,718.92224 119.69595,748.95493 149.81628,765.28111 C 153.48437,767.26938 157.17319,768.94728 160.89623,770.35142 C 177.60136,775.67074 195.71661,770.95299 206.87909,758.43767 L 274.48862,795.08428 C 274.94493,795.33165 275.54696,795.14568 275.8175,794.6465 L 283.80314,779.91015 C 284.07369,779.41095 283.90088,778.80492 283.44448,778.55757 L 215.83491,741.9109 C 220.22561,725.72516 214.28839,707.97004 200.71246,696.87616 C 197.50371,694.52298 194.08426,692.34799 190.41617,690.35976 C 160.29583,674.03355 126.75602,677.56566 115.5504,698.24394 z M 123.25011,702.41743 C 127.27733,694.98575 135.46483,690.19247 146.95055,688.98285 C 158.43629,687.77327 172.72895,690.52785 186.33006,697.9001 C 189.55908,699.65033 192.54166,701.5884 195.36285,703.6425 C 208.2104,714.26579 212.42359,732.09015 204.60657,746.51534 C 196.78955,760.94055 179.55739,767.14084 163.6442,762.17485 C 160.38326,760.93226 157.13143,759.49103 153.90241,757.74078 C 140.3013,750.36853 130.19102,739.89588 124.93403,729.61119 C 119.67706,719.32651 119.22285,709.84918 123.25011,702.41743 z "
        id="path3613"
          inkscape:radius="-1.1866233"
          sodipodi:type="inkscape:offset" />
     </g>
+    <text
+       xml:space="preserve"
+       style="font-size:38.55387878px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       x="402.88803"
+       y="277.69254"
+       id="text4035"
+       sodipodi:linespacing="125%"
+       transform="scale(1.0375091,0.963847)"
+       inkscape:export-filename="/home/thp/path3617.png"
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-ydpi="89.290001"><tspan
+         sodipodi:role="line"
+         id="tspan4037"
+         x="402.88803"
+         y="277.69254"
+         style="font-size:11.56616497px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Chicago;-inkscape-font-specification:Chicago">Classic Championship Tour 2011</tspan></text>
+    <path
+       transform="matrix(0.45364749,0,0,0.42148376,406.82243,-34.300228)"
+       d="m 355.06861,515.33984 a 23.359777,23.359777 0 1 1 -46.71956,0 23.359777,23.359777 0 1 1 46.71956,0 z"
+       sodipodi:ry="23.359777"
+       sodipodi:rx="23.359777"
+       sodipodi:cy="515.33984"
+       sodipodi:cx="331.70883"
+       id="path4045"
+       style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1.58442008;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/thp/path3617.png"
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-ydpi="89.290001" />
+    <path
+       id="path4047"
+       d="m 549.48297,189.32797 c 5.82271,-0.54045 10.09473,-5.53782 9.53432,-11.15314 -0.18732,-1.87688 -0.901,-3.58125 -1.97208,-5.00566 -0.33497,4.1e-4 -0.66132,0.007 -1.00145,0.0383 -5.82269,0.54045 -10.09474,5.53783 -9.53433,11.15313 0.18763,1.87987 0.89815,3.57991 1.97211,5.00564 0.33034,-8.9e-4 0.66606,-0.006 1.00143,-0.0383 z"
+       style="color:#000000;fill:url(#radialGradient4069);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/thp/path3617.png"
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-ydpi="89.290001" />
+    <path
+       transform="matrix(0.43739656,-0.17612382,0.2215416,0.72821586,311.72069,-124.615)"
+       d="m 331.80987,498.87436 a 13.081475,12.020815 0 1 1 -26.16295,0 13.081475,12.020815 0 1 1 26.16295,0 z"
+       sodipodi:ry="12.020815"
+       sodipodi:rx="13.081475"
+       sodipodi:cy="498.87436"
+       sodipodi:cx="318.72839"
+       id="path4049"
+       style="opacity:0.83769633;color:#000000;fill:url(#radialGradient4071);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+       sodipodi:type="arc"
+       inkscape:export-filename="/home/thp/path3617.png"
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-ydpi="89.290001" />
+    <path
+       sodipodi:nodetypes="cssssssssssssssssssssssscsssssssssssssssscssssssssssssssscsssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssc"
+       id="path4051"
+       d="m 557.82011,174.25899 c 1.8e-4,0.0388 -0.0207,0.15359 -0.0565,0.41902 -0.0188,0.13968 0.0375,-0.27935 0.0565,-0.41902 0.21343,-1.58645 -0.41248,1.64026 0.39461,0.89041 0.86118,-0.80012 0.0254,1.94333 0.95839,0.20952 0.18915,-0.35151 -0.0105,1.90423 0.62011,0.73328 1.01352,-1.88333 0.30083,-0.0697 0.90198,1.04754 0.17306,0.32157 0.37583,0.62855 0.56376,0.94282 0.22372,0.37415 -0.0758,-0.87424 -0.28187,-1.25707 -0.10569,-0.19638 0.012,1.86069 1.07111,1.20469 0.6867,-0.42535 1.63686,1.19056 1.69123,1.51896 0.0643,0.38778 0.24149,-0.75932 0.451,-1.09994 0.0857,-0.13934 0.6765,3.35935 0.6765,1.36181 0,-2.5101 0.62523,-0.89514 0.33824,0.83805 -0.0582,0.35196 0.15034,0.69837 0.2255,1.04754 0.35037,1.6276 -4.02955,-2.64013 -3.66433,-3.7712 1.4746,-4.56684 3.28958,5.02233 3.15696,5.76157 -0.0539,0.30074 -0.15032,0.59361 -0.2255,0.89041 -0.0473,0.18696 0.0405,-0.38783 0,-0.57615 -0.10418,-0.48391 -0.93974,4.2257 -0.56372,2.82839 0.17591,-0.65379 0.24692,-1.36009 0.62009,-1.93796 0.12716,-0.19692 -0.0752,0.45393 -0.11274,0.6809 -0.17987,1.08635 -0.10253,-1.74048 0.62013,-0.73328 0.0699,0.0974 0.11274,0.2095 0.16911,0.31427 0.12025,0.22337 0.29046,-0.66842 0.45101,-1.41421 -0.4517,0.1985 -0.33825,2.83557 -0.33825,1.15232 0,-0.17461 0,-0.34919 0,-0.52379 0,-0.27271 -0.41395,0.40183 -0.6765,0.52379 -1.74714,0.81163 -4.08701,-5.57764 -3.66435,-3.61407 0.63873,2.96723 -0.66103,1.12357 0.62013,-1.25706 0.73092,-1.35819 -0.73675,4.83676 -0.28188,2.72364 0.27984,-1.30001 0.20958,-2.04049 1.01475,-3.03791 0.30436,-0.37705 -0.4079,4.06389 0.39463,2.19986 1.32991,-3.08908 0.28406,2.92494 0.67648,1.46658 0.31512,-1.17113 0.31841,-2.75532 -0.11274,-3.82356 -0.25708,-0.63694 -1.63407,-3.51155 -2.19862,-1.93798 -0.55349,1.54272 -0.317,2.36304 -0.16912,1.67608 0.10734,-0.49855 -0.33229,0.97026 -0.45101,1.46657 -0.2972,1.24258 -1.086,2.78385 -1.35297,1.04756 -0.21892,-1.42373 0.46261,-3.33771 -0.45101,-2.82839 -0.48474,0.27021 0.11184,-1.09877 0.45101,-1.51896 0.92659,-1.14788 -0.33827,1.36742 -0.33827,2.40936 -0.1663,-1.11869 -0.33824,-2.22402 -0.33824,-3.35217 0,-0.7658 -0.59067,1.43844 -1.01472,2.09513 -0.10284,0.15914 -0.26311,0.27935 -0.39465,0.41901 -0.61876,0.657 0.8604,-4.00815 -0.73286,-1.04754 -0.2255,0.41903 -0.451,0.83803 -0.6765,1.25705 -0.0158,0.0292 -0.33826,-1.81628 -0.33826,-2.04273 0,-1.91394 0.20977,-1.18312 -0.56374,0.73327 -0.10328,0.25589 -0.26306,0.48887 -0.39462,0.73331 -0.044,0.0818 -0.22145,-1.53772 0.0564,-2.8284 0.32399,-1.50511 -0.50593,1.35916 -0.84561,1.99036 -1.00656,1.87038 -0.15673,-2.81638 -0.0565,-3.14266 0.23403,-0.76107 -1.93115,5.26562 -1.46575,2.67126 0.58377,-3.25433 -0.52548,1.26267 -2.19861,1.78086 -0.13586,0.0422 1.06595,-3.7424 0.67649,-1.57136 -0.45004,2.50881 0.56375,0.35338 0.56375,1.99037 0,0.52492 0.0752,1.04753 0.11275,1.57133 0,-1.90501 0,-0.73331 0,-0.41902 0,3.12746 -0.28188,2.83392 -0.28188,0.10472 0,-0.29785 -0.38093,0.62919 -0.50738,0.83805 -0.17351,0.28661 0.21492,-2.13274 -0.45098,-1.20468 -0.19608,0.27325 -0.6765,2.81358 -0.6765,1.04754 0,-1.95469 -0.45102,1.8369 -0.45102,-0.0523 0,-0.39813 -0.22548,-0.7682 -0.33822,-1.1523 -0.12896,-0.43926 -1.53702,4.27024 -0.62013,2.5665 0.33159,-0.61617 4.20618,-7.00555 3.15698,-2.61888 -0.0982,0.41045 -0.0752,0.83802 -0.11275,1.25705 -0.003,0.0363 1.4839,-1.66759 1.52211,-1.72843 0.0904,-0.14398 -0.21661,3.0131 0.16913,1.93795 1.06993,-2.98222 0.99178,-5.10762 1.2966,-0.57616 0.0378,0.56303 0.50971,-1.0289 0.6765,-1.57132 0.55594,-1.80786 1.91674,-1.80844 1.91674,-0.10474 0,0.7646 -0.4279,2.34627 0.78924,1.78085 0.26134,-0.12133 0.26907,-3.4879 0.78924,-0.10473 0.36739,2.38928 2.72664,-3.71727 0.451,-3.24743 -0.24539,0.0507 -2.56901,-2.48972 -2.70597,-2.776 -0.24573,-0.51367 0.11274,-0.003 0.11274,-0.57616 0,-0.13486 2.45731,0.12329 2.70599,0.26189 0.79386,0.44254 1.40937,-1.15086 1.40937,1.41419 0,1.19253 -1.35545,2.20304 0.0564,0.36664 0.9159,-1.19136 -1.18702,4.40558 -0.22549,2.61889 0.25741,-0.47835 1.07112,-4.64714 1.07112,-0.73328 0,2.99088 0.95837,0.84172 0.95837,1.78082 0,4.30035 0.0564,-1.64916 0.0564,1.46657 0,0.99602 -0.11889,2.89231 -0.67649,3.92833 -0.52647,0.97827 -2.37696,2.73914 -3.38248,1.57134 -1.53935,-1.78779 -2.8697,-2.43827 -1.18387,-4.45211 1.92696,-2.30185 -0.55354,2.25712 -0.90199,2.98552 -1.18081,2.46845 -0.22433,-1.99904 -0.11275,-2.82838 0.0442,-0.32871 0.22549,-0.62854 0.33825,-0.94281 0.61398,-1.71135 -1.86604,3.85239 0,2.98553 0.0549,-0.0255 -2.30847,-0.31427 -2.48048,-0.31427 -1.48622,0 -2.87511,-2.64204 -2.87511,-0.47138 0,1.54225 -0.69695,1.5286 -0.95838,0.31428 -0.95604,-4.44133 -1.01474,3.10475 -1.01474,-0.31428 0,-0.33218 0.1546,0.67578 0.0564,0.99517 -0.60171,1.95663 0.14291,-2.70782 1.97311,-0.15715 0.34649,0.48291 1.94515,1.17914 1.74762,0.62854 -0.39009,-1.08724 -0.46929,0.71274 -0.50738,0.94281 -0.079,0.47727 0.21219,-0.94574 0.33823,-1.4142 0.13917,-0.51719 0.91625,-2.76739 1.69126,-3.24742 0.85354,-0.52868 -0.1811,1.9089 -0.451,2.82839 -0.16505,0.5622 -0.18793,1.15231 -0.28187,1.72847 -0.1614,0.98954 -0.21509,-1.71439 0.56374,-2.61889 1.61017,-1.87003 0.45615,1.99994 0.90198,2.82839 0.65991,1.22622 -0.36336,-1.65273 0.78926,-2.72363 1.0184,-0.94618 -1.07374,2.88139 0.50737,2.51413 0.49593,-0.1152 0.30066,-0.90788 0.451,-1.36182 0.14877,-0.44902 0.75166,-0.62851 1.12749,-0.94279 0.36027,-0.30125 -0.35322,1.72415 0.50737,2.72362 0.41685,0.48415 -0.30913,-1.68284 0.33824,-1.8332 0.0471,-0.0112 1.06886,-3.59931 0.62013,-0.68092 -0.0584,0.38025 0,0.76819 0,1.15232 0,0.531 0.28187,-1.04033 0.28187,-1.57134 0,-0.3439 0.66359,0.31028 1.01474,0.41902 1.44581,0.44777 1.29662,-4.83346 1.29662,-1.04754 0,0.14815 0.2255,-0.20952 0.33824,-0.31427 0.56765,-0.52742 0.35045,1.46591 0.6765,2.14748 0.41595,0.8695 -0.33027,0.80061 0.95837,1.09994 1.22928,0.28553 0.45034,1.49366 1.40937,0.15713 1.25333,-1.74672 0.52286,-0.65733 0.33824,-0.31429 -0.11425,0.21242 0.16351,-0.45051 0.22552,-0.6809 0.13075,-0.48591 0.20353,-1.07071 0.33823,-1.57133 0.12236,-0.45449 -0.2731,0.97599 -0.67651,1.25707 -1.61689,1.12671 -6.37032,-2.4964 -6.37032,0.26188 0,1.37581 0.451,2.82072 0.451,4.24259 0,0.76901 4.2281,0.71661 4.2281,-0.0524 0,-0.46966 -0.94177,-2.72972 -0.6765,-1.99035 0.14472,0.40335 -0.30068,0.80312 -0.45098,1.20468 -0.0266,0.0709 0.0563,-2.95828 0.0563,-1.57134 0,2.11426 -1.35299,3.86421 -1.35299,0.62856 0,-0.36712 -0.43079,1.31336 -0.78924,0.31424 -0.65517,-1.82616 0.14517,-4.63216 -1.35298,-1.15229 -2.15593,5.00763 -1.24026,1.16941 -1.24026,-1.46658 0,-0.52023 -0.73287,5.92898 -0.73287,2.93316 0,-3.64658 0.24804,4.53327 -3.3261,2.04271 -0.77508,-0.54011 -0.43309,-4.16803 -1.12748,-5.02825 -0.12415,-0.15377 -3.79804,1.18523 -2.48049,2.40937 0.46703,0.43393 0.0186,-1.46703 0.45098,-0.26188 0.0718,0.20012 0.15595,-0.40063 0.28189,-0.57616 0.58528,-0.81564 -0.79778,-0.85006 0.50737,-0.15714 0.82693,0.43903 1.35299,-3.97013 1.35299,-4.13782 0,-1.04318 0.73287,3.94949 0.73287,2.25223 0,-0.11185 0.15033,-0.17459 0.2255,-0.26189 0.48257,-0.56044 0.15951,1.91502 0.56376,3.98073 0.36148,1.84719 0.15291,3.32268 0.50735,1.67607 0.3993,-1.8549 4.26843,-7.84173 1.97312,-5.70917 -0.49464,0.45957 -0.0854,5.3409 0.11275,5.70917 1.47407,2.73906 1.34876,-2.15207 1.52212,-3.03791 0.29535,-1.50925 0.53629,-4.99637 1.24024,-5.81392 0.43433,-0.50444 0,1.29198 0,1.93796 0,1.61557 -0.0156,4.36189 0.62011,5.29015 0.70978,1.03627 -0.11274,-1.06337 -0.11274,-2.61887 0,-1.70079 0.35822,-4.94207 1.46575,-5.97105 0.36704,-0.34104 0.0636,1.84925 -0.11274,3.98071 -0.0585,0.70816 0.0218,4.16814 0.56374,4.92348 0.26121,0.36404 -0.34349,-0.84292 -0.6765,-1.1523 -1.61637,-1.50177 -2.66314,-3.08121 -4.62271,-4.29497 -1.16634,-0.72243 0.96915,-1.9272 1.74761,-2.40937 1.34111,-0.8307 -0.56394,3.24867 -0.90199,5.44726 -0.40189,2.61365 -2.19863,-5.60322 -2.19863,-5.97103 0,-0.33173 0,-0.66346 0,-0.99519 0,-0.68254 -0.34135,0.49855 -0.62011,1.36181 -0.74293,2.30086 -0.89211,4.12584 -1.24023,6.39007 -0.13766,0.89492 -0.56375,1.51524 -0.56375,2.67126"
+       style="opacity:0.71204188;fill:none;stroke:#8ae234;stroke-width:0.20784581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/thp/path3617.png"
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-ydpi="89.290001" />
+    <path
+       sodipodi:nodetypes="cs"
+       id="path4053"
+       d="m 567.47747,181.54594 c -6.90567,4.25221 -7.76864,9.26599 -7.96913,10.83976"
+       style="color:#000000;fill:none;stroke:#555753;stroke-width:1.44695294;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/thp/path3617.png"
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-ydpi="89.290001" />
+    <path
+       sodipodi:nodetypes="csc"
+       id="path4055"
+       d="m 547.83414,187.09468 c 4.92538,-0.84659 8.66761,-4.85671 8.66759,-9.67677 0,-1.41533 -0.32245,-2.76407 -0.90199,-3.9807"
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.44695294;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/thp/path3617.png"
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-ydpi="89.290001" />
+    <path
+       transform="matrix(0.45099707,0,0,0.4190211,495.50539,33.164793)"
+       id="path4057"
+       d="m 126.92101,345.22337 c 6.49098,0.67479 -7.08524,2.33238 1.25,6.5 4.38455,2.19227 -4.24177,2.50823 -0.75,6 2.00071,2.00071 -1.50958,3.02692 -3.25,3.375 -1.11144,0.22229 1.83333,1.33334 2.75,2 5.2259,3.80065 7.56571,2.15793 2.5,4 -3.44947,1.25435 -7.33333,0.33334 -11,0.5 -1.59044,0.0723 3.22506,0.0425 4.75,0.5 3.93027,1.17908 7.25603,0.76944 3.625,2.75 -1.55019,0.84556 3.38639,1.03284 5,1.75 4.5255,2.01133 2.6434,-1.92992 7.375,-4 0.5163,-0.22588 -0.60707,-0.13393 -6.75,0.25 -0.73637,0.046 -16.73071,1.24228 -11.75,-0.75 9.11436,-3.64574 18.34876,-5.26519 28,-6.75 0.88812,-0.13663 -8.15863,-0.74347 -8.25,-0.75 -14.59208,-1.04229 -7.69603,-1.85795 -5,-7.25 0.80617,-1.61233 -15.95024,-4.5 -10.5,-4.5 2.94214,0 5.91005,-0.5 8.875,-0.5 2.6396,0 -14.6177,0.77943 -7,-1.125 2.40893,-0.60223 26.9441,-2.32446 9.625,-0.75 -2.6609,0.2419 -5.33333,0.33334 -8,0.5 -1.35456,0.0847 2.61486,-0.74594 3.875,-1.25 5.49931,-2.19972 25.97716,-1 17.125,-1 -1.94365,0 -3.33333,2 -5,3 -2.60957,1.56574 -10.0398,4.21974 -12.5,7.5 -2.53673,3.38231 5.55925,-1.18641 9.5,-2.5 1.54161,-0.51387 3.25,0 4.875,0 1.50231,0 -2.6877,1.43771 -3.75,2.5 -4.57594,4.57595 3.71684,2.78316 -3.25,9.75 -0.0417,0.0417 0.0833,0.0833 0.125,0.125 0.97539,0.97539 -2.5,1.16667 -3.75,1.75 -5.72318,2.67082 2.89464,3.03928 3.5,4.25"
+       style="opacity:0.49214663;fill:none;stroke:#ce5c00;stroke-width:0.6374926;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3331)"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/thp/path3617.png"
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-ydpi="89.290001" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:none;stroke:#2e3436;stroke-width:3.30906105;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       id="path4059"
+       sodipodi:cx="331.70883"
+       sodipodi:cy="515.33984"
+       sodipodi:rx="23.359777"
+       sodipodi:ry="23.359777"
+       d="m 355.06861,515.33984 a 23.359777,23.359777 0 1 1 -46.71956,0 23.359777,23.359777 0 1 1 46.71956,0 z"
+       transform="matrix(0.45364749,0,0,0.42148376,406.82243,-34.300228)"
+       inkscape:export-filename="/home/thp/path3617.png"
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-ydpi="89.290001" />
+    <path
+       sodipodi:nodetypes="cs"
+       id="path4061"
+       d="m 566.3035,180.72667 c -6.90569,4.2522 -7.76864,9.266 -7.96916,10.83976"
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.44695294;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/thp/path3617.png"
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-ydpi="89.290001" />
+    <path
+       sodipodi:nodetypes="csc"
+       id="path4063"
+       d="m 549.26854,187.41115 c 4.92537,-0.84662 8.66759,-4.8567 8.66759,-9.67676 0,-1.41533 -0.32247,-2.76409 -0.902,-3.98071"
+       style="color:#000000;fill:none;stroke:#555753;stroke-width:1.44695294;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/thp/path3617.png"
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-ydpi="89.290001" />
+    <path
+       transform="matrix(0.45364749,0,0,0.42148376,406.82243,-34.300228)"
+       d="m 331.71875,494.9375 c -11.28417,0 -20.40626,9.12208 -20.40625,20.40625 0,11.28417 9.11727,20.37498 20.40625,20.375 11.28897,0 20.37501,-9.08603 20.375,-20.375 0,-11.28897 -9.09083,-20.40626 -20.375,-20.40625 z"
+       id="path4065"
+       style="opacity:0.82722515;color:#000000;fill:none;stroke:#eeeeec;stroke-width:3.30906105;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+       inkscape:original="M 331.71875 491.96875 C 318.82415 491.96875 308.34374 502.44915 308.34375 515.34375 C 308.34375 528.23835 318.82415 538.68748 331.71875 538.6875 C 344.61335 538.6875 355.06251 528.23835 355.0625 515.34375 C 355.0625 502.44915 344.61335 491.96874 331.71875 491.96875 z "
+       inkscape:radius="-2.9720924"
+       sodipodi:type="inkscape:offset"
+       inkscape:export-filename="/home/thp/path3617.png"
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-ydpi="89.290001" />
+    <path
+       sodipodi:nodetypes="csssssss"
+       id="path4067"
+       d="m 568.62347,176.04798 c 4.81462,-1.55689 6.30203,-2.72081 7.91889,-3.43506 4.75059,-2.09856 8.53188,-2.62697 -1.81816,-0.59494 -0.97304,0.19104 -1.92549,0.36707 -2.82826,0.71393 -12.05067,4.63006 2.9405,-1.75839 3.83834,-4.40253 0.70612,-2.07947 -20.1005,10.85827 -5.85852,-0.35699 3.33835,-2.62889 6.64668,-4.67233 -2.22219,-1.18986 -3.10178,1.21796 -4.13437,2.65655 -6.03301,4.4586"
+       style="fill:none;stroke:#616161;stroke-width:1.44695318px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/thp/path3617.png"
+       inkscape:export-xdpi="89.290001"
+       inkscape:export-ydpi="89.290001" />
   </g>
 </svg>
dissimilarity index 99%
index c1a67e2..666335b 100644 (file)
Binary files a/data/tennixlogo.png and b/data/tennixlogo.png differ
diff --git a/game.c b/game.c
index 929dd41..967263c 100644 (file)
--- a/game.c
+++ b/game.c
@@ -240,7 +240,7 @@ void gameloop(GameState *s, TennixNet* c) {
     }
 
     clear_screen();
-    rectangle(0, 0, WIDTH, HEIGHT, 80, 80, 80);
+    //rectangle(0, 0, WIDTH, HEIGHT, 80, 80, 80);
     store_screen();
 
     stop_sample(SOUND_AUDIENCE);
@@ -483,7 +483,7 @@ void render(const GameState* s, RenderState* r) {
 
     if( s->winner != WINNER_NONE) {
         clear_screen();
-        rectangle(0, 0, WIDTH, HEIGHT, 80, 80, 80);
+        //rectangle(0, 0, WIDTH, HEIGHT, 80, 80, 80);
         store_screen();
         show_sprite( GR_RACKET, 2*(s->winner-1), 4, WIDTH/2 - get_image_width( GR_RACKET)/8, HEIGHT/2 - get_image_height( GR_RACKET), 255);
         /*sprintf( s->game_score_str, "player %d wins the match with %s", s->winner, format_sets( s));
@@ -514,7 +514,7 @@ void render(const GameState* s, RenderState* r) {
             r->ec_sets = s->ec_sets;
         }
         clear_screen();
-        rectangle(0, 0, WIDTH, HEIGHT, 80, 80, 80);
+        //rectangle(0, 0, WIDTH, HEIGHT, 80, 80, 80);
         fill_image(s->location->court_type, 120, 120, 400, 250);
         show_image(GR_COURT, 0, 0, 255);
         font_draw_string(FONT_XLARGE, r->text_game, 14, 14);
index 486819d..49937a8 100644 (file)
@@ -435,7 +435,7 @@ void draw_button_object(MenuButton* b, int mx, int my)
     if (b->image_id == GR_COUNT) {
         draw_button_text(b->text, b->x, b->y, b->w, b->h, b->r, b->g, b->b, M_POS_BUTTON(*b, mx, my));
     } else {
-        show_image_rotozoom(b->image_id, b->x+b->w/2, b->y+b->h/2, 0.0, 1.0+0.2*M_POS_BUTTON(*b, mx, my));
+        show_image_rotozoom(b->image_id, b->x+b->w/2, b->y+b->h/2, 0.0, 1.0-0.2*!M_POS_BUTTON(*b, mx, my));
     }
 }
 
index 56ac8a4..19a25b3 100644 (file)
--- a/makefile
+++ b/makefile
@@ -27,7 +27,7 @@ ifeq ($(MKCALLGRAPH),1)
   LD        =  nccld
 endif
 
-RELEASE   =  1.0
+RELEASE   =  1.1
 
 UNAME = $(shell uname)
 
index 4e1be6d..5ab16f5 100644 (file)
--- a/tennix.6
+++ b/tennix.6
@@ -1,7 +1,7 @@
-.TH "TENNIX" "6" "February 2009" "Tennix 2009 Edition"
+.TH "TENNIX" "6" "February 2011" "Tennix 2011 Edition"
  
 .SH "NAME"
-tennix \(em A funny 2D tennis game
+tennix \(em A funny 2D tennis game with network play support
 
 .SH "SYNOPSIS"
 .B tennix
@@ -14,13 +14,17 @@ features a two-player game mode and a single-player mode against the
 computer.  
 .PP 
 This is the SDL port of a DOS game written in 2003. The original game can 
-still be found on the web at http://thpinfo.com/2003/tennix/
+still be found on the web at http://thp.io/2003/tennix/
 
 .SH "CONTROLS"
 .PP
 You can select the controls directly in the menu. Usually, in two-player
 game mode, player 1 plays using W, S, D, E, F and player 2 plays using
 O, L, K, I, J. You can also play using mouse, gamepad or Joystick.
+.PP
+When using network play, you have to configure your opponent with the
+input device "Network player", and make sure that the opponent does the
+same thing (but in reverse).
 .TP
 .I P
 (Un)pause the game
@@ -32,6 +36,15 @@ Switch between windowed and fullscreen mode
 .I \-f, \-\-fullscreen
 Start the game in fullscreen mode
 .TP
+.I \-b, \-\-benchmark
+Start the game in benchmark/attract mode (AI vs AI, auto-start, no menu)
+.TP
+.I \-m, \-\-master <IP-of-slave>
+Network play mode; play as master and send input over to slave via the given IP
+.TP
+.I \-s, \-\-slave <IP-of-master>
+Network play mode; play as slave and send input over to master via the given IP
+.TP
 .I \-h, \-\-help
 Show summary of options
 .SH "HOMEPAGE" 
@@ -39,7 +52,7 @@ Show summary of options
 http://icculus.org/tennix/ 
 .SH "AUTHOR" 
 .PP 
-The author and current maintainer of Tennix is Thomas Perl (thp@thpinfo.com).
+The author and current maintainer of Tennix is Thomas Perl (thp.io/about).
 .PP 
 This manual page was written by Andrea Colangelo (warp10@ubuntu.com) for 
 the \fBUbuntu\fP system (but may be used by others).  Permission is 
index 8b730a2..e0715f2 100644 (file)
--- a/tennix.cc
+++ b/tennix.cc
@@ -180,7 +180,7 @@ int main( int argc, char** argv) {
             break;
     }
 #else
-    fprintf(stderr, "Tennix 2009 World Tennis Championship Tour (v" VERSION ")\n" COPYRIGHT "\n" URL "\n\n");
+    fprintf(stderr, "Tennix Classic Championship Tour 2011 (v" VERSION ")\n" COPYRIGHT "\n" URL "\n\n");
 
     i = 1;
     while (i < argc) {
@@ -202,24 +202,42 @@ int main( int argc, char** argv) {
         }
         else if (OPTION_SET("--slave", "-s")) {
             net_host = OPTION_VALUE;
-            assert(OPTION_VALUE != NULL);
-            OPTION_VALUE_PROCESSED;
-            net_master = false;
+            if (OPTION_VALUE != NULL) {
+                OPTION_VALUE_PROCESSED;
+                net_master = false;
+            } else {
+                fprintf(stderr, "Missing option parameter.\n");
+                do_help = true;
+                break;
+            }
         }
         else if (OPTION_SET("--master", "-m")) {
             net_host = OPTION_VALUE;
-            assert(OPTION_VALUE != NULL);
-            OPTION_VALUE_PROCESSED;
-            net_master = true;
+            if (OPTION_VALUE != NULL) {
+                OPTION_VALUE_PROCESSED;
+                net_master = true;
+            } else {
+                fprintf(stderr, "Missing option parameter.\n");
+                do_help = true;
+                break;
+            }
         }
         else {
-            fprintf(stderr, "Ignoring unknown option: %s\n", argv[i]);
+            fprintf(stderr, "Unknown option: %s\n", argv[i]);
+            do_help = true;
         }
         i++;
     }
 
     if (do_help == true) {
-        fprintf(stderr, "Usage: %s [--fullscreen|-f] [--help|-h]\n", argv[0]);
+        fprintf(stderr, "Usage: %s [OPTIONS]\n\n"
+        " Where [OPTIONS] are zero or more of the following:\n\n"
+        "    [--fullscreen|-f]           Fullscreen mode\n"
+        "    [--benchmark|-b]            Run in benchmark/attract mode\n"
+        "    [--master|-m <IP-of-slave>] Network play as master\n"
+        "    [--slave|-s <IP-of-master>] Network play as slave\n"
+        "    [--help|-h]                 Show help information\n\n"
+        " See tennix(6) for details.\n", argv[0]);
         return 0;
     }
 #endif
@@ -241,7 +259,7 @@ int main( int argc, char** argv) {
         exit( 1);
     }   
 
-    SDL_WM_SetCaption( "Tennix 2009 World Tennis Championship Tour", "Tennix 2009");
+    SDL_WM_SetCaption( "Tennix Classic Championship Tour 2011", "Tennix 2011");
     SDL_ShowCursor( SDL_DISABLE);
     SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, 1);
 
@@ -321,7 +339,7 @@ int main( int argc, char** argv) {
                 break;
             case MENU_STATE_SLIDE_TO_MAINMENU:
                 clear_screen();
-                rectangle(0, 0, WIDTH, HEIGHT, 80, 80, 80);
+                //rectangle(0, 0, WIDTH, HEIGHT, 80, 80, 80);
                 store_screen();
                 slide = slide_start;
                 slide_direction = -1;
@@ -352,7 +370,7 @@ int main( int argc, char** argv) {
                 state = MENU_STATE_LOCATION;
                 clear_screen();
 
-                rectangle(0, 0, WIDTH, HEIGHT, 80, 80, 80);
+                //rectangle(0, 0, WIDTH, HEIGHT, 80, 80, 80);
                 /* Draw and store the worldmap with day/night times */
                 show_image(GR_WORLDMAP, WIDTH/2-get_image_width(GR_WORLDMAP)/2, HEIGHT/2-get_image_height(GR_WORLDMAP)/2, 255);
                 day_night(get_image_width(GR_WORLDMAP), &night_start, &night_end);
@@ -371,7 +389,7 @@ int main( int argc, char** argv) {
             case MENU_STATE_FADE_TO_OPTIONS:
                 start_fade();
                 clear_screen();
-                rectangle(0, 0, WIDTH, HEIGHT, 80, 80, 80);
+                //rectangle(0, 0, WIDTH, HEIGHT, 80, 80, 80);
                 rectangle(CONTROLLER_SETUP_BORDER, HEIGHT/2-CONTROLLER_SETUP_SIZE/2, CONTROLLER_SETUP_SIZE, CONTROLLER_SETUP_SIZE, 150, 150, 150);
                 rectangle(WIDTH-CONTROLLER_SETUP_BORDER-CONTROLLER_SETUP_SIZE, (HEIGHT-CONTROLLER_SETUP_SIZE)/2, CONTROLLER_SETUP_SIZE, CONTROLLER_SETUP_SIZE, 150, 150, 150);
                 font_draw_string(FONT_XLARGE, "Controller setup", (WIDTH-font_get_string_width(FONT_XLARGE, "Controller setup"))/2, 20);
@@ -495,10 +513,10 @@ int main( int argc, char** argv) {
                 show_image(GR_BTN_RESUME, WIDTH-get_image_width(GR_BTN_RESUME)+slide+(slide/7)+3-(3*(btn_hovering==MENU_RESUME)), 230, 255);
                 font_draw_string(FONT_SMALL, "match paused", 10, 10);
             } else {
-                font_draw_string(FONT_MEDIUM, "Tennix 2009 World Tennis Championship Tour", 10, 10);
+                font_draw_string(FONT_MEDIUM, "Tennix Classic Championship Tour 2011", 10, 10);
             }
-            font_draw_string_color(FONT_MEDIUM, URL, 10-1, HEIGHT-10-1-font_get_height(FONT_MEDIUM), 130, 130, 130);
-            font_draw_string_color(FONT_MEDIUM, URL, 10, HEIGHT-10-font_get_height(FONT_MEDIUM), 30, 30, 30);
+            //font_draw_string_color(FONT_MEDIUM, URL, 10-1, HEIGHT-10-1-font_get_height(FONT_MEDIUM), 130, 130, 130);
+            font_draw_string_color(FONT_MEDIUM, URL, 10, HEIGHT-10-font_get_height(FONT_MEDIUM), 100, 100, 100);
             show_image(GR_BTN_QUIT, WIDTH-get_image_width(GR_BTN_QUIT)+slide+(slide/7)+3-(3*(btn_hovering==MENU_QUIT)), 350, 255);
         } else if (state == MENU_STATE_OPTIONS) {
             /* Options screen */
@@ -774,11 +792,11 @@ int main( int argc, char** argv) {
     }
 
     /* Play the credits */
-    /*intro = create_credits();
+    intro = create_credits();
     intro_playback = animation_state_new(intro);
     animation_state_run(intro_playback, 1);
     animation_state_free(intro_playback);
-    animation_free(intro);*/
+    animation_free(intro);
 
     uninit_graphics();
     uninit_input();
index 4f722d6..0fb30f4 100644 (file)
--- a/tennix.h
+++ b/tennix.h
@@ -79,7 +79,7 @@ typedef struct {
 #  define GAMESTATE_FILE ".tennix-current_match-" VERSION
 #endif
 
-#define COPYRIGHT "Copyright 2003, 2007, 2008, 2009 Thomas Perl"
+#define COPYRIGHT "Copyright 2003, 2007-2011 Thomas Perl"
 #define URL "http://icculus.org/tennix/"
 
 #define WIDTH 640