From ae457624763f3e87bab7307d05e1a2fcfd307398 Mon Sep 17 00:00:00 2001
From: feber <>
Date: Sun, 23 Apr 2006 12:35:31 +0000
Subject: [PATCH] Documentation update: stratagus 2.2, subversion, cleanup.
---
doc/datadir.html | 285 ----------------
doc/development.html | 106 +++---
doc/faq.html | 10 +-
doc/guichan-copyright.txt | 53 +++
doc/index.html | 16 +-
doc/install.html | 32 +-
doc/vp32_opensource_license_9-6-01.txt | 437 -------------------------
7 files changed, 127 insertions(+), 812 deletions(-)
delete mode 100644 doc/datadir.html
create mode 100644 doc/guichan-copyright.txt
delete mode 100644 doc/vp32_opensource_license_9-6-01.txt
diff --git a/doc/datadir.html b/doc/datadir.html
deleted file mode 100644
index b68960c94..000000000
--- a/doc/datadir.html
+++ /dev/null
@@ -1,285 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<!--
----- $Id$
-
----- (c) Copyright 2001-2004 by Lutz Sammer
-
----- This program is free software; you can redistribute it and/or modify
----- it under the terms of the GNU General Public License as published by
----- the Free Software Foundation; only version 2 of the License.
-----
----- This program is distributed in the hope that it will be useful,
----- but WITHOUT ANY WARRANTY; without even the implied warranty of
----- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
----- GNU General Public License for more details.
-----
----- You should have received a copy of the GNU General Public License
----- along with this program; if not, write to the Free Software
----- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
----- 02111-1307, USA.
--->
- <title>Stratagus Version 2.1 - Data directory structure</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-</head>
-
-<body>
-
-<h1>Stratagus Version 2.1 - Data directory structure</h1>
-<hr>
-
-Proposal for the new Stratagus data directory structure:
-
-<pre>
-<i>{race}</i> : Replace with a race name: human, orc, alliance or mythical..
-<i>{tileset}</i> : Replace with a tileset name: winter, summer, ...
-<i>{unit}</i> : Replace with an unit name: footman, bowman, ...
-<i>{building}</i> : Replace with a building name: goldmine, farm, ...
-<i>{race-campaign}</i> : Replace with a name of a campaign of a race: human-exp, ...
-
-<b>$STRATAGUS_LIBRARY_PATH/data</b>
-| Contains all data files for the Stratagus game engine.
-|
-}-- <b>data/campaigns</b>
-| | Contains all available campaigns.
-| |
-| `-- <b>data/campaigns/<i>{race-campaign}</i></b>
-| | Contains all data for a campaign: scripts, maps, texts, intros.
-| |
-| `-- <b>data/campaigns/<i>{race-campaign}</i>/interface</b>
-| Contains special backgrounds images for the campaign.
-|
-}-- <b>data/scripts</b>
-| Contains all global Configuration Language files.
-|
-}-- <b>data/graphics</b>
-| | Contains all available graphics.
-| |
-| }-- <b>data/graphics/<i>{race}</i></b>
-| | | Contains all graphics of a race, which could be used in any
-| | | tileset.
-| | |
-| | }-- <b>data/graphics/<i>{race}</i>/buildings</b>
-| | | Contains the building of the race, which could be used in
-| | | any tileset.
-| | |
-| | `-- <b>data/graphics/<i>{race}</i>/units</b>
-| | Contains all units of the race, which could be used in any
-| | any tileset.
-| |
-| }-- <b>data/graphics/neutral</b>
-| | | Contains all graphics that didn't belong to a special race and
-| | | which could be used in any tileset.
-| | |
-| | }-- <b>data/graphics/neutral/buildings</b>
-| | | Contains all buildings that didn't belong to a special race
-| | | and which could be used in any tileset.
-| | |
-| | `-- <b>data/graphics/neutral/units</b>
-| | Contains all units that didn't belong to a special race and
-| | which could be used in any tileset.
-| |
-| }-- <b>data/graphics/missiles</b>
-| | Contains all graphics of missiles.
-| |
-| }-- <b>data/graphics/tilesets</b>
-| | | Contains the graphics special to a single tileset.
-| | | Icons, buildings, units, tileset, decorations.
-| | |
-| | `-- <b>data/graphics/tilesets/<i>{tileset}</i></b>
-| | | Contains the special graphics of this tileset of all races.
-| | |
-| | }-- <b>data/graphics/tilesets/<i>{tileset}</i>/<i>{race}</i></b>
-| | | | Contains all graphics of a race special to this tileset.
-| | | |
-| | | }-- <b>data/graphics/tilesets/<i>{tileset}</i>/<i>{race}</i>/buildings</b>
-| | | | Contains all buildings graphics of a race and a tileset.
-| | | |
-| | | `-- <b>data/graphics/tilesets/<i>{tileset}</i>/<i>{race}</i>/units</b>
-| | | Contains all units graphics of a race and a tileset.
-| | |
-| | }-- <b>data/graphics/tilesets/<i>{tileset}</i>/neutral</b>
-| | | | Contains the graphics not belonging to any race.
-| | | |
-| | | }-- <b>data/graphics/tilesets/<i>{tileset}</i>/neutral/buildings</b>
-| | | | Contains the buildings graphics of the neutral race.
-| | | |
-| | | `-- <b>data/graphics/tilesets/<i>{tileset}</i>/neutral/units</b>
-| | | Contains the units graphics of the neutral race.
-| | |
-| | `-- <b>data/graphics/tilesets/<i>{tileset}</i>/terrain</b>
-| | Contains the graphics for the tileset self.
-| |
-| |
-| `-- <b>data/graphics/ui</b>
-| | Contains all user interface graphics.
-| |
-| }-- <b>data/graphics/ui/cursors</b>
-| | Contains all cursors not special to any race.
-| |
-| }-- <b>data/graphics/ui/fonts</b>
-| | Contains all fonts not special to any race.
-| |
-| `-- <b>data/graphics/ui/<i>{race}</i></b>
-| | Contains all user interface graphics special to a race.
-| |
-| }-- <b>data/graphics/ui/<i>{race}</i>/640x480</b>
-| | Contains the user interface graphics for this resolution.
-| |
-| `-- <b>data/graphics/ui/<i>{race}</i>/cursors</b>
-| Contains the cursors special to this race.
-|
-|
-}-- <b>data/maps</b>
-| | Contains all maps 'pud' format is used currently.
-| | Structure here is not required, you can use your own.
-| |
-| }-- <b>data/maps/demo</b>
-| | Contains the demo levels.
-| |
-| }-- <b>data/puds/multi</b>
-| | Contains multi-player levels.
-| |
-| }-- <b>data/puds/single</b>
-| | Contains single player levels.
-| |
-| `-- <b>data/puds/strange</b>
-| Contains strange levels.
-|
-`-- <b>data/sounds</b>
- | Contains all available sounds.
- |
- }-- <b>data/sounds/buildings</b>
- | Contains all general buildings sounds.
- |
- }-- <b>data/sounds/<i>{race}</i></b>
- | | Contains all sounds special to a race.
- | |
- | }-- <b>data/sounds/<i>{race}</i>/basic_voices</b>
- | | | Contains the general sounds of this race.
- | | |
- | | }-- <b>data/sounds/<i>{race}</i>/basic_voices/acknowledgement</b>
- | | | Contains the general acknowledgement sounds of this race.
- | | |
- | | }-- <b>data/sounds/<i>{race}</i>/basic_voices/annoyed</b>
- | | | Contains the general annoyed sounds of this race.
- | | |
- | | }-- <b>data/sounds/<i>{race}</i>/basic_voices/help</b>
- | | | Contains the general help sounds of this race.
- | | |
- | | `-- <b>data/sounds/<i>{race}</i>/basic_voices/selected</b>
- | | Contains the general selected sounds of this race.
- | |
- | }-- <b>data/sounds/<i>{race}</i>/buildings</b>
- | | Contains the buildings sounds of this race.
- | |
- | }-- <b>data/sounds/<i>{race}</i>/ships</b>
- | | | Contains all general ship sounds of this race.
- | | |
- | | }-- <b>data/sounds/<i>{race}</i>/ships/acknowledgement</b>
- | | | Contains the ship acknowledgement sound of this race.
- | | |
- | | }-- <b>data/sounds/<i>{race}</i>/ships/annoyed</b>
- | | | Contains the ship annoyed sound of this race.
- | | |
- | | `-- <b>data/sounds/<i>{race}</i>/ships/selected</b>
- | | Contains the ship selected sound of this race.
- | |
- | `-- <b>data/sounds/<i>{race}</i>/units</b>
- | | Contains the special sounds of a race and unit.
- | |
- | `-- <b>data/sounds/<i>{race}</i>/units/<i>{unit}</i></b>
- | | Contains the special sounds of this units of the race.
- | |
- | }-- <b>data/sounds/<i>{race}</i>/units/<i>{unit}</i>/acknowledgement</b>
- | | Contains the acknowledge sound of this unit.
- | |
- | }-- <b>data/sounds/<i>{race}</i>/units/<i>{unit}</i>/annoyed</b>
- | | Contains the annoyed sound of this unit.
- | |
- | `-- <b>data/sounds/<i>{race}</i>/units/<i>{unit}</i>/selected</b>
- | Contains the selected sound of this unit.
- |
- }-- <b>data/sounds/misc</b>
- | | Contains the sounds that didn't fit in any section.
- | |
- | }-- <b>data/sounds/misc/building explosion</b>
- | | Contains the building explosion sounds.
- | |
- | `-- <b>data/sounds/misc/tree chopping</b>
- | Contains the tree chopping sounds.
- |
- }-- <b>data/sounds/missiles</b>
- | | Contains the fire and hit sounds of missiles.
- | |
- | `-- <b>data/sounds/missiles/sword attack</b>
- | Contains different sounds of the same kind.
- |
- }-- <b>data/sounds/neutral</b>
- | | Contains the sounds of buildings or units not belonging to any race.
- | |
- | }-- <b>data/sounds/neutral/buildings</b>
- | | Contains the building sounds of the neutral race.
- | |
- | `-- <b>data/sounds/neutral/units</b>
- | | Contains the units sounds of the neutral race.
- | |
- | `-- <b>data/sounds/neutral/units/<i>{unit}</i></b>
- | | Contains the special sounds of the unit of the neutral race.
- | |
- | }-- <b>data/sounds/neutral/units/<i>{unit}</i>/acknowledgement</b>
- | | Contains the acknowledgement sound of the unit of
- | | the neutral race.
- | |
- | }-- <b>data/sounds/neutral/units/<i>{unit}</i>/annoyed</b>
- | | Contains the annoyed sound of the unit of the neutral
- | | race.
- | |
- | `-- <b>data/sounds/neutral/units/<i>{unit}</i>/selected</b>
- | Contains the selected sound of the unit of the neutral
- | race.
- |
- }-- <b>data/sounds/spells</b>
- | Contains the sounds of the different spells.
- |
- }-- <b>data/sounds/ui</b>
- | Contains the sounds for the user interface.
- |
- }-- <b>data/sounds/ships</b>
- | | Contains the sounds of ships common for all races.
- | |
- | `-- <b>data/sounds/ships/<i>{unit}</i></b>
- | | Contains the sounds of this unit.
- | |
- | }-- <b>data/sounds/ships/<i>{unit}</i>/acknowledgement</b>
- | | Contains the acknowledgement sound of this unit.
- | |
- | }-- <b>data/sounds/ships/<i>{unit}</i>/annoyed</b>
- | | Contains the annoyed sound of this unit.
- | |
- | `-- <b>data/sounds/ships/<i>{unit}</i>/selected</b>
- | Contains the selected sound of this unit.
- |
- `-- <b>data/sounds/units</b>
- | Contains the sounds of units common for all races.
- |
- `-- <b>data/sounds/units/<i>{unit}</i></b>
- | Contains the sounds of this unit.
- |
- }-- <b>data/sounds/units/<i>{unit}</i>/acknowledgement</b>
- | Contains the acknowledgement sound of this unit.
- |
- }-- <b>data/sounds/units/<i>{unit}</i>/annoyed</b>
- | Contains the annoyed sound of this unit.
- |
- `-- <b>data/sounds/units/<i>{unit}</i>/selected</b>
- Contains the selected sound of this unit.
-</pre>
-
-<hr>
-(C) Copyright 1998-2004 by The <a href="http://stratagus.org">Stratagus</a> Project
-under the <a href="gpl.html">GNU General Public License</a>.<br>
-All trademarks and copyrights on this page are owned by their respective owners.<br>
-</body>
-</html>
diff --git a/doc/development.html b/doc/development.html
index a3317852e..5f629cce5 100644
--- a/doc/development.html
+++ b/doc/development.html
@@ -4,7 +4,7 @@
<!--
---- $Id$
----- (c) Copyright 2001-2004 by Lutz Sammer and Nehal Mistry
+---- (c) Copyright 2001-2006 by Lutz Sammer, Francois Beerten and Nehal Mistry
---- This program is free software; you can redistribute it and/or modify
---- it under the terms of the GNU General Public License as published by
@@ -20,17 +20,23 @@
---- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
---- 02111-1307, USA.
-->
- <title>Development for Stratagus Version 2.1</title>
+ <title>Development for Stratagus Version 2.2</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body>
-<h1>Development for Stratagus Version 2.1</h1>
+<h1>Development for Stratagus Version 2.2</h1>
<hr>
This file should give you some information to help with development of Stratagus.<p>
+<h2>IRC - Internet Relay Chat</h2>
+
+You can try to meet other Stratagus developers and users on the
+<a href="http://www.freenode.net/">FreeNode</a> IRC Network, in the
+<a href="irc://irc.freenode.net/stratagus">#stratagus</a> channel.
+
<h2>Mailing list</h2>
If you want to help with development for Stratagus you should
@@ -38,12 +44,6 @@ If you want to help with development for Stratagus you should
the stratagus-devel mailing list.<br> You may also want to look at the
<a href="http://sourceforge.net/mailarchive/forum.php?forum_id=39600">archives.</a>
-<h2>IRC - Internet Relay Chat</h2>
-
-You can try to meet other Stratagus developers and users on the
-<a href="http://www.freenode.net/">FreeNode</a> IRC Network, in channel
-<a href="irc://irc.freenode.net/stratagus">#Stratagus</a>.
-
<h2>Bugs and tasks</h2>
You can find <a
@@ -58,55 +58,56 @@ IRC channel whether anybody else is already working on it.
<h2>Building Stratagus</h2>
-<h3>Installing CVS client</h3>
+<h3>Installing the Subversion client</h3>
-If you want to help develop, it is the best that you use CVS. To do
-so, first you need CVS for your system. Savannah has a <a
-href="http://sourceforge.net/cvs/?group_id=84903">guide</a> that
-will help you get started.
+If you want to help develop, you should use Subversion.
+The online book <a href="http://svnbook.red-bean.com/">Version Control with
+Subversion</a> will help you master Subversion.
-<h3>Getting Stratagus from CVS</h3>
+<h3>Getting Stratagus from Subversion</h3>
-<h4>There are 2 modules in the CVS repository.</h4>
+<h4>The subversion repository of stratagus has two main directories:</h4>
<ul>
<li>stratagus - The Stratagus engine source<p>
The source to the Stratagus engine. The source is licenced
under the GNU General Public License.
- <b>This module is needed for development.</b>
+ <b>This contains the sources needed for development.</b>
<li>htdocs - The Stratagus Website<p>
- The website is stored in CVS for easy updating and version management
+ The website is stored in subversion for easy updating and version management
by mulitple people. This module is not needed unless you plan to update
the stratagus website
</ul>
-<h4>How do I access to these modules?</h4>
+<h4>The stratagus directory is itself divided into 3 subdirectories:</h4>
-The instructions for accessing the modules are on the
-<a href="http://sourceforge.net/cvs/?group_id=84903">project cvs</a> page.<br>
-NOTE: it is highly recommended that you use the -z3 flag, this compresses
-the data and therefore speeds the transfer up. Also be warned that sourceforge
-has its anonymous CVS up to 5 hours behind developer CVS. Changes to developer
-CVS are not immediate for anonymous users.<p>
+<ul>
+ <li>trunk - The main development branch.
+ Almost all activity happens in this directory.
+ <li>branches - Special development branches.
+ <li>tags - Snapshots of the code of special interest like releases.
+</ul>
+
+<h4>How do I get the latest source code of Stratagus?</h4>
+
+The instructions for accessing the source code are on the
+<a href="http://sourceforge.net/svn/?group_id=84903">project subversion</a> page.<br>
+<p>
For example:<p>
-cvs -d:pserver:anoncvs@cvs.sourceforge.net:/cvsroot/stratagus login<br />
-<i>"When prompted for a password for anonymous, simply press the Enter key."</i><br>
-cvs -z3 -d:pserver:anoncvs@cvs.sourceforge.net:/cvsroot/stratagus co stratagus<br />
+<pre>svn co https://svn.sourceforge.net/svnroot/stratagus/stratagus/trunk stratagus</pre>
+<p>
-This is done only once. To update your CVS directory, go into
-the module directory and type 'cvs -z3 -q update -dP'.<p>
+This is done only once. To update your working copy, go into
+the directory and type 'svn up'.<p>
-You may put these flags in your ~/.cvsrc file so that you only
-need to type 'cvs update', the cvs (1) man page will show you how.
+<h3>Getting Stratagus without Subversion</h3>
-<h3>Getting Stratagus without CVS</h3>
-
-Only releases are made outside of CVS. If you wish to be involved with
-development, it is best that you obtain CVS, or learn how to use it so
-you can get access to CVS. CVS usually remains quite stable and is easier
+Only releases are made outside of Subversion. If you wish to be involved with
+development, you should obtain the sources via Subversion.
+Subversion usually remains quite stable and is easier
for you to keep up to date. Release versions of stratagus are available
<a href="http://sourceforge.net/project/showfiles.php?group_id=84903">here</a>.
Many of the games that use the stratagus engine will, and should bundle these
@@ -179,7 +180,7 @@ Please read the doxygen/doc++ documentation.
//
/**@name {filename}.c - {One line description of this file} */
//
-// (c) Copyright 2004 by {insert your name here}
+// (c) Copyright 2006 by {insert your name here}
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -192,33 +193,20 @@ Please read the doxygen/doc++ documentation.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// Foundation, Inc., 51 Franklin St, Fifth Floor,
+// Boston, MA 02110-1301 USA
//
// $Id$
//@{
-/*----------------------------------------------------------------------------
--- Includes
-----------------------------------------------------------------------------*/
-
#include <stdio.h>
#include "stratagus.h"
-
// More game includes.
-/*----------------------------------------------------------------------------
--- Variables
-----------------------------------------------------------------------------*/
-
// Global and local variables of this module.
-/*----------------------------------------------------------------------------
--- Functions
-----------------------------------------------------------------------------*/
-
// Local and global functions of this module.
//@}
@@ -233,7 +221,7 @@ If you fix in other modules, please imitate the coding style of the original cod
<a href="/usr/src/linux/Documentation/CodingStyle">Linux kernel coding style</a> (also
found online <a href="http://lwn.net/2001/1115/a/CodingStyle.php3">here</a>).
<ul>
- <li>Write ANSI C.
+ <li>Write ANSI C++.
<li>All Tabs (Developers use 4 columns for a tab).
<li>No line should be longer than 78 characters.
<li>All comments should be on their own line.
@@ -254,7 +242,7 @@ found online <a href="http://lwn.net/2001/1115/a/CodingStyle.php3">here</a>).
// function with variables defined.
int function(int a, int b)
- {
+ {
int x;
int y;
@@ -295,16 +283,14 @@ included in the main Stratagus source.<p>
Follow these steps:<p>
<ul>
- <li>cvs -q update -d
- <li>cvs -q diff -u > your-nickname.diff
+ <li>svn up
+ <li>svn diff > your-nickname.diff
<li>upload 'your-nickname.diff' to the
<a href="http://sourceforge.net/tracker/?group_id=84903&atid=574267">patch tracker</a>.
</ul>
-Please also read the <a href="datadir.html">Stratagus data directory description.</a><p>
-
<hr>
-(C) Copyright 1998-2004 by The <a href="http://stratagus.org">Stratagus</a> Project
+(C) Copyright 1998-2006 by The <a href="http://stratagus.org">Stratagus</a> Project
under the <a href="gpl.html">GNU General Public License</a>.<br>
All trademarks and copyrights on this page are owned by their respective owners.<br>
</body>
diff --git a/doc/faq.html b/doc/faq.html
index e706c432a..c773be51e 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -26,7 +26,7 @@
<body>
-<h1>FAQ for Stratagus Version 2.1</h1>
+<h1>FAQ for Stratagus Version 2.2</h1>
<hr>
<b>Q: .depend:1: *** missing separator. Stop.</b><br>
@@ -42,13 +42,11 @@
with '-Pxxxx' flag to use port xxxx instead.<p>
<b>Q: Does stratagus support internet/metaserver play?</b><br>
- A: Not yet, but this is a planned feature and may be added for 2.2<p>
+ A: Not yet, but this is a planned feature.<p>
<b>Q: Stratagus runs really slow in large resolutions, what can I do?</b><br>
- A: Versions of Stratagus from 2.1 update the screen every frame, and are
- designed to be used with OpenGL support. Using Software/SDL to update
- large screens is too slow and will cause the game to be slow. Use
- OpenGL if possible, or play in 640x480.<p>
+ A: Versions of Stratagus from 2.1 update the screen every frame.
+ Use OpenGL or play with a smaller screen resolution.<p>
<b>Q: Can I use Stratagus to play Age of Empires, StarCraft, or any
other commercial game?</b><br>
diff --git a/doc/guichan-copyright.txt b/doc/guichan-copyright.txt
new file mode 100644
index 000000000..428471378
--- /dev/null
+++ b/doc/guichan-copyright.txt
@@ -0,0 +1,53 @@
+/* _______ __ __ __ ______ __ __ _______ __ __
+ * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
+ * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
+ * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
+ * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
+ * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
+ * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
+ *
+ * Copyright (c) 2004, 2005 darkbits Js_./
+ * Per Larsson a.k.a finalman _RqZ{a<^_aa
+ * Olof Naess�n a.k.a jansem/yakslem _asww7!uY`> )\a//
+ * _Qhm`] _f "'c 1!5m
+ * Visit: http://guichan.darkbits.org )Qk<P ` _: :+' .' "{[
+ * .)j(] .d_/ '-( P . S
+ * License: (BSD) <Td/Z <fP"5(\"??"\a. .L
+ * Redistribution and use in source and _dV>ws?a-?' ._/L #'
+ * binary forms, with or without )4d[#7r, . ' )d`)[
+ * modification, are permitted provided _Q-5'5W..j/?' -?!\)cam'
+ * that the following conditions are met: j<<WP+k/);. _W=j f
+ * 1. Redistributions of source code must .$%w\/]Q . ."' . mj$
+ * retain the above copyright notice, ]E.pYY(Q]>. a J@\
+ * this list of conditions and the j(]1u<sE"L,. . ./^ ]{a
+ * following disclaimer. 4'_uomm\. )L);-4 (3=
+ * 2. Redistributions in binary form must )_]X{Z('a_"a7'<a"a, ]"[
+ * reproduce the above copyright notice, #}<]m7`Za??4,P-"'7. ).m
+ * this list of conditions and the ]d2e)Q(<Q( ?94 b- LQ/
+ * following disclaimer in the <B!</]C)d_, '(<' .f. =C+m
+ * documentation and/or other materials .Z!=J ]e []('-4f _ ) -.)m]'
+ * provided with the distribution. .w[5]' _[ /.)_-"+? _/ <W"
+ * 3. Neither the name of Guichan nor the :$we` _! + _/ . j?
+ * names of its contributors may be used =3)= _f (_yQmWW$#( "
+ * to endorse or promote products derived - W, sQQQQmZQ#Wwa]..
+ * from this software without specific (js, \[QQW$QWW#?!V"".
+ * prior written permission. ]y:.<\.. .
+ * -]n w/ ' [.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT )/ )/ !
+ * HOLDERS AND CONTRIBUTORS "AS IS" AND ANY < (; sac , '
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, ]^ .- %
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF c < r
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR aga< <La
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 5% )P'-3L
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR _bQf` y`..)a
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ,J?4P'.P"_(\?d'.,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES _Pa,)!f/<[]/ ?"
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT _2-..:. .r+_,.. .
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ?a.<%"' " -'.a_ _,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ^
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
diff --git a/doc/index.html b/doc/index.html
index 4067fb91f..84a9ff0a8 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -4,7 +4,7 @@
<!--
---- $Id$
----- (c) Copyright 2003-2004 by Nehal Mistry
+---- (c) Copyright 2003-2006 by Nehal Mistry
---- This program is free software; you can redistribute it and/or modify
---- it under the terms of the GNU General Public License as published by
@@ -20,13 +20,13 @@
---- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
---- 02111-1307, USA.
-->
- <title>Stratagus 2.1</title>
+ <title>Stratagus 2.2</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body>
-<h1>Stratagus 2.1</h1>
+<h1>Stratagus 2.2</h1>
<hr>
<h2>What is Stratagus?</h2>
@@ -64,7 +64,7 @@
<h2>Todo and known bugs</h2>
This file contains the old known bugs and what we haved planned in the
- future (Out of Date, use the website for accurate information):
+ future (<b>Out of Date, use the website for accurate information</b>):
<a href="todo.html">todo.html (old)</a><p>
Also look at the complete list of
@@ -84,14 +84,10 @@
Stratagus is distributed under the <a href="gpl.html">GNU General Public
License </a>version 2<p>
- SDL see <a href="README-SDL.txt">README-SDL.txt</a><p>
-
- VP32 see <a href="vp32_opensource_license_9-6-01.txt">vp32_opensource_license_9-6-01.txt</a><p>
-
- For more credits please see data/scripts/credits.lua.<p>
+ Guichan copyrighted 2004 - 2005 by Per Larsson and Olof Naessen.<p>
<hr>
-(C) Copyright 1998-2004 by The <a href="http://stratagus.org">Stratagus</a> Project
+(C) Copyright 1998-2006 by The <a href="http://stratagus.org">Stratagus</a> Project
under the <a href="gpl.html">GNU General Public License</a>.<br>
All trademarks and copyrights on this page are owned by their respective owners.<br>
</body>
diff --git a/doc/install.html b/doc/install.html
index e90d00e36..22f1ac19c 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -4,7 +4,7 @@
<!--
---- $Id$
----- (c) Copyright 2002-2004 by Nehal Mistry.
+---- (c) Copyright 2002-2006 by Nehal Mistry, Francois Beerten.
---- This program is free software; you can redistribute it and/or modify
---- it under the terms of the GNU General Public License as published by
@@ -26,13 +26,14 @@
<body>
-<h1>Installation instructions for Stratagus 2.1</h1><p>
+<h1>Installation instructions for Stratagus 2.2</h1><p>
<hr>
<h2>Software Requirements</h2>
<ul>
- <li><b>A supported operating system:</b> Win32, Linux, Mac OS X, BSD,
+ <li><b>A supported operating system:</b> Linux, Mac OS X, BSD,
Possibly any other Unix/POSIX OS.<br>
+ Microsoft Windows 98 SE, or higher.
<font color=red>NOTE: some features of Winsock2 (WS2_32.DLL) are used. So even
if you plan to play single player only,
WinNT4.0 users will need
@@ -43,18 +44,16 @@
<li><a href="http://www.libsdl.org/index.php">SDL</a> (required).<p>
<li><a href="http://www.libpng.org/pub/png/">libpng</a> (required).<p>
<li><a href="http://www.gzip.org/zlib/">zlib</a> (required).<p>
- <li><a href="http://www.lua.org/">Lua</a> (required).<p>
+ <li><a href="http://www.lua.org/">Lua</a> and lualib (required).<p>
<li><a href="http://www.xiph.org/ogg/vorbis/">libvorbis</a> (recommended).<p>
<li><a href="http://www.theora.org/">libtheora</a> (recommended).<p>
- <li><a href="http://mikmod.raphnet.net/">libmikmod</a> (recommended).<p>
+ <li><a href="http://www.xipg.org/">libogg</a> (recommended).<p>
+ <li><a href="http://mikmod.raphnet.net/">libmikmod</a> (optional).<p>
<li><a href="http://sources.redhat.com/bzip2/">libbzip2</a> (optional).<p>
<li><a href="http://flac.sourceforge.net/">libFLAC</a> (optional).<p>
<li><a href="http://www.underbit.com/products/mad/">libmad</a> (optional).<p>
- <li>Either the original or expansion wc2 CD (not Battle.net edition) for
- <a href="http://wargus.sourceforge.net/">wargus</a>,
- or another
- <a href="http://stratagus.sourceforge.net/games.shtml">game</a>.<br>
+ <a href="http://stratagus.sourceforge.net/games.shtml">A stratagus game</a>.<br>
</ul>
<h2>Hardware Requirements</h2>
@@ -69,14 +68,14 @@
<li><b>Video Card:</b> Any graphics card that can handle 16 bpp
and 640x480 is supported. (OpenGL is supported, and requires a 32MB Card)<p>
- <li><b>Sound Card:</b> Recommended. Windows (for Win32) or SDL
- (for unix or Mac OS X) compatible sound cards are supported.<p>
+ <li><b>Sound Card:</b> Recommended. SDL compatible sound cards are supported.<p>
</ul>
<h2>Installation</h2>
Mac OS X users: Extract the "contrib/macosx.tgz" file to the
- top-level directory and read "Read Me.rtf".<p>
+ top-level directory and read "Read Me.rtf".
+ <font color="red">NOTE: Lacking a Mac OS X developper, those instructions are outdated.</font> <p>
<ul>
<li><b>Step 1, Download and Extract:</b><p>
@@ -95,7 +94,12 @@
<li><b>Step 2, Compile:</b><p>
<ul>
- <li><b>GCC/Mingw users:</b>
+ <li><b>GCC/Mingw users:</b></br>
+ Using <a href="www.scons.org">scons</a>:
+ <ul>
+ <li>Run 'scons'.
+ </ul>
+ Using the autotools:
<ul>
<li>Run './autogen.sh' then './configure' to create the Makefile.
<li>When complete, type 'make depend && make' to compile, and
@@ -123,7 +127,7 @@
</ul>
<hr>
-(C) Copyright 1998-2005 by The <a href="http://stratagus.org">Stratagus</a> Project
+(C) Copyright 1998-2006 by The <a href="http://stratagus.org">Stratagus</a> Project
under the <a href="gpl.html">GNU General Public License</a>.<br>
All trademarks and copyrights on this page are owned by their respective owners.<br>
</body>
diff --git a/doc/vp32_opensource_license_9-6-01.txt b/doc/vp32_opensource_license_9-6-01.txt
deleted file mode 100644
index 14043897b..000000000
--- a/doc/vp32_opensource_license_9-6-01.txt
+++ /dev/null
@@ -1,437 +0,0 @@
-VP3.2 Public License 0.1
-
-(This license is derived from the Mozilla Public License 1.1 (MPL 1.1) from
-Netscape Communications, as found at www.opensource.com. Material modifications
-have been made through the addition of sections 2.1 (e) and 2.2 (e).)
-
-1. Definitions.
-
-1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code
-available to a third party.
-
-1.1. "Contributor" means each entity that creates or contributes to the creation
-of Modifications.
-
-1.2. "Contributor Version" means the combination of the Original Code, prior
-Modifications used by a Contributor, and the Modifications made by that
-particular Contributor.
-
-1.3. "Covered Code" means the Original Code or Modifications or the combination
-of the Original Code and Modifications, in each case including portions thereof.
-
-1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted in
-the software development community for the electronic transfer of data.
-
-1.5. "Executable" means Covered Code in any form other than Source Code.
-
-1.6. "Initial Developer" means the individual or entity identified as the
-Initial Developer in the Source Code notice required by Exhibit A.
-
-1.7. "Larger Work" means a work which combines Covered Code or portions thereof
-with code not governed by the terms of this License.
-
-1.8. "License" means this document.
-
-1.8.1. "Licensable" means having the right to grant, to the maximum extent
-possible, whether at the time of the initial grant or subsequently acquired, any
-and all of the rights conveyed herein.
-
-1.9. "Modifications" means any addition to or deletion from the substance or
-structure of either the Original Code or any previous Modifications. When
-Covered Code is released as a series of files, a Modification is:
-
-A. Any addition to or deletion from the contents of a file containing Original
-Code or previous Modifications.
-
-B. Any new file that contains any part of the Original Code or previous
-Modifications.
-
-1.10. "Original Code" means Source Code of computer software code which is
-described in the Source Code notice required by Exhibit A as Original Code, and
-which, at the time of its release under this License is not already Covered Code
-governed by this License.
-
-1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter
-acquired, including without limitation, method, process, and apparatus claims,
-in any patent Licensable by grantor.
-
-1.11. "Source Code" means the preferred form of the Covered Code for making
-modifications to it, including all modules it contains, plus any associated
-interface definition files, scripts used to control compilation and installation
-of an Executable, or source code differential comparisons against either the
-Original Code or another well known, available Covered Code of the Contributor's
-choice. The Source Code can be in a compressed or archival form, provided the
-appropriate decompression or de-archiving software is widely available for no
-charge.
-
-1.12. "You" (or "Your") means an individual or a legal entity exercising rights
-under, and complying with all of the terms of, this License or a future version
-of this License issued under Section 6.1. For legal entities, "You" includes any
-entity which controls, is controlled by, or is under common control with You.
-For purposes of this definition, "control" means (a) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (b) ownership of more than fifty percent (50%) of the
-outstanding shares or beneficial ownership of such entity.
-
-2. Source Code License.
-
-2.1. The Initial Developer Grant.
-The Initial Developer hereby grants You a world-wide, royalty-free, non-
-exclusive license, subject to third party intellectual property claims:
-
-(a) under intellectual property rights (other than patent or trademark)
-Licensable by Initial Developer to use, reproduce, modify, display, perform,
-sublicense and distribute the Original Code (or portions thereof) with or
-without Modifications, and/or as part of a Larger Work; and
-
-(b) under Patents Claims infringed by the making, using or selling of Original
-Code, to make, have made, use, practice, sell, and offer for sale, and/or
-otherwise dispose of the Original Code (or portions thereof).
-
-(c) the licenses granted in this Section 2.1(a) and (b) are effective on the
-date Initial Developer first distributes Original Code under the terms of this
-License.
-
-(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for
-code that You delete from the Original Code; 2) separate from the Original Code;
-or 3) for infringements caused by: i) the modification of the Original Code or
-ii) the combination of the Original Code with other software or devices.
-
-(e) Notwithstanding Sections 2.1 (a), (b), and (c) above, no license
-is granted to You, under any intellectual property rights including patent
-rights, to modify the code in such a way as to create or accept data that is
-incompatible with data produced or accepted by the Original Code. By way of
-example but not limitation, a Modification that adds support for other
-compression data such as MPEG-1 or MPEG-2 would be permissible, but only if the
-resulting Larger Work continues to support playback of VP3.2 data.
-Modifications that provide only playback or encode support are also permissible.
-However, a Modification that adds support for encoding or playback of any non-
-VP3.2 compatible files or bitstreams without complementary support for VP3.2
-encoding or playback would not be permissible, and no license is granted for
-such Modification(s).
-
-2.2. Contributor Grant.
-Subject to third party intellectual property claims, each Contributor hereby
-grants You a world-wide, royalty-free, non-exclusive license
-
-(a) under intellectual property rights (other than patent or trademark)
-Licensable by Contributor, to use, reproduce, modify, display, perform,
-sublicense and distribute the Modifications created by such Contributor (or
-portions thereof) either on an unmodified basis, with other Modifications, as
-Covered Code and/or as part of a Larger Work; and
-
-(b) under Patent Claims infringed by the making, using, or selling of
-Modifications made by that Contributor either alone and/or in combination with
-its Contributor Version (or portions of such combination), to make, use, sell,
-offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by
-that Contributor (or portions thereof); and 2) the combination of Modifications
-made by that Contributor with its Contributor Version (or portions of such
-combination).
-
-(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date
-Contributor first makes Commercial Use of the Covered Code.
-
-(d) Notwithstanding Section 2.2(b) above, no patent license is granted: 1)
-for any code that Contributor has deleted from the Contributor Version; 2)
-separate from the Contributor Version; 3) for infringements caused by: i)
-third party modifications of Contributor Version or ii) the combination of
-Modifications made by that Contributor with other software (except as part of
-the Contributor Version) or other devices; or 4) under Patent Claims infringed
-by Covered Code in the absence of Modifications made by that Contributor.
-
-e) Notwithstanding Sections 2.2 (a), (b), and (c) above, no license
-may be granted to You by Contributor, under any intellectual property rights
-including patent rights, to modify the code in such a way as to create or accept
-data that is incompatible with data produced or accepted by the Original Code.
-By way of example but not limitation, a Modification that adds support for other
-compression data such as MPEG-1 or MPEG-2 would be permissible, but only if the
-resulting Larger Work continues to support playback of VP3.2 data.
-Modifications that provide only playback or encode support are also permissible.
-However, a Modification that adds support for encoding or playback of any non-
-VP3.2 compatible files or bitstreams without complementary support for VP3.2
-encoding or playback is not permissible, and no license is granted for such
-Modification(s).
-
-3. Distribution Obligations.
-
-3.1. Application of License.
-The Modifications which You create or to which You contribute are governed by
-the terms of this License, including without limitation Section 2.2. The Source
-Code version of Covered Code may be distributed only under the terms of this
-License or a future version of this License released under Section 6.1, and You
-must include a copy of this License with every copy of the Source Code You
-distribute. You may not offer or impose any terms on any Source Code version
-that alters or restricts the applicable version of this License or the
-recipients' rights hereunder. However, You may include an additional document
-offering the additional rights described in Section 3.5.
-3.2. Availability of Source Code.
-Any Modification which You create or to which You contribute must be made
-available in Source Code form under the terms of this License either on the same
-media as an Executable version or via an accepted Electronic Distribution
-Mechanism to anyone to whom you made an Executable version available; and if
-made available via Electronic Distribution Mechanism, must remain available for
-at least twelve (12) months after the date it initially became available, or at
-least six (6) months after a subsequent version of that particular Modification
-has been made available to such recipients. You are responsible for ensuring
-that the Source Code version remains available even if the Electronic
-Distribution Mechanism is maintained by a third party.
-3.3. Description of Modifications.
-You must cause all Covered Code to which You contribute to contain a file
-documenting the changes You made to create that Covered Code and the date of any
-change. You must include a prominent statement that the Modification is derived,
-directly or indirectly, from Original Code provided by the Initial Developer and
-including the name of the Initial Developer in (a) the Source Code, and (b) in
-any notice in an Executable version or related documentation in which You
-describe the origin or ownership of the Covered Code.
-
-3.4. Intellectual Property Matters
-
-(a) Third Party Claims.
-If Contributor has knowledge that a license under a third party's intellectual
-property rights is required to exercise the rights granted by such Contributor
-under Sections 2.1 or 2.2, Contributor must include a text file with the Source
-Code distribution titled "LEGAL" which describes the claim and the party making
-the claim in sufficient detail that a recipient will know whom to contact. If
-Contributor obtains such knowledge after the Modification is made available as
-described in Section 3.2, Contributor shall promptly modify the LEGAL file in
-all copies Contributor makes available thereafter and shall take other steps
-(such as notifying appropriate mailing lists or newsgroups) reasonably
-calculated to inform those who received the Covered Code that new knowledge has
-been obtained.
-
-(b) Contributor APIs.
-If Contributor's Modifications include an application programming interface and
-Contributor has knowledge of patent licenses which are reasonably necessary to
-implement that API, Contributor must also include this information in the LEGAL
-file.
-
-(c) Representations.
-Contributor represents that, except as disclosed pursuant to Section 3.4(a)
-above, Contributor believes that Contributor's Modifications are Contributor's
-original creation(s) and/or Contributor has sufficient rights to grant the
-rights conveyed by this License.
-
-3.5. Required Notices.
-You must duplicate the notice in Exhibit A in each file of the Source Code. If
-it is not possible to put such notice in a particular Source Code file due to
-its structure, then You must include such notice in a location (such as a
-relevant directory) where a user would be likely to look for such a notice. If
-You created one or more Modification(s) You may add your name as a Contributor
-to the notice described in Exhibit A. You must also duplicate this License in
-any documentation for the Source Code where You describe recipients' rights or
-ownership rights relating to Covered Code. You may choose to offer, and to
-charge a fee for, warranty, support, indemnity or liability obligations to one
-or more recipients of Covered Code. However, You may do so only on Your own
-behalf, and not on behalf of the Initial Developer or any Contributor. You must
-make it absolutely clear than any such warranty, support, indemnity or liability
-obligation is offered by You alone, and You hereby agree to indemnify the
-Initial Developer and every Contributor for any liability incurred by the
-Initial Developer or such Contributor as a result of warranty, support,
-indemnity or liability terms You offer.
-
-3.6. Distribution of Executable Versions.
-You may distribute Covered Code in Executable form only if the requirements of
-Section 3.1-3.5 have been met for that Covered Code, and if You include a notice
-stating that the Source Code version of the Covered Code is available under the
-terms of this License, including a description of how and where You have
-fulfilled the obligations of Section 3.2. The notice must be conspicuously
-included in any notice in an Executable version, related documentation or
-collateral in which You describe recipients' rights relating to the Covered
-Code. You may distribute the Executable version of Covered Code or ownership
-rights under a license of Your choice, which may contain terms different from
-this License, provided that You are in compliance with the terms of this License
-and that the license for the Executable version does not attempt to limit or
-alter the recipient's rights in the Source Code version from the rights set
-forth in this License. If You distribute the Executable version under a
-different license You must make it absolutely clear that any terms which differ
-from this License are offered by You alone, not by the Initial Developer or any
-Contributor. You hereby agree to indemnify the Initial Developer and every
-Contributor for any liability incurred by the Initial Developer or such
-Contributor as a result of any such terms You offer.
-
-3.7. Larger Works.
-You may create a Larger Work by combining Covered Code with other code not
-governed by the terms of this License and distribute the Larger Work as a single
-product. In such a case, You must make sure the requirements of this License are
-fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-If it is impossible for You to comply with any of the terms of this License with
-respect to some or all of the Covered Code due to statute, judicial order, or
-regulation then You must: (a) comply with the terms of this License to the
-maximum extent possible; and (b) describe the limitations and the code they
-affect. Such description must be included in the LEGAL file described in Section
-3.4 and must be included with all distributions of the Source Code. Except to
-the extent prohibited by statute or regulation, such description must be
-sufficiently detailed for a recipient of ordinary skill to be able to understand
-it.
-
-5. Application of this License.
-This License applies to code to which the Initial Developer has attached the
-notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-6.1. New Versions.
-On2 Technologies, The Duck Corporation ("On2") may publish revised and/or new
-versions of the License from time to time. Each version will be given a
-distinguishing version number.
-
-6.2. Effect of New Versions.
-Once Covered Code has been published under a particular version of the License,
-You may always continue to use it under the terms of that version. You may also
-choose to use such Covered Code under the terms of any subsequent version of the
-License published by On2. No one other than On2 has the right to modify the
-terms applicable to Covered Code created under this License.
-
-6.3. Derivative Works.
-If You create or use a modified version of this License (which you may only do
-in order to apply it to code which is not already Covered Code governed by this
-License), You must (a) rename Your license so that the phrases "VP3.2", "On2",
-or any confusingly similar phrase do not appear in your license (except to note
-that your license differs from this License) and (b) otherwise make it clear
-that Your version of the license contains terms which differ from the Vp3.2
-Public License. (Filling in the name of the Initial Developer, Original Code or
-Contributor in the notice described in Exhibit A shall not of themselves be
-deemed to be modifications of this License.)
-
-7. DISCLAIMER OF WARRANTY.
-COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT
-WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE,
-FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE
-QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE
-PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER
-CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION.
-THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO
-USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-8.1. This License and the rights granted hereunder will terminate automatically
-if You fail to comply with terms herein and fail to cure such breach within 30
-days of becoming aware of the breach. All sublicenses to the Covered Code which
-are properly granted shall survive any termination of this License. Provisions
-which, by their nature, must remain in effect beyond the termination of this
-License shall survive.
-
-8.2. If You initiate litigation by asserting a patent infringement claim
-(excluding declatory judgment actions) against Initial Developer or a
-Contributor (the Initial Developer or Contributor against whom You file such
-action is referred to as "Participant") alleging that:
-
-(a) such Participant's Contributor Version directly or indirectly infringes any
-patent, then any and all rights granted by such Participant to You under
-Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from
-Participant terminate prospectively, unless if within 60 days after receipt of
-notice You either: (i) agree in writing to pay Participant a mutually agreeable
-reasonable royalty for Your past and future use of Modifications made by such
-Participant, or (ii) withdraw Your litigation claim with respect to the
-Contributor Version against such Participant. If within 60 days of notice, a
-reasonable royalty and payment arrangement are not mutually agreed upon in
-writing by the parties or the litigation claim is not withdrawn, the rights
-granted by Participant to You under Sections 2.1 and/or 2.2 automatically
-terminate at the expiration of the 60 day notice period specified above.
-
-(b) any software, hardware, or device, other than such Participant's
-Contributor Version, directly or indirectly infringes any patent, then any
-rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are
-revoked effective as of the date You first made, used, sold, distributed, or had
-made, Modifications made by that Participant.
-
-8.3. If You assert a patent infringement claim against Participant alleging
-that such Participant's Contributor Version directly or indirectly infringes any
-patent where such claim is resolved (such as by license or settlement) prior to
-the initiation of patent infringement litigation, then the reasonable value of
-the licenses granted by such Participant under Sections 2.1 or 2.2 shall be
-taken into account in determining the amount or value of any payment or license.
-
-8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user
-license agreements (excluding distributors and resellers) which have been
-validly granted by You or any distributor hereunder prior to termination shall
-survive termination.
-
-9. LIMITATION OF LIABILITY.
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
-NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER
-CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH
-PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES
-FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND
-ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL
-NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S
-NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME
-JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-The Covered Code is a "commercial item," as that term is defined in 48 C.F.R.
-2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial
-computer software documentation," as such terms are used in 48 C.F.R. 12.212
-(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through
-227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with
-only those rights set forth herein.
-
-11. MISCELLANEOUS.
-This License represents the complete agreement concerning the subject matter
-hereof. If any provision of this License is held to be unenforceable, such
-provision shall be reformed only to the extent necessary to make it enforceable.
-This License shall be governed by the law provisions of New York(except to the
-extent applicable law, if any, provides otherwise), excluding its conflict-of-
-law provisions. With respect to disputes in which at least one party is a
-citizen of, or an entity chartered or registered to do business in the United
-States of America, any litigation relating to this License shall be subject to
-the jurisdiction of the Federal Courts of the Southern District of New York,
-with venue lying in New York County, New York, with the losing party responsible
-for costs, including without limitation, court costs and reasonable attorneys'
-fees and expenses. The application of the United Nations Convention on Contracts
-for the International Sale of Goods is expressly excluded. Any law or regulation
-which provides that the language of a contract shall be construed against the
-drafter shall not apply to this License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-As between Initial Developer and the Contributors, each party is responsible for
-claims and damages arising, directly or indirectly, out of its utilization of
-rights under this License and You agree to work with Initial Developer and
-Contributors to distribute such responsibility on an equitable basis. Nothing
-herein is intended or shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-Initial Developer may designate portions of the Covered Code as "Multiple-
-Licensed". "Multiple-Licensed" means that the Initial Developer permits you to
-utilize portions of the Covered Code under Your choice of the NPL or the
-alternative licenses, if any, specified by the Initial Developer in the file
-described in Exhibit A.
-
-EXHIBIT A -VP3.2 Public License.
-"The contents of this file are subject to the VP3.2 Public License Version 0.1
-(the "License"); you may not use this file except in compliance with the
-License. You may obtain a copy of the License at
-http://www.vp3.com/license/
-Software distributed under the License is distributed on an "AS IS" basis,
-WITHOUT WARRANTY OF
-ANY KIND, either express or implied. See the License for the specific language
-governing rights and
-limitations under the License.
-The Original Code is ______________________________________.
-The Initial Developer of the Original Code is ________________________. Portions
-created by
- ______________________ are Copyright (C) ______ _______________________. All
-Rights
-Reserved.
-Contributor(s): ______________________________________.
-Alternatively, the contents of this file may be used under the terms of the
-_____ license (the "[___] License"), in which case the provisions of [______]
-License are applicable instead of those above. If you wish to allow use of
-your version of this file only under the terms of the [____] License and not to
-allow others to use your version of this file under the MPL, indicate your
-decision by deleting the provisions above and replace them with the notice and
-other provisions required by the [___] License. If you do not delete the
-provisions above, a recipient may use your version of this file under either the
-MPL or the [___] License."
-
-[NOTE: The text of this Exhibit A may differ slightly from the text of the
-notices in the Source Code files of the Original Code. You should use the text
-of this Exhibit A rather than the text found in the Original Code Source Code
-for Your Modifications.]