" >> tmp.sse.cpp
+ echo "int main() { return 0; }" >> tmp.sse.cpp
+ execute="$cxx_host -msse4.1 $CFLAGS tmp.sse.cpp -o tmp.sse 2>&1"
+ sse="`eval $execute 2>/dev/null`"
+ ret=$?
+ log 2 "executing $execute"
+ log 2 " returned $sse"
+ log 2 " exit code $ret"
+ if [ "$ret" = "0" ]; then
+ log 1 "detecting SSE... found"
+ else
+ # It was forced, so it should be found.
+ if [ "$with_sse" != "1" ]; then
+ log 1 "configure: error: SSE couln't be found"
+ log 1 "configure: error: you force enabled SSE, but it seems unavailable"
+ exit 1
+ fi
+
+ log 1 "detecting SSE... not found"
+ with_sse="0"
+ fi
+ rm -f tmp.sse tmp.exe tmp.sse.cpp
+}
+
make_sed() {
T_CFLAGS="$CFLAGS"
T_CXXFLAGS="$CXXFLAGS"
@@ -3553,9 +3590,9 @@ showhelp() {
echo " --awk=AWK the awk to use in configure [awk]"
echo " --lipo=LIPO the lipo to use (OSX ONLY) [HOST-lipo]"
echo " --os=OS the OS we are compiling for [DETECT]"
- echo " DETECT/UNIX/OSX/FREEBSD/OPENBSD/NETBSD/"
- echo " MORPHOS/HPUX/BEOS/SUNOS/CYGWIN/MINGW/OS2/"
- echo " DOS/WINCE/PSP/HAIKU"
+ echo " DETECT/UNIX/OSX/FREEBSD/DRAGONFLY/OPENBSD/"
+ echo " NETBSD/MORPHOS/HPUX/BEOS/SUNOS/CYGWIN/"
+ echo " MINGW/OS2/DOS/WINCE/PSP/HAIKU"
echo " --endian=ENDIAN set the endian of the HOST (AUTO/LE/BE)"
echo ""
echo "Paths:"
@@ -3631,13 +3668,16 @@ showhelp() {
echo " --with-cocoa enables COCOA video driver (OSX ONLY)"
echo " --with-sdl[=sdl-config] enables SDL video driver support"
echo " --with-zlib[=zlib.a] enables zlib support"
- echo " --with-liblzma[=liblzma.a] enables liblzma support"
+ echo " --with-liblzma[=\"pkg-config liblzma\"]"
+ echo " enables liblzma support"
echo " --with-liblzo2[=liblzo2.a] enables liblzo2 support"
echo " --with-png[=libpng-config] enables libpng support"
echo " --with-freetype[=freetype-config]"
echo " enables libfreetype support"
- echo " --with-fontconfig[=pkg-config fontconfig]"
+ echo " --with-fontconfig[=\"pkg-config fontconfig\"]"
echo " enables fontconfig support"
+ echo " --with-xdg-basedir[=\"pkg-config libxdg-basedir\"]"
+ echo " enables XDG base directory support"
echo " --with-icu[=icu-config] enables icu (used for right-to-left support)"
echo " --static-icu try to link statically (libsicu instead of"
echo " libicu; can fail as the new name is guessed)"
@@ -3648,6 +3688,8 @@ showhelp() {
echo " --with-ccache enables ccache support"
echo " --with-distcc enables distcc support"
echo " --without-grfcodec disable usage of grfcodec and re-generation of base sets"
+ echo " --without-threads disable threading support"
+ echo " --without-sse disable SSE support (x86/x86_64 only)"
echo ""
echo "Some influential environment variables:"
echo " CC C compiler command"
diff --git a/configure b/configure
index c80fb2f234..6b2c9d87b7 100755
--- a/configure
+++ b/configure
@@ -129,6 +129,7 @@ AWKCOMMAND='
if ($0 == "DIRECTMUSIC" && "'$with_direct_music'" == "0") { next; }
if ($0 == "LIBTIMIDITY" && "'$libtimidity'" == "" ) { next; }
if ($0 == "HAVE_THREAD" && "'$with_threads'" == "0") { next; }
+ if ($0 == "SSE" && "'$with_sse'" != "1") { next; }
skip += 1;
diff --git a/docs/desync.txt b/docs/desync.txt
new file mode 100644
index 0000000000..b0b6bd7d47
--- /dev/null
+++ b/docs/desync.txt
@@ -0,0 +1,268 @@
+Some explanations about Desyncs
+Last updated: 2014-02-23
+------------------------------------------------------------------------
+
+
+Table of contents
+-----------------
+1.0) Desync theory
+ * 1.1) OpenTTD multiplayer architecture
+ * 1.2) What is a Desync and how is it detected
+ * 1.3) Typical causes of Desyncs
+2.0) What to do in case of a Desync
+ * 2.1) Cache debugging
+ * 2.2) Desync recording
+3.0) Evaluating the Desync records
+ * 3.1) Replaying
+ * 3.2) Evaluation the replay
+ * 3.3) Comparing savegames
+
+
+1.1) OpenTTD multiplayer architecture
+---- --------------------------------
+ OpenTTD has a huge gamestate, which changes all of the time.
+ The savegame contains the complete gamestate at a specific point
+ in time. But this state changes completely each tick: Vehicles move
+ and trees grow.
+
+ However, most of these changes in the gamestate are deterministic:
+ Without a player interfering a vehicle follows its orders always
+ in the same way, and trees always grow the same.
+
+ In OpenTTD multiplayer synchronisation works by creating a savegame
+ when clients join, and then transfering that savegame to the client,
+ so it has the complete gamestate at a fixed point in time.
+
+ Afterwards clients only receive 'commands', that is: Stuff which is
+ not predictable, like
+ - player actions
+ - AI actions
+ - GameScript actions
+ - Admin Port command
+ - rcon commands
+ - ...
+
+ These commands contain the information on how to execute the command,
+ and when to execute it. Time is measured in 'network frames'.
+ Mind that network frames to not match ingame time. Network frames
+ also run while the game is paused, to give a defined behaviour to
+ stuff that is executing while the game is paused.
+
+ The deterministic part of the gamestate is run by the clients on
+ their own. All they get from the server is the instruction to
+ run the gamestate up to a certain network time, which basically
+ says that there are no commands scheduled in that time.
+
+ When a client (which includes the server itself) wants to execute
+ a command (i.e. a non-predictable action), it does this by
+ - calling DoCommandP resp. DoCommandPInternal
+ - These functions first do a local test-run of the command to
+ check simple preconditions. (Just to give the client an
+ immediate response without bothering the server and waiting for
+ the response.) The test-run may not actually change the
+ gamestate, all changes must be discarded.
+ - If the local test-run succeeds the command is sent to the server.
+ - The server inserts the command into the command queue, which
+ assigns a network frame to the commands, i.e. when it shall be
+ executed on all clients.
+ - Enhanced with this specific timestamp, the command is send to all
+ clients, which execute the command simultaneously in the same
+ network frame in the same order.
+
+1.2) What is a Desync and how is it detected
+---- ---------------------------------------
+ In the ideal case all clients have the same gamestate as the server
+ and run in sync. That is, vehicle movement is the same on all
+ clients, and commands are executed the same everywhere and
+ have the same results.
+
+ When a Desync happens, it means that the gamestates on the clients
+ (including the server) are no longer the same. Just imagine
+ that a vehicle picks the left line instead of the right line at
+ a junction on one client.
+
+ The important thing here is, that noone notices when a Desync
+ occurs. The desync client will continue to simulate the gamestate
+ and execute commands from the server. Once the gamestate differs
+ it will increasingly spiral out of control: If a vehicle picks a
+ different route, it will arrive at a different time at a station,
+ which will load different cargo, which causes other vehicles to
+ load other stuff, which causes industries to notice different
+ servicing, which causes industries to change production, ...
+ the client could run all day in a different universe.
+
+ To limit how long a Desync can remain unnoticed, the server
+ transfers some checksums every now and then for the gamestate.
+ Currently this checksum is the state of the random number
+ generator of the game logic. A lot of things in OpenTTD depend
+ on the RNG, and if the gamestate differs, it is likely that the
+ RNG is called at different times, and the state differs when
+ checked.
+
+ The clients compare this 'checksum' with the checksum of their
+ own gamestate at the specific network frame. If they differ,
+ the client disconnects with a Desync error.
+
+ The important thing here is: The detection of the Desync is
+ only an ultimate failure detection. It does not give any
+ indication on when the Desync happened. The Desync may after
+ all have occurred long ago, and just did not affect the checksum
+ up to now. The checksum may have matched 10 times or more
+ since the Desync happend, and only now the Desync has spiraled
+ enough to finally affect the checksum. (There was once a desync
+ which was only noticed by the checksum after 20 game years.)
+
+1.3) Typical causes of Desyncs
+---- -------------------------
+ Desyncs can be caused by the following scenarios:
+ - The savegame does not describe the complete gamestate.
+ - Some information which affects the progression of the
+ gamestate is not saved in the savegame.
+ - Some information which affects the progression of the
+ gamestate is not loaded from the savegame.
+ This includes the case that something is not completely
+ reset before loading the savegame, so data from the
+ previous game is carried over to the new one.
+ - The gamestate does not behave deterministic.
+ - Cache mismatch: The game logic depends on some cached
+ values, which are not invalidated properly. This is
+ the usual case for NewGRF-specific Desyncs.
+ - Undefined behaviour: The game logic performs multiple
+ things in an undefined order or with an undefined
+ result. E.g. when sorting something with a key while
+ some keys are equal. Or some computation that depends
+ on the CPU architecture (32/64 bit, little/big endian).
+ - The gamestate is modified when it shall not be modified.
+ - The test-run of a command alters the gamestate.
+ - The gamestate is altered by a player or script without
+ using commands.
+
+
+2.1) Cache debugging
+---- ---------------
+ Desyncs which are caused by inproper cache validation can
+ often be found by enabling cache validation:
+ - Start OpenTTD with '-d desync=2'.
+ - This will enable validation of caches every tick.
+ That is, cached values are recomputed every tick and compared
+ to the cached value.
+ - Differences are logged to 'commands-out.log' in the autosave
+ folder.
+
+ Mind that this type of debugging can also be done in singleplayer.
+
+2.2) Desync recording
+---- ----------------
+ If you have a server, which happens to encounter Desyncs often,
+ you can enable recording of the gamestate alterations. This
+ will later allow the replay the gamestate and locate the Desync
+ cause.
+
+ There are two levels of Desync recording, which are enabled
+ via '-d desync=2' resp. '-d desync=3'. Both will record all
+ commands to a file 'commands-out.log' in the autosave folder.
+
+ If you have the savegame from the start of the server, and
+ this command log you can replay the whole game. (see Section 3.1)
+
+ If you do not start the server from a savegame, there will
+ also be a savegame created just after a map has been generated.
+ The savegame will be named 'dmp_cmds_*.sav' and be put into
+ the autosave folder.
+
+ In addition to that '-d desync=3' also creates regular savegames
+ at defined spots in network time. (more defined than regular
+ autosaves). These will be created in the autosave folder
+ and will also be named 'dmp_cmds_*.sav'.
+
+ These saves allow comparing the gamestate with the original
+ gamestate during replaying, and thus greatly help debugging.
+ However, they also take a lot of disk space.
+
+
+3.1) Replaying
+---- ---------
+ To replay a Desync recording, you need these files:
+ - The savegame from when the server was started, resp.
+ the automatically created savegame from when the map
+ was generated.
+ - The 'commands-out.log' file.
+ - Optionally the 'dmp_cmds_*.sav'.
+ Put these files into a safe spot. (Not your autosave folder!)
+
+ Next, prepare your OpenTTD for replaying:
+ - Get the same version of OpenTTD as the original server was running.
+ - Uncomment/enable the define 'DEBUG_DUMP_COMMANDS' in
+ 'src/network/network_func.h'.
+ (DEBUG_FAILED_DUMP_COMMANDS is explained later)
+ - Put the 'commands-out.log' into the root save folder, and rename
+ it to 'commands.log'.
+ - Run 'openttd -D -d desync=3 -g startsavegame.sav'.
+ This replays the server log and creates new 'commands-out.log'
+ and 'dmp_cmds_*.sav' in your autosave folder.
+
+3.2) Evaluation the replay
+---- ---------------------
+ The replaying will also compare the checksums which are part of
+ the 'commands-out.log' with the replayed gamestate.
+ If they differ, it will trigger a 'NOT_REACHED'.
+
+ If the replay succeeds without mismatch, that is the replay reproduces
+ the original server state:
+ - Repeat the replay starting from incrementally later 'dmp_cmds_*.sav'
+ while truncating the 'commands.log' at the beginning appropriately.
+ The 'dmp_cmds_*.sav' can be your own ones from the first reply, or
+ the ones from the original server (if you have them).
+ (This simulates the view of joining clients during the game.)
+ - If one of those replays fails, you have located the Desync between
+ the last dmp_cmds that reproduces the replay and the first one
+ that fails.
+
+ If the replay does not succeed without mismatch, you can check the logs
+ whether there were failed commands. Then you may try to replay with
+ DEBUG_FAILED_DUMP_COMMANDS enabled. If the replay then fails, the
+ command test-run of the failed command modified the game state.
+
+ If you have the original 'dmp_cmds_*.sav', you can also compare those
+ savegames with your own ones from the replay. You can also comment/disable
+ the 'NOT_REACHED' mentioned above, to get another 'dmp_cmds_*.sav' from
+ the replay after the mismatch has already been detected.
+ See Section 3.2 on how to compare savegames.
+ If the saves differ you have located the Desync between the last dmp_cmds
+ that match and the first one that does not. The difference of the saves
+ may point you in the direction of what causes it.
+
+ If the replay succeeds without mismatch, and you do not have any
+ 'dmp_cmd_*.sav' from the original server, it is a lost case.
+ Enable creation of the 'dmp_cmd_*.sav' on the server, and wait for the
+ next Desync.
+
+ Finally, you can also compare the 'commands-out.log' from the original
+ server with the one from the replay. They will differ in stuff like
+ dates, and the original log will contain the chat, but otherwise they
+ should match.
+
+3.2) Comparing savegames
+---- -------------------
+ The binary form of the savegames from the original server and from
+ your replay will always differ:
+ - The savegame contains paths to used NewGRF files.
+ - The gamelog will log your loading of the savegame.
+ - The savegame data of AIs and the Gamescript will differ.
+ Scripts are not run during the replay, only their recorded commands
+ are replayed. Their internal state will thus not change in the
+ replay and will differ.
+
+ To compare savegame more semantically, there exist some ugly hackish
+ tools at:
+ http://devs.openttd.org/~frosch/texts/zpipe.c
+ http://devs.openttd.org/~frosch/texts/printhunk.c
+
+ The first one decompresses OpenTTD savegames. The second one creates
+ a textual representation of an uncompressed savegame, by parsing hunks
+ and arrays and such. With both tools you need to be a bit careful
+ since they work on stdin and stdout, which may not deal well with
+ binary data.
+
+ If you have the textual representation of the savegames, you can
+ compare them with regular diff tools.
diff --git a/docs/landscape.html b/docs/landscape.html
index cef38e03e8..f60e859fc3 100644
--- a/docs/landscape.html
+++ b/docs/landscape.html
@@ -15,20 +15,60 @@
For a graphical representation of the tile-layout have a look at
Landscape grid page.
- Eight attributes (counting "type_height") hold the informations about a tile.
+
Nine attributes (counting "type" and
+ "height") hold the informations about a tile.
These attributes are referred to as
- "type_height",
+ "type",
+ "height",
"m1", "m2",
"m3", "m4",
"m5", "m6"
and "m7".
The most important value is the class of a tile, stored in the upper 4 bits
- of the type_height attribute. The lower 4 bits are used to encode the height and
- slope data.
+ of the type attribute.
Frequently repeating patterns:
+ - type
+
+ -
+
+ Bits 7..4:
+
+ | The tile type. |
+ | 00 | Ground |
+ | 01 | Railway tracks |
+ | 02 | Roads |
+ | 03 | Town building |
+ | 04 | Trees |
+ | 05 | Station tiles |
+ | 06 | Water |
+ | 07 | Void |
+ | 08 | Industries |
+ | 09 | Tunnel / bridge |
+ | 0A | Objects |
+
+
+ Bits 3..2:
+
+ | Presence and direction of bridge above. |
+ | 00 | no bridge |
+ | 01 | Axis X (North-East) |
+ | 02 | Axis Y (South-West) |
+
+ -
+
+ Bits 1..0:
+
+ | Only meaningfull in tropic climate. It contains the definition of the available zones |
+ | 00 | normal |
+ | 01 | desert |
+ | 02 | rain forest |
+
+ In any other climate these 2 bits are theoretically free of use, however using them does not seem useful.
+
+
- m1
- - m6
-
- -
-
- Bits 7..6:
-
- | Presence and direction of bridge above, for tiles that support this. |
- | 00 | no bridge |
- | 01 | Axis X (North-East) |
- | 02 | Axis Y (South-West) |
-
- Some tiles, such as houses do not support bridges over them and use these bits for other purposes.
-
- -
-
- Bits 1..0:
-
- | Only meaningfull in tropic climate. It contains the definition of the available zones |
- | 00 | normal |
- | 01 | desert |
- | 02 | rain forest |
-
- In any other climate these 2 bits are theoretically free of use, however using them does not seem useful.
-
-
-
- m7:
Animation frame/state. Used for houses, industries, objects and stations.
@@ -196,9 +210,7 @@
- - m6 bits 7..6 : Possibility of a bridge above, in the direction specified
- m6 bits 4..2: type of hedge on NW border of the tile
- - m6 bits 1..0 : Tropic zone definition
@@ -510,8 +522,6 @@
m5 bit 4: pbs reservation state
- m6 bits 7..6 : Possibility of a bridge above, in the direction specified
- m6 bits 1..0 : Tropic zone definition
@@ -539,6 +549,7 @@
+ m3 bits 7..4: owner of road type 1 (tram); OWNER_NONE (10) is stored as OWNER_TOWN (0F)
m5 bits 7 clear: road or level-crossing
- m6 bits 5..3:
@@ -573,7 +584,6 @@
- - m3 bits 7..4: owner of road type 1 (tram); OWNER_NONE (10) is stored as OWNER_TOWN (0F)
- m5 bit 6 clear: road
- m1 bits 4..0: owner of the road type 0 (normal road)
@@ -663,10 +673,9 @@
+ - m7 bits 4..0: owner of the road type 0 (normal road)
- m6 bits 7..6 : Possibility of a bridge above, in the direction specified
- m6 bits 1..0 : Tropic zone definition
@@ -713,7 +722,6 @@
bits 7..2 : lift position (for houses type 04 and 05)
- bits 1..0 : tropic zone specifier
m7 :
@@ -835,7 +843,6 @@
- m6 bits 1..0 : Tropic zone definition
@@ -969,7 +976,6 @@
m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy, waypoint)
m6 bit 2: pbs reservation state for railway stations/waypoints
- m6 bits 1..0 : Tropic zone definition
m7 bits 4..0: owner of road (road stops)
m7 bits 7..6: present road types (road stops)
m7: animation frame (railway stations/waypoints, airports)
@@ -1082,8 +1088,6 @@
- m6 bits 7..6 : Possibility of a bridge above, in the direction specified
- m6 bits 1..0 : Tropic zone definition
@@ -1101,7 +1105,7 @@
| 8 |
- Industry tile |
+ Industries |
| |
@@ -1425,7 +1429,6 @@
m6 bits 5..3: random triggers (NewGRF)
m6 bit 2: bit 8 of type (see m5)
- m6 bits 1..0 : Tropic zone definition
m7: animation frame
@@ -1576,8 +1579,6 @@
- m6 bits 7..6 : Possibility of a bridge above, in the direction specified
- m6 bits 1..0 : Tropic zone definition
m7 bits 4..0: owner of road
m7 bit 5 set = on snow or desert
m7 bits 7..6: present road types for road
@@ -1593,41 +1594,12 @@
|
- - m1 bits 6..5 : Water class (sea, canal, river or land)
+
- m1 bits 6..5 : Water class (sea, canal, river or land)
- m1 bits 4..0: owner of the object (for lighthouses and transmitters normally 10)
- - m2: index into the array of objects
-
- m3: random bits
-
- m5: tile type:
-
-
- | 00 |
- transmitter |
-
-
-
- | 01 |
- lighthouse |
-
-
-
- | 02 |
- company statue
- |
-
-
- | 03 |
- company-owned land |
-
-
-
- | 04 |
- company headquarters |
-
-
-
- - m6 bits 7..6 : Possibility of a bridge above, in the direction specified
- - m6 bits 1..0 : Tropic zone definition
- - m7: animation counter
+
- m2: index into the array of objects, bits 0 to 15 (upper bits in m5)
+ - m3: random bits
+ - m5: index into the array of objects, bits 16 to 23 (lower bits in m2)
+ - m7: animation counter
|
diff --git a/docs/landscape_grid.html b/docs/landscape_grid.html
index e2f3c1f977..d34fe9840c 100644
--- a/docs/landscape_grid.html
+++ b/docs/landscape_grid.html
@@ -17,7 +17,7 @@
Landscape
-Six attributes hold the information about a tile.
+Nine attributes hold the information about a tile.
This can be seen in the Landscape document. This page tries to give an overview of used and free bits of
the array so you can quickly see what is used and what is not.
@@ -28,13 +28,14 @@ the array so you can quickly see what is used and what is not.
- - type_height - 8 bits in size, stores tile height (lower 4 bits) and tile class (upper 4 bits)
+ - type - 8 bits in size, tile class (bits 4..7), bridge (bits 2..3) tropic zone (bits 0..1, only valid in tropic climate)
+ - height - 8 bits in size, stores tile height
- m1 - 8 bits in size, used to identify the owner of that tile (eg piece of rail, bridge, etc.)
- m2 - 16 bits in size, used to identify the index of the given tile (object) in the (object-)array
- m3 - 8 bits in size, is used for general storage
- m4 - 8 bits in size, is used for general storage
- m5 - 8 bits in size, is used for general storage
- - m6 - 8 bits in size, special meaning : lower 2 bits only valid in tropic climate, upper 2 bits for bridges
+ - m6 - 8 bits in size, is used for general storage
- m7 - 8 bits in size, is used for general storage
@@ -42,7 +43,8 @@ the array so you can quickly see what is used and what is not.
| class |
- type_height (8) |
+ type (8) |
+ height (8) |
m1 (8) |
m2 (16) |
m3 (8) |
@@ -55,6 +57,7 @@ the array so you can quickly see what is used and what is not.
bits |
7654 3210 |
7654 3210 |
+ 7654 3210 |
FEDC BA98 7654 3210 |
7654 3210 |
7654 3210 |
@@ -66,69 +69,75 @@ the array so you can quickly see what is used and what is not.
0 |
ground |
XXXX XXXX |
+ XXXX XXXX |
OOO~ ~~~~ |
OOOO OOOO OOOO OOOO |
XXXX OOOO |
XXXX XXOO |
XXXX XXXX |
- XXOX XXXX |
+ OOOX XXOO |
OOOO OOOO |
| farmland |
-inherit- |
-inherit- |
+ -inherit- |
XXXX XXXX XXXX XXXX |
XXXX XXXX |
-inherit- |
-inherit- |
- XXOX XXXX |
+ OOOX XXOO |
OOOO OOOO |
| 1 |
rail |
XXXX XXXX |
+ XXXX XXXX |
OOOX XXXX |
OOOO XXXX OOOO OOOO |
OOOO XXXX |
OOOO XXXX |
XXXX XXXX |
- XXOO OOXX |
+ OOOO OOOO |
OOOO OOOO |
| rail with signals |
-inherit- |
-inherit- |
+ -inherit- |
OOOO XXXX XXXX XXXX |
XXXX XXXX |
XXXX XXXX |
-inherit- |
- XXOO OOXX |
+ OOOO OOOO |
OOOO OOOO |
| depot |
-inherit- |
-inherit- |
+ -inherit- |
XXXX XXXX XXXX XXXX |
OOOO XXXX |
OOOO XXXX |
XXOX OOXX |
- XXOO OOXX |
+ OOOO OOOO |
OOOO OOOO |
| 2 |
road |
XXXX XXXX |
+ XXXX XXXX |
OOOX XXXX |
XXXX XXXX XXXX XXXX |
XXXX XXXX |
OOOO OOOO |
XXXX XXXX |
- XXXX XOXX |
+ OOXX XOOO |
XXXO XXXX |
@@ -136,10 +145,11 @@ the array so you can quickly see what is used and what is not.
| -inherit- |
-inherit- |
-inherit- |
+ -inherit- |
XXXX XXXX |
-inherit- |
XXXX OOOX |
- XXXX XOXX |
+ OOXX XOOO |
XXXX XXXX |
@@ -147,46 +157,50 @@ the array so you can quickly see what is used and what is not.
| -inherit- |
-inherit- |
-inherit- |
- OOOO OOOO |
+ -inherit- |
+ XXXX OOOO |
OOOO OOOO |
XXOO OOXX |
- XXOO OOXX |
- XXXO OOOO |
+ OOOO OOOO |
+ XXXO XXXX |
| 3 |
house |
XXXX XXXX |
XXXX XXXX |
+ XXXX XXXX |
XXXX XXXX XXXX XXXX |
XXO~ ~~XX |
XXXX XXXX |
XXXX XXXX |
- XXXX XXXX |
+ XXXX XXOO |
XXXX XXXX |
| 4 |
trees |
XXXX XXXX |
+ XXXX XXXX |
OOO~ ~~~~ |
OOOO OOOX XXXX XXXX |
~~XX XXXX |
OOOO OOOO |
XXOO OXXX |
- OOOO OOXX |
+ OOOO OOOO |
OOOO OOOO |
| 5 |
rail station |
XXXX XXXX |
+ XXXX XXXX |
OXXX XXXX |
XXXX XXXX XXXX XXXX |
XXXX XXXX |
XXXX XXXX |
XXXX XXXX |
- OOXX XXXX |
+ OOXX XXOO |
XXXX XXXX |
@@ -199,16 +213,18 @@ the array so you can quickly see what is used and what is not.
| -inherit- |
-inherit- |
-inherit- |
+ -inherit- |
| road stop |
-inherit- |
-inherit- |
-inherit- |
+ -inherit- |
XXXX OOOO |
OOOO OOOO |
~~~~ ~XXX |
- OOXX XOXX |
+ OOXX XOOO |
XXOX XXXX |
@@ -216,10 +232,11 @@ the array so you can quickly see what is used and what is not.
| -inherit- |
-inherit- |
-inherit- |
+ -inherit- |
OOOO OOOO |
OOOO OOOO |
~~~~ ~XXX |
- OOXX XOXX |
+ OOXX XOOO |
OOOO OOOO |
@@ -227,10 +244,11 @@ the array so you can quickly see what is used and what is not.
| -inherit- |
-inherit- |
-inherit- |
+ -inherit- |
XXXX OOOO |
OOOO OOOO |
XXXX XXXX |
- OOXX XOXX |
+ OOXX XOOO |
XXXX XXXX |
@@ -238,10 +256,11 @@ the array so you can quickly see what is used and what is not.
| -inherit- |
-inherit- |
-inherit- |
+ -inherit- |
OOOO OOOO |
OOOO OOOO |
~~~~ ~~~~ |
- OOXX XOXX |
+ OOXX XOOO |
OOOO OOOO |
@@ -249,68 +268,74 @@ the array so you can quickly see what is used and what is not.
| -inherit- |
-inherit- |
-inherit- |
+ -inherit- |
OOOO OOOO |
OOOO OOOO |
~~~~ ~~~~ |
- OOXX XOXX |
+ OOXX XOOO |
OOOO OOOO |
| 6 |
sea, shore |
XXXX XXXX |
+ XXXX XXXX |
OXXX XXXX |
OOOO OOOO OOOO OOOO |
OOOO OOOO |
OOOO OOOO |
X~~X XXXX |
- XXOO OOXX |
+ OOOO OOOO |
OOOO OOOO |
| canal, river |
-inherit- |
-inherit- |
+ -inherit- |
OOOO OOOO OOOO OOOO |
OOOO OOOO |
XXXX XXXX |
-inherit- |
- XXOO OOXX |
+ OOOO OOOO |
OOOO OOOO |
| shipdepot |
-inherit- |
-inherit- |
+ -inherit- |
XXXX XXXX XXXX XXXX |
OOOO OOOO |
OOOO OOOO |
-inherit- |
- XXOO OOXX |
+ OOOO OOOO |
OOOO OOOO |
| 8 |
industry |
XXXX XXXX |
+ XXXX XXXX |
XXXO XXXX |
XXXX XXXX XXXX XXXX |
XXXX XXXX |
XXXX XXXX |
XXXX XXXX |
- OOXX XXXX |
+ OOXX XXOO |
XXXX XXXX |
| 9 |
tunnel entrance |
XXXX XXXX |
+ XXXX XXXX |
OOOX XXXX |
OOOO OOOO OOOO OOOO |
XXXX XXXX |
OOOO OOOO |
XOOX XXXX |
- XXOO OOXX |
+ OOOO OOOO |
XXXX XXXX |
@@ -321,19 +346,21 @@ the array so you can quickly see what is used and what is not.
| -inherit- |
-inherit- |
-inherit- |
- XXXX XXXX |
+ -inherit- |
+ OOXX XXOO |
-inherit- |
| A |
objects |
XXXX XXXX |
+ XXXX XXXX |
OXXX XXXX |
XXXX XXXX XXXX XXXX |
XXXX XXXX |
OOOO OOOO |
XXXX XXXX |
- XXOO OOXX |
+ OOOO OOOO |
XXXX XXXX |
diff --git a/docs/openttd.6 b/docs/openttd.6
index 0382306d7e..4e04be32c1 100644
--- a/docs/openttd.6
+++ b/docs/openttd.6
@@ -1,112 +1,152 @@
.\" Hey, EMACS: -*- nroff -*-
.\" Please adjust this date whenever revising the manpage.
-.Dd May 31, 2011
+.Dd October 13, 2014
.Dt OPENTTD 6
+.Os
.Sh NAME
.Nm openttd
-.Nd An open source clone of the Microprose game "Transport Tycoon Deluxe"
+.Nd open source clone of the Microprose game \(lqTransport Tycoon Deluxe\(rq
.Sh SYNOPSIS
.Nm
.Op Fl efhx
.Op Fl b Ar blitter
.Op Fl c Ar config_file
-.Op Fl d Ar [level | cat=lvl[,...]]
-.Op Fl D Ar [host][:port]
-.Op Fl g Ar [savegame]
+.Op Fl d Op Ar level | Ar cat Ns = Ns Ar lvl Ns Op , Ns Ar ...
+.Op Fl D Oo Ar host Oc Ns Op : Ns Ar port
+.Op Fl g Op Ar savegame
.Op Fl G Ar seed
.Op Fl I Ar graphicsset
-.Op Fl l Ar host[:port]
+.Op Fl l Ar host Ns Op : Ns Ar port
.Op Fl m Ar driver
.Op Fl M Ar musicset
-.Op Fl n Ar host[:port][#player]
+.Op Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar player
.Op Fl p Ar password
.Op Fl P Ar password
.Op Fl q Ar savegame
-.Op Fl r Ar widthxheight
+.Op Fl r Ar width Ns x Ns Ar height
.Op Fl s Ar driver
.Op Fl S Ar soundset
.Op Fl t Ar year
.Op Fl v Ar driver
.Sh OPTIONS
-.Bl -tag -width ".Fl n Ar host[:port][#player]"
+.Bl -tag -width "-n host[:port][#player]"
.It Fl b Ar blitter
-Set the blitter, see
+Select the blitter
+.Ar blitter ;
+see
.Fl h
-for a full list
+for a full list.
.It Fl c Ar config_file
-Use 'config_file' instead of 'openttd.cfg'
+Use
+.Ar config_file
+instead of
+.Pa openttd.cfg .
.It Fl d Ar [level]
Set debug verbosity for all categories to
-.Ar level
-or 1 if omitted
-.It Fl d Ar cat=level[,...]
-Set debug verbosity for a specific category
-.It Fl D Ar [host][:port]
-Start a dedicated server. Sets network debug level to 6. If you want to change this, use
+.Ar level ,
+or 1 if omitted.
+.It Fl d Ar cat Ns = Ns Ar lvl Ns Op , Ns Ar ...
+Set debug verbosity to
+.Ar lvl
+for a specific category
+.Ar cat .
+.It Fl D Oo Ar host Oc Ns Op : Ns Ar port
+Start a dedicated server.
+.Pp
+Network debug level will be set to 6.
+If you want to change this, set
.Fl d
-after
-.Fl D
-.It Fl G Ar seed
-Seed the pseudo random number generator
+after setting
+.Fl D .
.It Fl e
-Start in world editor mode
+Start in world editor mode.
.It Fl f
Fork into background (dedicated server only, see
-.Fl D )
-.It Fl g Ar [savegame]
+.Fl D ) .
+.It Fl g Op Ar savegame
Load
.Ar savegame
-at start or start a new game if omitted. The
+at start or start a new game if omitted.
.Ar savegame
-must be either absolute or relative to the current path or one of the search paths.
+must be either an absolute path or one relative to the current path or one of
+the search paths.
+.It Fl G Ar seed
+Seed the pseudo random number generator with
+.Ar seed .
.It Fl h
-Display a summary of all options and lists all the available AIs, blitters, sound, music and video drivers, graphics sets and sound sets.
+Display a summary of all options and list all the available AIs, blitters,
+sound, music and video drivers, graphics sets and sound sets.
.It Fl I Ar graphicsset
-Set the graphics set, see
+Select the graphics set
+.Ar graphicsset ;
+see
.Fl h
-for a full list
-.It Fl l Ar host[:port]
-Redirect DEBUG(), See
-.Fl D
+for a full list.
+.It Fl l Ar host Ns Op : Ns Ar port
+Redirect
+.Fn DEBUG
+output; see
+.Fl D .
.It Fl m Ar driver
-Set the music driver, see
+Select the music driver
+.Ar driver ;
+see
.Fl h
-for a full list
+for a full list.
.It Fl M Ar musicset
-Set the music set, see
+Select the music set
+.Ar musicset ;
+see
.Fl h
-for a full list
-.It Fl n Ar host[:port][#player]
-Join a network game, optionally specify a port to connect to and player to play as
+for a full list.
+.It Fl n Ar host Ns Oo : Ns Ar port Oc Ns Op # Ns Ar player
+Join a network game, optionally specifying a port to connect to and player to
+play as.
.It Fl p Ar password
-Password used to join server. Only useful with
-.Fl n
+Password used to join server.
+Only useful with
+.Fl n .
.It Fl P Ar password
-Password used to join company. Only useful with
-.Fl n
+Password used to join company.
+Only useful with
+.Fl n .
.It Fl q Ar savegame
-Write some information about the savegame and exit
-.It Fl r Ar widthxheight
-Set the resolution
+Write some information about the specified savegame and exit.
+.It Fl r Ar width Ns x Ns Ar height
+Set the resolution to
+.Ar width
+\(mu
+.Ar height
+pixels.
.It Fl s Ar driver
-Set the sound driver, see
+Select the sound driver
+.Ar driver ;
+see
.Fl h
-for a full list
+for a full list.
.It Fl S Ar soundset
-Set the sound set, see
+Select the sound set
+.Ar soundset ;
+see
.Fl h
-for a full list
+for a full list.
.It Fl t Ar year
-Set the starting year
+Set the starting year to
+.Ar year .
.It Fl v Ar driver
-Set the video driver, see
+Select the video driver
+.Ar driver ;
+see
.Fl h
-for a full list
+for a full list.
.It Fl x
-Do not automatically save to config file on exit
+Do not automatically save to config file on exit.
.El
.Sh SEE ALSO
-http://wiki.openttd.org/, http://www.openttd.org
+.Lk https://wiki.openttd.org "Wiki"
+(includes community maintained manual),
+.Lk https://forum.openttd.org "Forum",
+.Lk https://www.openttd.org "News"
.Sh HISTORY
Transport Tycoon Deluxe was written by Chris Sawyer and published by Microprose.
.Nm
diff --git a/findversion.sh b/findversion.sh
index c0d500a8fd..6be52b696f 100755
--- a/findversion.sh
+++ b/findversion.sh
@@ -106,21 +106,21 @@ elif [ -d "$ROOT_DIR/.git" ]; then
fi
elif [ -d "$ROOT_DIR/.hg" ]; then
# We are a hg checkout
- if [ -n "`hg status | grep -v '^?'`" ]; then
+ if [ -n "`HGPLAIN= hg status | grep -v '^?'`" ]; then
MODIFIED="2"
fi
- HASH=`LC_ALL=C hg id -i | cut -c1-12`
+ HASH=`LC_ALL=C HGPLAIN= hg id -i | cut -c1-12`
REV="h`echo $HASH | cut -c1-8`"
- BRANCH="`hg branch | sed 's@^default$@@'`"
- TAG="`hg id -t | grep -v 'tip$'`"
+ BRANCH="`HGPLAIN= hg branch | sed 's@^default$@@'`"
+ TAG="`HGPLAIN= hg id -t | grep -v 'tip$'`"
if [ -n "$TAG" ]; then
BRANCH=""
REV="$TAG"
fi
- REV_NR=`LC_ALL=C hg log -f -k "(svn r" -l 1 --template "{desc|firstline}\n" | grep "^(svn r[0-9]*)" | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
+ REV_NR=`LC_ALL=C HGPLAIN= hg log -f -k "(svn r" -l 1 --template "{desc|firstline}\n" | grep "^(svn r[0-9]*)" | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
if [ -z "$REV_NR" ]; then
# No rev? Maybe it is a custom hgsubversion clone
- REV_NR=`LC_ALL=C hg parent --template="{svnrev}"`
+ REV_NR=`LC_ALL=C HGPLAIN= hg parent --template="{svnrev}"`
fi
elif [ -f "$ROOT_DIR/.ottdrev" ]; then
# We are an exported source bundle
diff --git a/known-bugs.txt b/known-bugs.txt
index 00025a63f4..34aca33002 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
OpenTTD's known bugs
-Last updated: 2013-06-01
-Release version: 1.3.1
+Last updated: 2015-02-24
+Release version: 1.5.0-beta2
------------------------------------------------------------------------
@@ -33,12 +33,13 @@ No suitable AI can be found
If you have no AIs and an AI is started the so-called 'dummy' AI will
be loaded. This AI does nothing but writing a message on the AI debug
window and showing a red warning. There are basically two solutions
- for this problem: you must change the settings so no AI is started,
- this is done in the difficulty settings window. The other solution is
- acquiring (downloading) some AI. The easiest way to do this is via
- the "Check Online Content" button in the main (intro) menu or via
- "AI Settings" -> "Select AI" -> "Check Online Content" which is also
- accessed via the main menu.
+ for this problem: Either you set the number of AI players to 0 so that
+ no AI is started. You find that setting at the top of the window in the
+ "AI / Game Scripts Settings" window.
+ The other solution is acquiring (downloading) some AI. The easiest way
+ to do this is via the "Check Online Content" button in the main (intro)
+ menu or directly in the "AI / Game Scripts Settings" dialogue via the
+ "Check Online Content" button.
After a while of playing, colours get corrupted
In Windows 7 the background slideshow corrupts the colour mapping of
@@ -403,3 +404,52 @@ Mouse cursor going missing with SDL [FS#4997]:
We cannot fix this problem as SDL simply does not provide the
required information in these corner cases. This is a bug in SDL
and as such there is little that we can do about it.
+
+Inconsistent catchment areas [FS#5661]:
+ Due to performance decisions the catchment area for cargo accepted
+ by a station for delivery to houses or industries differs from the
+ catchment area for cargo that is delivered to stations from houses
+ or industries.
+
+ Conceptually they work the same, but the effect in game differs.
+ They work by finding the closest destination "around" the source
+ which is within a certain distance. This distance depends on the
+ type of station, e.g. road stops have a smaller catchment area than
+ large airports. In both cases the bounding box, the smallest
+ rectangle that contains all tiles of something, is searched for the
+ target of the cargo, and then spiraling outwards finding the closest
+ tile of the target.
+
+ In the case of a station with two tiles spread far apart with a house
+ that is within the station's bounding box, it would be possible that
+ the spiraling search from the house does not reach one of the station
+ tiles before the search ends, i.e. all tiles within that distance
+ are searched. So the house does not deliver cargo to the station. On
+ the other hand, the station will deliver cargo because the house
+ falls within the bounding box, and thus search area.
+
+ It is possible to make these consistent, but then cargo from a house
+ to a station needs to search up to 32 tiles around itself, i.e. 64
+ by 64 tiles, to find all possible stations it could deliver to
+ instead of 10 by 10 tiles (40 times more tiles). Alternatively the
+ search from a station could be changed to use the actual tiles, but
+ that would require considering checking 10 by 10 tiles for each of
+ the tiles of a station, instead of just once.
+
+Trains might not stop at platforms that are currently being changed [FS#5553]:
+ If you add tiles to or remove tiles from a platform while a train is
+ approaching to stop at the same platform, that train can miss the place
+ where it's supposed to stop and pass the station without stopping. This
+ is caused by the fact that the train is considered to already have stopped
+ if it's beyond its assigned stopping location. We can't let the train stop
+ just anywhere in the station because then it would never leave the station
+ if you have the same station in the order list multiple times in a row or
+ if there is only one station in the order list (see FS#5684).
+
+Some houses and industries are not affected by transparency [FS#5817]:
+ Some of the default houses and industries (f.e. the iron ore mine) are
+ not affected by the transparency options. This is because the graphics do
+ not (completely) separate the ground from the building.
+ This is a bug of the original graphics, and unfortunately cannot be
+ fixed with OpenGFX for the sake of maintaining compatibility with the
+ original graphics.
diff --git a/media/extra_grf/assemble_nfo.awk b/media/extra_grf/assemble_nfo.awk
new file mode 100644
index 0000000000..cf6b425c1d
--- /dev/null
+++ b/media/extra_grf/assemble_nfo.awk
@@ -0,0 +1,32 @@
+# $Id$
+
+# This file is part of OpenTTD.
+# OpenTTD 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, version 2.
+# OpenTTD 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 OpenTTD. If not, see .
+
+BEGIN {
+ # Very basic variant function; barely any error checking.
+ # Just use the first argument as the file to start from when assembling everything
+ path = ARGV[1];
+ gsub("[^/\\\\]*$", "", path);
+ assemble(ARGV[1]);
+}
+
+# Recursive function for assembling by means of resolving the #includes.
+function assemble(filename) {
+ while ((getline < filename) > 0) {
+ if (NF == 2 && $1 == "#include" ) {
+ # Remove the quotes.
+ gsub("[\"'<>]", "", $2);
+ assemble(path $2);
+ } else {
+ print $0;
+ }
+ }
+
+ if (close(filename) < 0) {
+ print "Could not open " filename > "/dev/stderr";
+ exit -1;
+ }
+}
diff --git a/media/extra_grf/openttd.nfo b/media/extra_grf/openttd.nfo
index e93b2066fb..66149a37e5 100644
--- a/media/extra_grf/openttd.nfo
+++ b/media/extra_grf/openttd.nfo
@@ -104,3 +104,4 @@
#include "rivers/tropic.nfo"
#include "rivers/toyland.nfo"
#include "tunnel_portals.nfo"
+#include "palette.nfo"
diff --git a/media/extra_grf/openttdgui.nfo b/media/extra_grf/openttdgui.nfo
index 1d96de8558..1b17b8651b 100644
--- a/media/extra_grf/openttdgui.nfo
+++ b/media/extra_grf/openttdgui.nfo
@@ -7,7 +7,7 @@
// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see .
//
-1 * 0 0C "OpenTTD GUI graphics"
- -1 * 3 05 15 \b 174 // OPENTTD_SPRITE_COUNT
+ -1 * 3 05 15 \b 175 // OPENTTD_SPRITE_COUNT
-1 sprites/openttdgui.png 8bpp 66 8 64 31 -31 7 normal
-1 sprites/openttdgui.png 8bpp 146 8 64 31 -31 7 normal
-1 sprites/openttdgui.png 8bpp 226 8 64 31 -31 7 normal
@@ -182,3 +182,4 @@
-1 sprites/openttdgui.png 8bpp 414 440 20 20 0 0 normal
-1 sprites/openttdgui.png 8bpp 440 440 20 20 0 0 normal
-1 sprites/openttdgui.png 8bpp 466 440 20 20 0 0 normal
+ -1 sprites/openttdgui.png 8bpp 490 440 20 20 0 0 normal
diff --git a/media/extra_grf/openttdgui.png b/media/extra_grf/openttdgui.png
index 6f011b654d..28ad2fbafe 100644
Binary files a/media/extra_grf/openttdgui.png and b/media/extra_grf/openttdgui.png differ
diff --git a/media/extra_grf/palette.nfo b/media/extra_grf/palette.nfo
new file mode 100644
index 0000000000..4a6ae69505
--- /dev/null
+++ b/media/extra_grf/palette.nfo
@@ -0,0 +1,20 @@
+//
+// $Id$
+//
+// This file is part of OpenTTD.
+// OpenTTD 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, version 2.
+// OpenTTD 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 OpenTTD. If not, see .
+//
+
+ -1 * 0 0C "All black palette"
+ -1 * 0 05 18 01
+ -1 * 0 00 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+ 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+ 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+ 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+ 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+ 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+ 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+ 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01 01
+ 01
diff --git a/media/extra_grf/shore.nfo b/media/extra_grf/shore.nfo
index 70fae8f4d8..7b7c12ad3b 100644
--- a/media/extra_grf/shore.nfo
+++ b/media/extra_grf/shore.nfo
@@ -47,7 +47,7 @@
-1 sprites/shore.png 8bpp 82 200 64 32 -31 -1 normal
-1 sprites/shore.png 8bpp 162 200 64 31 -31 -8 normal
-1 * 6 07 83 01 \7! 03 0C
- -1 * 44 0C "Missing shore tile graphics for the toyland climate"
+ -1 * 52 0C "Missing shore tile graphics for the toyland climate"
-1 * 3 05 0D 0A
-1 sprites/shore.png 8bpp 290 200 64 15 -31 0 normal
-1 sprites/shore.png 8bpp 370 200 64 31 -31 -8 normal
diff --git a/media/openttd.desktop.in b/media/openttd.desktop.in
index 11b3cc6313..513ff712df 100644
--- a/media/openttd.desktop.in
+++ b/media/openttd.desktop.in
@@ -9,3 +9,4 @@ Exec=!!TTD!!
Terminal=false
Categories=!!MENU_GROUP!!
Comment=A clone of Transport Tycoon Deluxe
+Keywords=game;simulation;transport;tycoon;deluxe;economics;multiplayer;money;train;ship;bus;truck;aircraft;cargo;
diff --git a/os/debian/changelog b/os/debian/changelog
index 3f3ae6256f..d56400af01 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,3 +1,171 @@
+openttd (1.5.0~beta2-0) unstable; urgency=low
+
+ * New upstream release 1.5.0-beta2
+
+ -- OpenTTD Tue, 24 Feb 2015 21:00:00 +0100
+
+openttd (1.5.0~beta1-0) unstable; urgency=low
+
+ * New upstream release 1.5.0-beta1
+
+ -- OpenTTD Wed, 24 Dec 2014 21:00:00 +0100
+
+openttd (1.4.4-0) unstable; urgency=low
+
+ * New upstream release 1.4.4
+
+ -- OpenTTD Tue, 21 Oct 2014 21:00:00 +0200
+
+openttd (1.4.4~RC1-0) unstable; urgency=low
+
+ * New upstream release 1.4.4-RC1
+
+ -- OpenTTD Wed, 08 Oct 2014 19:00:00 +0200
+
+openttd (1.4.3-0) unstable; urgency=low
+
+ * New upstream release 1.4.3
+
+ -- OpenTTD Tue, 23 Sep 2014 21:00:00 +0200
+
+openttd (1.4.3~RC2-0) unstable; urgency=low
+
+ * New upstream release 1.4.3-RC2
+
+ -- OpenTTD Sun, 14 Sep 2014 19:00:00 +0200
+
+openttd (1.4.3~RC1-0) unstable; urgency=low
+
+ * New upstream release 1.4.3-RC1
+
+ -- OpenTTD Sun, 07 Sep 2014 19:00:00 +0200
+
+openttd (1.4.2-0) unstable; urgency=low
+
+ * New upstream release 1.4.2
+
+ -- OpenTTD Sat, 16 Aug 2014 21:00:00 +0200
+
+openttd (1.4.2~RC2-0) unstable; urgency=low
+
+ * New upstream release 1.4.2-RC2
+
+ -- OpenTTD Sun, 03 Aug 2014 18:00:00 +0200
+
+openttd (1.4.2~RC1-0) unstable; urgency=low
+
+ * New upstream release 1.4.2-RC1
+
+ -- OpenTTD Thu, 03 Jul 2014 21:00:00 +0200
+
+openttd (1.4.1-0) unstable; urgency=low
+
+ * New upstream release 1.4.1
+
+ -- OpenTTD Mon, 02 Jun 2014 21:00:00 +0200
+
+openttd (1.4.1~RC2-0) unstable; urgency=low
+
+ * New upstream release 1.4.1-RC2
+
+ -- OpenTTD Sun, 18 May 2014 21:00:00 +0200
+
+openttd (1.4.1~RC1-0) unstable; urgency=low
+
+ * New upstream release 1.4.1-RC1
+
+ -- OpenTTD Sun, 04 May 2014 21:00:00 +0200
+
+openttd (1.4.0-0) unstable; urgency=low
+
+ * New upstream release 1.4.0
+
+ -- OpenTTD Tue, 01 Apr 2014 21:00:00 +0200
+
+openttd (1.4.0~RC1-0) unstable; urgency=low
+
+ * New upstream release 1.4.0-RC1
+
+ -- OpenTTD Tue, 17 Mar 2014 21:00:00 +0100
+
+openttd (1.4.0~beta5-0) unstable; urgency=low
+
+ * New upstream release 1.4.0-beta5
+
+ -- OpenTTD Tue, 25 Feb 2014 10:15:00 +0100
+
+openttd (1.4.0~beta4-0) unstable; urgency=low
+
+ * New upstream release 1.4.0-beta4
+
+ -- OpenTTD Thu, 06 Feb 2014 21:00:00 +0100
+
+openttd (1.4.0~beta3-0) unstable; urgency=low
+
+ * New upstream release 1.4.0-beta3
+
+ -- OpenTTD Tue, 21 Jan 2014 21:00:00 +0100
+
+openttd (1.4.0~beta2-0) unstable; urgency=low
+
+ * New upstream release 1.4.0-beta2
+
+ -- OpenTTD Tue, 07 Jan 2014 21:00:00 +0100
+
+openttd (1.4.0~beta1-0) unstable; urgency=low
+
+ * New upstream release 1.4.0-beta1
+
+ -- OpenTTD Tue, 24 Dec 2013 00:00:00 +0100
+
+openttd (1.3.3-0) unstable; urgency=low
+
+ * New upstream release 1.3.3
+
+ -- OpenTTD Fri, 29 Nov 2013 19:00:00 +0100
+
+openttd (1.3.3~RC2-0) unstable; urgency=low
+
+ * New upstream release 1.3.3-RC2
+
+ -- OpenTTD Sun, 24 Nov 2013 19:00:00 +0100
+
+openttd (1.3.3~RC1-0) unstable; urgency=low
+
+ * New upstream release 1.3.3-RC1
+
+ -- OpenTTD Sun, 17 Nov 2013 19:00:00 +0100
+
+openttd (1.3.2-0) unstable; urgency=low
+
+ * New upstream release 1.3.2
+
+ -- OpenTTD Sat, 27 Jul 2013 18:00:00 +0200
+
+openttd (1.3.2~RC2-0) unstable; urgency=low
+
+ * New upstream release 1.3.2-RC2
+
+ -- OpenTTD Sat, 13 Jul 2013 12:00:00 +0200
+
+openttd (1.3.2~RC1-0) unstable; urgency=low
+
+ * New upstream release 1.3.2-RC1
+
+ -- OpenTTD Sun, 30 Jun 2013 12:00:00 +0200
+
+openttd (1.3.1-0) unstable; urgency=low
+
+ * New upstream release 1.3.1
+
+ -- OpenTTD Sat, 01 Jun 2013 00:00:00 +0300
+
+openttd (1.3.1~RC1-0) unstable; urgency=low
+
+ * New upstream release 1.3.1-RC1
+
+ -- OpenTTD Fri, 17 May 2013 22:00:00 +0200
+
openttd (1.3.0-0) unstable; urgency=low
* New upstream release 1.3.0
diff --git a/os/debian/control b/os/debian/control
index de22a807ae..54e14ce5d4 100644
--- a/os/debian/control
+++ b/os/debian/control
@@ -3,11 +3,10 @@ Section: games
Priority: optional
Maintainer: Matthijs Kooijman
Uploaders: Jordi Mallach
-DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, libicu-dev, liblzma-dev, liblzo2-dev
Standards-Version: 3.8.4
-Vcs-Browser: http://git.debian.org/?p=collab-maint/openttd.git
-Vcs-Git: git://git.debian.org/collab-maint/openttd.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/openttd.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/openttd.git
Homepage: http://www.openttd.org/
Package: openttd
diff --git a/os/debian/copyright b/os/debian/copyright
index c361d80dd2..be573b4825 100644
--- a/os/debian/copyright
+++ b/os/debian/copyright
@@ -1,77 +1,106 @@
-This package was debianized by Matthijs Kooijman
-on Wed, 15 Sep 2004 00:24:01 +0200.
-
-Upstream author: Ludvig Strigeus (ludde) and many others.
-Upstream homepage: http://www.openttd.org
-
-Copyright © 2004-2009 Ludvig Strigeous and others.
-
-OpenTTD License:
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License version 2.0 as
- published by the Free Software Foundation;
-
- 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 package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General Public License
-version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-
-This package contains an embedded version of the "Squirrel" programming
-language, which is shipped under the following license:
-
- Copyright (c) 2003-2009 Alberto Demichelis
-
- This software is provided 'as-is', without any
- express or implied warranty. In no event will the
- authors be held liable for any damages arising from
- the use of this software.
-
- Permission is granted to anyone to use this software
- for any purpose, including commercial applications,
- and to alter it and redistribute it freely, subject
- to the following restrictions:
-
- 1. The origin of this software must not be
- misrepresented; you must not claim that
- you wrote the original software. If you
- use this software in a product, an
- acknowledgment in the product
- documentation would be appreciated but is
- not required.
-
- 2. Altered source versions must be plainly
- marked as such, and must not be
- misrepresented as being the original
- software.
-
- 3. This notice may not be removed or
- altered from any source distribution.
-
-This package contains an implementation of the md5 hash algorithm, which
-is shipped under the following license:
-
- Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved.
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: OpenTTD
+Upstream-Contact: info@openttd.org, #openttd on irc.oftc.net
+Source: http://www.openttd.org
+
+
+Files: *
+Copyright: © 2004-2012 Ludvig Strigeous and others.
+License: GPL-2.0
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2.0 as
+ published by the Free Software Foundation;
+ .
+ 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 package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+Files: src/3rdparty/squirrel/*
+Copyright: © 2003-2009 Alberto Demichelis
+License: Zlib
+
+Files: src/3rdparty/md5/*
+Copyright: © 1999, 2000, 2002 Aladdin Enterprises. All rights reserved.
+License: Zlib
+
+
+License: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software in
+ a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ .
+ 2. Altered source versions must be plainly marked as such, and must not
+ be misrepresented as being the original software.
+ .
+ 3. This notice may not be removed or altered from any source
+ distribution.
+
+Files: os/dos/exe2coff/*
+Copyright: © 1998 DJ Delorie
+License: GPL-2.0 with additional restrictions
+ This document is Copyright (C) DJ Delorie and may be distributed
+ verbatim, but changing it is not allowed.
+ .
+ Source code copyright DJ Delorie is distributed under the terms of the
+ GNU General Public Licence, with the following exceptions:
+ .
+ * Sources used to build crt0.o, gcrt0.o, libc.a, libdbg.a, and
+ libemu.a are distributed under the terms of the GNU Library General
+ Public License, rather than the GNU GPL.
+ .
+ * Any existing copyright or authorship information in any given source
+ file must remain intact. If you modify a source file, a notice to that
+ effect must be added to the authorship information in the source file.
+ .
+ * Runtime binaries, as provided by DJ in DJGPP, may be distributed
+ without sources ONLY if the recipient is given sufficient information
+ to obtain a copy of djgpp themselves. This primarily applies to
+ go32-v2.exe, emu387.dxe, and stubedit.exe.
+ .
+ * Runtime objects and libraries, as provided by DJ in DJGPP, when
+ linked into an application, may be distributed without sources ONLY
+ if the recipient is given sufficient information to obtain a copy of
+ djgpp themselves. This primarily applies to crt0.o and libc.a.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+Comment:
+ Given only the exe2coff.c file is distributed in the source distribution (and
+ nothing in Debian binary distribution), it seems only the 2nd condition
+ applies.
+
+Files: os/dos/cwsdpmi/*
+Source: http://homer.rice.edu/~sandmann/cwsdpmi/index.html
+Copyright: © 1995-2000 Charles W Sandmann (sandmann@clio.rice.edu)
+License: Custom binary-only license
+ This is release 5. The files in this binary distribution may be redistributed
+ under the GPL (with source) or without the source code provided:
+ .
+ * CWSDPMI.EXE or CWSDPR0.EXE are not modified in any way except via CWSPARAM.
+ .
+ * CWSDSTUB.EXE internal contents are not modified in any way except via
+ CWSPARAM or STUBEDIT. It may have a COFF image plus data appended to it.
+ .
+ * Notice to users that they have the right to receive the source code and/or
+ binary updates for CWSDPMI. Distributors should indicate a site for the
+ source in their documentation.
+Comment:
+ Files are distributed as binary only, so the second option in the license
+ ("without source code provided: ...") is applicable.
diff --git a/os/debian/menu b/os/debian/menu
index 58e23aaa08..3afa6e08e8 100644
--- a/os/debian/menu
+++ b/os/debian/menu
@@ -1,2 +1,2 @@
?package(openttd):needs="X11" section="Games/Simulation" title="OpenTTD"\
-command="/usr/share/games/openttd/openttd-wrapper" icon="/usr/share/pixmaps/openttd.32.xpm"
+command="/usr/games/openttd" icon="/usr/share/pixmaps/openttd.32.xpm"
diff --git a/os/debian/rules b/os/debian/rules
index 97094b0c58..dfd39253ef 100755
--- a/os/debian/rules
+++ b/os/debian/rules
@@ -4,7 +4,7 @@
# Use debhelper default for all targets (but some are overridden below).
%:
- dh $@
+ dh --parallel $@
DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -12,21 +12,29 @@ ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
+# This prevents linking uselessly to libicudata and silences a warning
+# in the build process.
+DEB_LDFLAGS_MAINT_APPEND="-Wl,-as-needed"
+
+# Enable all hardening options (since openttd offers a network-listening
+# service that handles untrusted data).
+DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+# Load buildflags (this uses dpkg-buildflags). Note that we don't export
+# them, but instead pass them to ./configure explicitly.
+include /usr/share/dpkg/buildflags.mk
+
# Pass custom options to configure. Since it's not autoconf but a custom
# script, some of the option names are slightly different. We also need
# to be explicit about the dependencies, in case we're not running in a
# clean build root.
override_dh_auto_configure:
- ./configure $(CROSS) --prefix-dir=/usr --install-dir=debian/openttd --without-allegro --with-zlib --with-sdl --with-png --with-freetype --with-fontconfig --with-icu --with-liblzo2 --with-lzma --without-iconv --disable-strip CFLAGS="$(CFLAGS) -g" LDFLAGS="$(LDFLAGS) -Wl,-as-needed"
+ ./configure $(CROSS) --prefix-dir=/usr --install-dir=debian/openttd --without-allegro --with-zlib --with-sdl --with-png --with-freetype --with-fontconfig --with-icu --with-liblzo2 --with-lzma --without-xdg-basedir --without-iconv --disable-strip CFLAGS="$(CFLAGS) $(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CFLAGS_BUILD="$(CFLAGS) $(CPPFLAGS)" CXXFLAGS_BUILD="$(CXXFLAGS) $(CPPFLAGS)" LDFLAGS_BUILD="$(LDFLAGS)"
# Do some extra installation
override_dh_auto_install:
$(MAKE) install DO_NOT_INSTALL_CHANGELOG=1 DO_NOT_INSTALL_LICENSE=1
- # Install the wrapper and make it executable
- install -d debian/openttd/usr/share/games/openttd/
- install -m755 debian/openttd-wrapper debian/openttd/usr/share/games/openttd/
-
# Don't do testing. Because the OpenTTD Makefile always does dependency
# generation (even on invalid targets), dh_auto_test thinks there is a
# "test" target, while there isn't.
diff --git a/os/dos/cwsdpmi/README.licensing b/os/dos/cwsdpmi/README.licensing
new file mode 100644
index 0000000000..112b02a087
--- /dev/null
+++ b/os/dos/cwsdpmi/README.licensing
@@ -0,0 +1,3 @@
+The files in this directory are not licensed under the same terms as the
+rest of OpenTTD. Licensing details can be found in OpenTTD's readme.txt
+and in this directory or subdirectories as well.
diff --git a/os/dos/cwsdpmi.exe b/os/dos/cwsdpmi/cwsdpmi.exe
similarity index 100%
rename from os/dos/cwsdpmi.exe
rename to os/dos/cwsdpmi/cwsdpmi.exe
diff --git a/os/dos/cwsdpmi.txt b/os/dos/cwsdpmi/cwsdpmi.txt
similarity index 100%
rename from os/dos/cwsdpmi.txt
rename to os/dos/cwsdpmi/cwsdpmi.txt
diff --git a/os/dos/cwsdstub.exe b/os/dos/cwsdpmi/cwsdstub.exe
similarity index 100%
rename from os/dos/cwsdstub.exe
rename to os/dos/cwsdpmi/cwsdstub.exe
diff --git a/os/dos/exe2coff/README.licensing b/os/dos/exe2coff/README.licensing
new file mode 100644
index 0000000000..112b02a087
--- /dev/null
+++ b/os/dos/exe2coff/README.licensing
@@ -0,0 +1,3 @@
+The files in this directory are not licensed under the same terms as the
+rest of OpenTTD. Licensing details can be found in OpenTTD's readme.txt
+and in this directory or subdirectories as well.
diff --git a/os/dos/copying b/os/dos/exe2coff/copying
similarity index 100%
rename from os/dos/copying
rename to os/dos/exe2coff/copying
diff --git a/os/dos/copying.dj b/os/dos/exe2coff/copying.dj
similarity index 100%
rename from os/dos/copying.dj
rename to os/dos/exe2coff/copying.dj
diff --git a/os/dos/copying.lib b/os/dos/exe2coff/copying.lib
similarity index 100%
rename from os/dos/copying.lib
rename to os/dos/exe2coff/copying.lib
diff --git a/os/dos/exe2coff.c b/os/dos/exe2coff/exe2coff.c
similarity index 100%
rename from os/dos/exe2coff.c
rename to os/dos/exe2coff/exe2coff.c
diff --git a/os/dos/make_dos_binary_selfcontained.sh b/os/dos/make_dos_binary_selfcontained.sh
index c21e29d2c3..259e502372 100755
--- a/os/dos/make_dos_binary_selfcontained.sh
+++ b/os/dos/make_dos_binary_selfcontained.sh
@@ -3,9 +3,9 @@
# $Id$
cd `dirname $0`
-cc -o exe2coff exe2coff.c || exit
+cc -o exe2coff/exe2coff exe2coff/exe2coff.c || exit
cp $1 binary.exe || exit
-./exe2coff binary.exe || exit
-cat cwsdstub.exe binary > binary.exe || exit
+./exe2coff/exe2coff binary.exe || exit
+cat cwsdpmi/cwsdstub.exe binary > binary.exe || exit
mv binary.exe $1
-rm binary exe2coff
+rm binary exe2coff/exe2coff
diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd
index f21961f7fb..6fe6dace66 100644
--- a/os/os2/installer/make_installer.cmd
+++ b/os/os2/installer/make_installer.cmd
@@ -1,6 +1,6 @@
@echo off
-set OPENTTD_VERSION=1.3.0
+set OPENTTD_VERSION=1.6.0
set OPENSFX_VERSION=0.8.0
set NOSOUND_VERSION=0.8.0
set OPENGFX_VERSION=1.2.0
diff --git a/os/rpm/openttd.spec b/os/rpm/openttd.spec
index 91ffc8dfdc..5ad5a53cab 100644
--- a/os/rpm/openttd.spec
+++ b/os/rpm/openttd.spec
@@ -17,9 +17,9 @@
#
Name: openttd
-Version: 1.3.beta2
+Version: 1.6.beta1
Release: 0
-%define srcver 1.3.0-beta2
+%define srcver 1.6.0-beta1
Summary: An open source reimplementation of Chris Sawyer's Transport Tycoon Deluxe
License: GPL-2.0
Group: Amusements/Games/Strategy/Other
diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi
index c2045788e2..ebe9ed3dcd 100644
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -1,9 +1,9 @@
# Version numbers to update
!define APPV_MAJOR 1
-!define APPV_MINOR 3
+!define APPV_MINOR 6
!define APPV_MAINT 0
-!define APPV_BUILD 5
-!define APPV_EXTRA ""
+!define APPV_BUILD 0
+!define APPV_EXTRA "-beta1"
!define APPNAME "OpenTTD" ; Define application name
!define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version
@@ -545,15 +545,22 @@ FunctionEnd
;-------------------------------------------------------------------------------
; Determine windows version, returns "win9x" if Win9x/Me/2000/XP SP2- or "winnt" for the rest on the stack
Function GetWindowsVersion
+ GetVersion::WindowsPlatformArchitecture
+ Pop $R0
+ IntCmp $R0 64 WinNT 0
ClearErrors
StrCpy $R0 "win9x"
${If} ${IsNT}
${If} ${IsWinXP}
${AndIf} ${AtLeastServicePack} 3
${OrIf} ${AtLeastWin2003}
- StrCpy $R0 "winnt"
+ GoTo WinNT
${EndIf}
${EndIf}
+ GoTo Done
+WinNT:
+ StrCpy $R0 "winnt"
+Done:
Push $R0
FunctionEnd
diff --git a/projects/generate b/projects/generate
index 542a27d6e1..42b684d2af 100755
--- a/projects/generate
+++ b/projects/generate
@@ -77,7 +77,7 @@ safety_check() {
done
}
-grep '\.h' "$ROOT_DIR/source.list" | grep -v '../objs/langs/table/strings.h\|../objs/settings/table/settings.h' | sed 's/ //' | sort > tmp.headers.source.list
+grep '\.h' "$ROOT_DIR/source.list" | grep -v '../objs/langs/table/strings.h\|../objs/settings/table/settings.h' | sed 's/ //g' | sort > tmp.headers.source.list
find "$ROOT_DIR/src" \( -iname "*.h" -or -iname "*.hpp" \) -and -not -ipath "*/.svn/*" | sed "s~$ROOT_DIR/src/~~" | sort > tmp.headers.src
if [ -n "`diff tmp.headers.source.list tmp.headers.src`" ]; then
echo "The following headers are missing in source.list and not in /src/ or vice versa."
diff --git a/projects/generate.vbs b/projects/generate.vbs
index 87c27ab387..4e1e886873 100755
--- a/projects/generate.vbs
+++ b/projects/generate.vbs
@@ -173,6 +173,7 @@ Function load_main_data(filename, ByRef vcxproj, ByRef filters, ByRef files)
line = "MSVC" Or _
line = "DIRECTMUSIC" Or _
line = "AI" Or _
+ line = "SSE" Or _
line = "HAVE_THREAD" _
) Then skip = skip + 1
deep = deep + 1
diff --git a/projects/langs_vs100.vcxproj b/projects/langs_vs100.vcxproj
index be9e0c6227..078a7b374a 100644
--- a/projects/langs_vs100.vcxproj
+++ b/projects/langs_vs100.vcxproj
@@ -227,6 +227,12 @@
..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)
..\bin\lang\korean.lng;%(Outputs)
+
+ Generating latin language file
+ ..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"
+ ..\src\lang\english.txt;..\objs\strgen\strgen.exe;%(AdditionalInputs)
+ ..\bin\lang\latin.lng;%(Outputs)
+
Generating latvian language file
..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "%(FullPath)"
diff --git a/projects/langs_vs100.vcxproj.filters b/projects/langs_vs100.vcxproj.filters
index 64221319e2..fb16aa64e0 100644
--- a/projects/langs_vs100.vcxproj.filters
+++ b/projects/langs_vs100.vcxproj.filters
@@ -97,6 +97,9 @@
Translations
+
+ Translations
+
Translations
diff --git a/projects/langs_vs80.vcproj b/projects/langs_vs80.vcproj
index 6cea19753f..1413a80d27 100644
--- a/projects/langs_vs80.vcproj
+++ b/projects/langs_vs80.vcproj
@@ -513,6 +513,21 @@
/>
+
+
+
+
+
diff --git a/projects/langs_vs90.vcproj b/projects/langs_vs90.vcproj
index 5fe8dca8d8..db6fef1a43 100644
--- a/projects/langs_vs90.vcproj
+++ b/projects/langs_vs90.vcproj
@@ -514,6 +514,21 @@
/>
+
+
+
+
+
diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj
index c632a3a019..0571ef4862 100644
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -102,7 +102,7 @@
Size
true
..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)
true
Sync
MultiThreaded
@@ -156,7 +156,7 @@
/MP %(AdditionalOptions)
Disabled
..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
@@ -204,7 +204,7 @@
Size
true
..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)
true
Sync
MultiThreaded
@@ -256,7 +256,7 @@
/MP %(AdditionalOptions)
Disabled
..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
@@ -304,12 +304,14 @@
+
+
@@ -339,6 +341,7 @@
+
@@ -353,7 +356,6 @@
-
@@ -384,6 +386,7 @@
+
@@ -421,6 +424,7 @@
+
@@ -434,6 +438,7 @@
+
@@ -491,6 +496,7 @@
+
@@ -564,6 +570,7 @@
+
@@ -638,6 +645,7 @@
+
@@ -676,6 +684,7 @@
+
@@ -798,7 +807,6 @@
-
@@ -861,6 +869,8 @@
+
+
@@ -875,6 +885,7 @@
+
@@ -889,6 +900,7 @@
+
@@ -944,13 +956,8 @@
-
-
-
-
-
@@ -1030,6 +1037,8 @@
+
+
@@ -1092,6 +1101,8 @@
+
+
@@ -1109,12 +1120,22 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters
index 3146a24272..0b6dc573b4 100644
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -141,6 +141,9 @@
Source Files
+
+ Source Files
+
Source Files
@@ -159,6 +162,9 @@
Source Files
+
+ Source Files
+
Source Files
@@ -246,6 +252,9 @@
Source Files
+
+ Source Files
+
Source Files
@@ -288,9 +297,6 @@
Source Files
-
- Source Files
-
Source Files
@@ -381,6 +387,9 @@
Source Files
+
+ Source Files
+
Source Files
@@ -492,6 +501,9 @@
Header Files
+
+ Header Files
+
Header Files
@@ -531,6 +543,9 @@
Header Files
+
+ Header Files
+
Header Files
@@ -702,6 +717,9 @@
Header Files
+
+ Header Files
+
Header Files
@@ -921,6 +939,9 @@
Header Files
+
+ Header Files
+
Header Files
@@ -1143,6 +1164,9 @@
Header Files
+
+ Header Files
+
Header Files
@@ -1257,6 +1281,9 @@
Core Source Code
+
+ Core Source Code
+
Core Source Code
@@ -1623,9 +1650,6 @@
Command handlers
-
- Command handlers
-
Command handlers
@@ -1812,6 +1836,12 @@
Save/Load handlers
+
+ Save/Load handlers
+
+
+ Save/Load handlers
+
Tables
@@ -1854,6 +1884,9 @@
Tables
+
+ Tables
+
Tables
@@ -1896,6 +1929,9 @@
Tables
+
+ Tables
+
Tables
@@ -2061,27 +2097,12 @@
Squirrel headers
-
- Squirrel headers
-
-
- Squirrel headers
-
-
- Squirrel headers
-
Squirrel headers
-
- Squirrel headers
-
Squirrel headers
-
- Squirrel headers
-
Squirrel headers
@@ -2319,6 +2340,12 @@
Script API
+
+ Script API
+
+
+ Script API
+
Script API
@@ -2505,6 +2532,12 @@
Script API Implementation
+
+ Script API Implementation
+
+
+ Script API Implementation
+
Script API Implementation
@@ -2556,6 +2589,12 @@
Blitters
+
+ Blitters
+
+
+ Blitters
+
Blitters
@@ -2574,6 +2613,30 @@
Blitters
+
+ Blitters
+
+
+ Blitters
+
+
+ Blitters
+
+
+ Blitters
+
+
+ Blitters
+
+
+ Blitters
+
+
+ Blitters
+
+
+ Blitters
+
Blitters
diff --git a/projects/openttd_vs100.vcxproj.in b/projects/openttd_vs100.vcxproj.in
index ce522dad8b..7a4f0bce81 100644
--- a/projects/openttd_vs100.vcxproj.in
+++ b/projects/openttd_vs100.vcxproj.in
@@ -102,7 +102,7 @@
Size
true
..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)
true
Sync
MultiThreaded
@@ -156,7 +156,7 @@
/MP %(AdditionalOptions)
Disabled
..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
@@ -204,7 +204,7 @@
Size
true
..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)
true
Sync
MultiThreaded
@@ -256,7 +256,7 @@
/MP %(AdditionalOptions)
Disabled
..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)
+ WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebug
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 30bb9df721..f6b938ed7d 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -52,7 +52,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="0"
@@ -156,7 +156,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -257,7 +257,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64;WITH_ASSERT"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64;WITH_ASSERT"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="0"
@@ -362,7 +362,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -486,6 +486,10 @@
RelativePath=".\..\src\console_cmds.cpp"
>
+
+
@@ -510,6 +514,10 @@
RelativePath=".\..\src\depot.cpp"
>
+
+
@@ -626,6 +634,10 @@
RelativePath=".\..\src\linkgraph\mcf.cpp"
>
+
+
@@ -682,10 +694,6 @@
RelativePath=".\..\src\order_backup.cpp"
>
-
-
@@ -806,6 +814,10 @@
RelativePath=".\..\src\viewport.cpp"
>
+
+
@@ -958,6 +970,10 @@
RelativePath=".\..\src\console_type.h"
>
+
+
@@ -1010,6 +1026,10 @@
RelativePath=".\..\src\direction_type.h"
>
+
+
@@ -1238,6 +1258,10 @@
RelativePath=".\..\src\linkgraph\mcf.h"
>
+
+
@@ -1530,6 +1554,10 @@
RelativePath=".\..\src\roadveh.h"
>
+
+
@@ -1826,6 +1854,10 @@
RelativePath=".\..\src\viewport_func.h"
>
+
+
@@ -1982,6 +2014,10 @@
RelativePath=".\..\src\core\smallmatrix_type.hpp"
>
+
+
@@ -2482,10 +2518,6 @@
RelativePath=".\..\src\depot_cmd.cpp"
>
-
-
@@ -2738,6 +2770,14 @@
RelativePath=".\..\src\saveload\waypoint_sl.cpp"
>
+
+
+
+
+
+
@@ -2854,6 +2898,10 @@
RelativePath=".\..\src\table\strgen_tables.h"
>
+
+
@@ -3090,34 +3138,14 @@
RelativePath=".\..\src\3rdparty\squirrel\include\sqstdaux.h"
>
-
-
-
-
-
-
-
-
-
-
@@ -3454,6 +3482,14 @@
RelativePath=".\..\src\script\api\script_story_page.hpp"
>
+
+
+
+
@@ -3706,6 +3742,14 @@
RelativePath=".\..\src\script\api\script_story_page.cpp"
>
+
+
+
+
@@ -3778,6 +3822,14 @@
RelativePath=".\..\src\blitter\32bpp_anim.hpp"
>
+
+
+
+
@@ -3802,6 +3854,38 @@
RelativePath=".\..\src\blitter\32bpp_simple.hpp"
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/projects/openttd_vs80.vcproj.in b/projects/openttd_vs80.vcproj.in
index 0c64f78527..57938f9e91 100644
--- a/projects/openttd_vs80.vcproj.in
+++ b/projects/openttd_vs80.vcproj.in
@@ -52,7 +52,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="0"
@@ -156,7 +156,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -257,7 +257,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64;WITH_ASSERT"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64;WITH_ASSERT"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="0"
@@ -362,7 +362,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 61a3d5130f..84e6fffa3c 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -53,7 +53,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="0"
@@ -155,7 +155,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -255,7 +255,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64;WITH_ASSERT"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64;WITH_ASSERT"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="0"
@@ -359,7 +359,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -483,6 +483,10 @@
RelativePath=".\..\src\console_cmds.cpp"
>
+
+
@@ -507,6 +511,10 @@
RelativePath=".\..\src\depot.cpp"
>
+
+
@@ -623,6 +631,10 @@
RelativePath=".\..\src\linkgraph\mcf.cpp"
>
+
+
@@ -679,10 +691,6 @@
RelativePath=".\..\src\order_backup.cpp"
>
-
-
@@ -803,6 +811,10 @@
RelativePath=".\..\src\viewport.cpp"
>
+
+
@@ -955,6 +967,10 @@
RelativePath=".\..\src\console_type.h"
>
+
+
@@ -1007,6 +1023,10 @@
RelativePath=".\..\src\direction_type.h"
>
+
+
@@ -1235,6 +1255,10 @@
RelativePath=".\..\src\linkgraph\mcf.h"
>
+
+
@@ -1527,6 +1551,10 @@
RelativePath=".\..\src\roadveh.h"
>
+
+
@@ -1823,6 +1851,10 @@
RelativePath=".\..\src\viewport_func.h"
>
+
+
@@ -1979,6 +2011,10 @@
RelativePath=".\..\src\core\smallmatrix_type.hpp"
>
+
+
@@ -2479,10 +2515,6 @@
RelativePath=".\..\src\depot_cmd.cpp"
>
-
-
@@ -2735,6 +2767,14 @@
RelativePath=".\..\src\saveload\waypoint_sl.cpp"
>
+
+
+
+
+
+
@@ -2851,6 +2895,10 @@
RelativePath=".\..\src\table\strgen_tables.h"
>
+
+
@@ -3087,34 +3135,14 @@
RelativePath=".\..\src\3rdparty\squirrel\include\sqstdaux.h"
>
-
-
-
-
-
-
-
-
-
-
@@ -3451,6 +3479,14 @@
RelativePath=".\..\src\script\api\script_story_page.hpp"
>
+
+
+
+
@@ -3703,6 +3739,14 @@
RelativePath=".\..\src\script\api\script_story_page.cpp"
>
+
+
+
+
@@ -3775,6 +3819,14 @@
RelativePath=".\..\src\blitter\32bpp_anim.hpp"
>
+
+
+
+
@@ -3799,6 +3851,38 @@
RelativePath=".\..\src\blitter\32bpp_simple.hpp"
>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/projects/openttd_vs90.vcproj.in b/projects/openttd_vs90.vcproj.in
index 01166221f8..2793927bdb 100644
--- a/projects/openttd_vs90.vcproj.in
+++ b/projects/openttd_vs90.vcproj.in
@@ -53,7 +53,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="0"
@@ -155,7 +155,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -255,7 +255,7 @@
FavorSizeOrSpeed="2"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64;WITH_ASSERT"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64;WITH_ASSERT"
StringPooling="true"
ExceptionHandling="1"
RuntimeLibrary="0"
@@ -359,7 +359,7 @@
AdditionalOptions="/MP"
Optimization="0"
AdditionalIncludeDirectories="..\objs\langs;..\objs\settings;..\src\3rdparty\squirrel\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WITH_SSE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";_SQ64"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
diff --git a/readme.txt b/readme.txt
index 68cc47200a..817f397b51 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,5 @@
-Last updated: 2013-06-01
-Release version: 1.3.1
+Last updated: 2015-02-24
+Release version: 1.5.0-beta2
------------------------------------------------------------------------
@@ -26,6 +26,7 @@ Table of contents
* 8.1) Translation
* 8.2) Previewing
9.0) Troubleshooting
+10.0) Licensing
X.X) Credits
@@ -35,9 +36,9 @@ OpenTTD is a transport simulation game based upon the popular game Transport
Tycoon Deluxe, written by Chris Sawyer. It attempts to mimic the original
game as closely as possible while extending it with new features.
-OpenTTD is licensed under the GNU General Public License version 2.0. For
-more information, see the file 'COPYING'.
-
+OpenTTD is licensed under the GNU General Public License version 2.0,
+but includes some 3rd party software under different licenses. See the
+section "Licensing" below for details.
2.0) Contacting
---- ----------
@@ -281,7 +282,8 @@ your operating system:
C:\Documents and Settings\\My Documents\OpenTTD (2000, XP)
C:\Users\\Documents\OpenTTD (Vista, 7)
Mac OSX: ~/Documents/OpenTTD
- Linux: ~/.openttd
+ Linux: $XDG_DATA_HOME/openttd which is usually ~/.local/share/openttd when
+ built with XDG base directory support, otherwise ~/.openttd
3. The shared directory
Windows: C:\Documents and Settings\All Users\Shared Documents\OpenTTD (2000, XP)
C:\Users\Public\Documents\OpenTTD (Vista, 7)
@@ -306,9 +308,9 @@ chosen main OpenTTD directory:
32bpp Sets: newgrf (or a subdirectory thereof)
Music Sets: baseset (or a subdirectory thereof)
AIs: ai (or a subdirectory thereof)
- AI Libraries: ai/libraries (or a subdirectory thereof)
+ AI Libraries: ai/library (or a subdirectory thereof)
Game Scripts (GS): game (or a subdirectory thereof)
- GS Libraries: game/libraries (or a subdirectory thereof)
+ GS Libraries: game/library (or a subdirectory thereof)
Savegames: save
Automatic Savegames: save/autosave
Scenarios: scenario
@@ -321,10 +323,13 @@ Notes:
others.
- The previous search order is also used for NewGRFs and openttd.cfg.
- If openttd.cfg is not found, then it will be created using the 2, 4, 1, 3,
- 5 order.
+ 5 order. When built with XDG base directory support, openttd.cfg will be
+ created in $XDG_CONFIG_HOME/openttd which is usually ~/.config/openttd.
- Savegames will be relative to the config file only if there is no save/
directory in paths with higher priority than the config file path, but
autosaves and screenshots will always be relative to the config file.
+ Unless the configuration file is in $XDG_CONFIG_HOME/openttd, then all
+ other files will be saved under $XDG_DATA_HOME/openttd.
The preferred setup:
Place 3rd party files in shared directory (or in personal directory if you do
@@ -476,9 +481,9 @@ DOS:
website. Compilation is straight forward: use make, but do a './configure'
before the first build. The build binary will need cwsdpmi.exe to be in
the same directory as the openttd executable. cwsdpmi.exe can be found in
- the os/dos subdirectory. If you compile with stripping turned on a binary
- will be generated that does not need cwsdpmi.exe by adding the cswdstub.exe
- to the created OpenTTD binary.
+ the os/dos/cwsdpmi subdirectory. If you compile with stripping turned on a
+ binary will be generated that does not need cwsdpmi.exe by adding the
+ cswdstub.exe to the created OpenTTD binary.
7.1) Required/optional libraries
---- ---------------------------
@@ -642,50 +647,80 @@ development section (http://www.tt-forums.net/viewforum.php?f=66) or GrfCrawler
(see section 4.2 'OpenTTD directories') and rescan the list of available NewGRFs.
Once you have all missing files, you are set to go.
+10.0) Licensing
+----- ---------
+OpenTTD is licensed under the GNU General Public License version 2.0. For
+the complete license text, see the file 'COPYING'. This license applies
+to all files in this distribution, except as noted below.
+
+The squirrel implementation in src/3rdparty/squirrel is licensed under
+the Zlib license. See src/3rdparty/squirrel/COPYRIGHT for the complete
+license text.
+
+The md5 implementation in src/3rdparty/md5 is licensed under the Zlib
+license. See the comments in the source files in src/3rdparty/md5 for
+the complete license text.
+
+The implementations of Posix getaddrinfo and getnameinfo for OS/2 in
+src/3rdparty/os2 are distributed partly under the GNU Lesser General Public
+License 2.1, and partly under the (3-clause) BSD license. The exact licensing
+terms can be found in src/3rdparty/os2/getaddrinfo.c resp.
+src/3rdparty/os2/getnameinfo.c.
+
+The exe2coff implementation in os/dos/exe2coff is available under the
+GPL, with a number of additional terms. See os/dos/exe2coff/copying and
+os/dos/exe2coff/copying.dj for the exact licensing terms.
+
+The CWSDPMI implementation in os/dos/cwsdpmi is distributed under a
+custom binary-only license that prohibits modification. The exact
+licensing terms can be found in os/dos/cwsdpmi/cwsdpmi.txt. The sources
+for these files can be downloaded at its author site, at:
+http://homer.rice.edu/~sandmann/cwsdpmi/csdpmi5s.zip
X.X) Credits
---- -------
The OpenTTD team (in alphabetical order):
- Albert Hofkamp (Alberth) - GUI expert
- Jean-François Claeys (Belugas) - GUI, newindustries and more
- Matthijs Kooijman (blathijs) - Pathfinder-guru, pool rework
- Ulf Hermann (fonsinchen) - Cargo Distribution
- Christoph Elsenhans (frosch) - General coding
- Loïc Guilloux (glx) - Windows Expert
- Michael Lutz (michi_cc) - Path based signals
- Owen Rudge (orudge) - Forum host, OS/2 port
- Peter Nelson (peter1138) - Spiritual descendant from newGRF gods
- Ingo von Borstel (planetmaker) - Support
- Remko Bijker (Rubidium) - Lead coder and way more
- Zdeněk Sojka (SmatZ) - Bug finder and fixer
- José Soler (Terkhen) - General coding
- Thijs Marinussen (Yexo) - AI Framework
- Leif Linse (Zuu) - AI/Game Script
+ Albert Hofkamp (Alberth) - GUI expert (since 0.7)
+ Matthijs Kooijman (blathijs) - Pathfinder-guru, Debian port (since 0.3)
+ Ulf Hermann (fonsinchen) - Cargo Distribution (since 1.3)
+ Christoph Elsenhans (frosch) - General coding (since 0.6)
+ Loïc Guilloux (glx) - Windows Expert (since 0.4.5)
+ Michael Lutz (michi_cc) - Path based signals (since 0.7)
+ Owen Rudge (orudge) - Forum host, OS/2 port (since 0.1)
+ Peter Nelson (peter1138) - Spiritual descendant from newGRF gods (since 0.4.5)
+ Ingo von Borstel (planetmaker) - General coding, Support (since 1.1)
+ Remko Bijker (Rubidium) - Lead coder and way more (since 0.4.5)
+ José Soler (Terkhen) - General coding (since 1.0)
+ Leif Linse (Zuu) - AI/Game Script (since 1.2)
Inactive Developers:
- Bjarni Corfitzen (Bjarni) - MacOSX port, coder and vehicles
- Victor Fischer (Celestar) - Programming everywhere you need him to
- Tamás Faragó (Darkvater) - Ex-Lead coder
- Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;)
- Jonathan Coome (Maedhros) - High priest of the NewGRF Temple
- Attila Bán (MiHaMiX) - WebTranslator 1 and 2
- Christoph Mallon (Tron) - Programmer, code correctness police
+ Jean-François Claeys (Belugas) - GUI, newindustries and more (0.4.5 - 1.0)
+ Bjarni Corfitzen (Bjarni) - MacOSX port, coder and vehicles (0.3 - 0.7)
+ Victor Fischer (Celestar) - Programming everywhere you need him to (0.3 - 0.6)
+ Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;) (0.4.5 - 0.6)
+ Jonathan Coome (Maedhros) - High priest of the NewGRF Temple (0.5 - 0.6)
+ Attila Bán (MiHaMiX) - WebTranslator 1 and 2 (0.3 - 0.5)
+ Zdeněk Sojka (SmatZ) - Bug finder and fixer (0.6 - 1.3)
+ Christoph Mallon (Tron) - Programmer, code correctness police (0.3 - 0.5)
+ Patric Stout (TrueBrain) - NoProgrammer (0.3 - 1.2), sys op (active)
+ Thijs Marinussen (Yexo) - AI Framework, General (0.6 - 1.3)
Retired Developers:
- Ludvig Strigeus (ludde) - OpenTTD author, main coder (0.1 - 0.3.3)
- Serge Paquet (vurlix) - Assistant project manager, coder (0.1 - 0.3.3)
- Dominik Scherer (dominik81) - Lead programmer, GUI expert (0.3.0 - 0.3.6)
- Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker
- Patric Stout (TrueBrain) - NoProgrammer (0.3 - 1.2), sys op (active)
+ Tamás Faragó (Darkvater) - Ex-Lead coder (0.3 - 0.5)
+ Dominik Scherer (dominik81) - Lead programmer, GUI expert (0.3 - 0.3)
+ Emil Djupfeld (egladil) - MacOSX port (0.4 - 0.6)
+ Simon Sasburg (HackyKid) - Bug fixer (0.4 - 0.4.5)
+ Ludvig Strigeus (ludde) - Original author of OpenTTD, main coder (0.1 - 0.3)
+ Cian Duffy (MYOB) - BeOS port / manual writing (0.1 - 0.3)
+ Petr Baudiš (pasky) - Many patches, newgrf support, etc. (0.3 - 0.3)
+ Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker (0.6 - 0.7)
+ Serge Paquet (vurlix) - 2nd contributor after ludde (0.1 - 0.3)
Thanks to:
Josef Drexler - For his great work on TTDPatch.
Marcin Grzegorczyk - For his TTDPatch work and documentation of Transport Tycoon Deluxe internals and track foundations
- Petr Baudiš (pasky) - Many patches, newgrf support, etc.
- Simon Sasburg (HackyKid) - For the many bugfixes he has blessed us with
Stefan Meißner (sign_de) - For his work on the console
Mike Ragsdale - OpenTTD installer
- Cian Duffy (MYOB) - BeOS port / manual writing
Christian Rosentreter (tokai) - MorphOS / AmigaOS port
Richard Kempton (RichK67) - Additional airports, initial TGP implementation
Alberto Demichelis - Squirrel scripting language
diff --git a/source.list b/source.list
index 04b6ed45e3..62b1dd3f43 100644
--- a/source.list
+++ b/source.list
@@ -12,12 +12,14 @@ cheat.cpp
command.cpp
console.cpp
console_cmds.cpp
+cpu.cpp
crashlog.cpp
currency.cpp
date.cpp
debug.cpp
dedicated.cpp
depot.cpp
+disaster_vehicle.cpp
driver.cpp
economy.cpp
effectvehicle.cpp
@@ -47,6 +49,7 @@ linkgraph/linkgraph.cpp
linkgraph/linkgraphjob.cpp
linkgraph/linkgraphschedule.cpp
linkgraph/mcf.cpp
+linkgraph/refresh.cpp
map.cpp
misc.cpp
mixer.cpp
@@ -61,7 +64,6 @@ network/network_server.cpp
network/network_udp.cpp
openttd.cpp
order_backup.cpp
-os_timer.cpp
pbs.cpp
progress.cpp
rail.cpp
@@ -97,6 +99,10 @@ townname.cpp
#else
#if OS2
os/os2/os2.cpp
+ 3rdparty/os2/getaddrinfo.c
+ 3rdparty/os2/getaddrinfo.h
+ 3rdparty/os2/getnameinfo.c
+ 3rdparty/os2/getnameinfo.h
#else
#if OSX
os/macosx/crashlog_osx.cpp
@@ -110,6 +116,9 @@ townname.cpp
vehicle.cpp
vehiclelist.cpp
viewport.cpp
+#if SSE
+viewport_sprite_sorter_sse4.cpp
+#end
waypoint.cpp
widget.cpp
window.cpp
@@ -154,6 +163,7 @@ console_func.h
console_gui.h
console_internal.h
console_type.h
+cpu.h
crashlog.h
currency.h
date_func.h
@@ -167,6 +177,7 @@ depot_map.h
depot_type.h
direction_func.h
direction_type.h
+disaster_vehicle.h
music/dmusic.h
driver.h
economy_base.h
@@ -224,6 +235,7 @@ linkgraph/linkgraphjob.h
linkgraph/linkgraphjob_base.h
linkgraph/linkgraphschedule.h
linkgraph/mcf.h
+linkgraph/refresh.h
livery.h
map_func.h
map_type.h
@@ -297,6 +309,7 @@ road_internal.h
road_type.h
roadstop_base.h
roadveh.h
+safeguards.h
screenshot.h
sdl.h
sound/sdl_s.h
@@ -371,6 +384,7 @@ vehicle_gui_base.h
vehicle_type.h
vehiclelist.h
viewport_func.h
+viewport_sprite_sorter.h
viewport_type.h
water.h
waypoint_base.h
@@ -426,6 +440,7 @@ core/random_func.cpp
core/random_func.hpp
core/smallmap_type.hpp
core/smallmatrix_type.hpp
+core/smallstack_type.hpp
core/smallvec_type.hpp
core/sort_func.hpp
core/string_compare_type.hpp
@@ -554,7 +569,6 @@ autoreplace_cmd.cpp
clear_cmd.cpp
company_cmd.cpp
depot_cmd.cpp
-disaster_cmd.cpp
group_cmd.cpp
industry_cmd.cpp
misc_cmd.cpp
@@ -619,6 +633,8 @@ saveload/subsidy_sl.cpp
saveload/town_sl.cpp
saveload/vehicle_sl.cpp
saveload/waypoint_sl.cpp
+saveload/extended_ver_sl.h
+saveload/extended_ver_sl.cpp
# Tables
table/airport_defaults.h
@@ -635,6 +651,7 @@ table/control_codes.h
table/elrail_data.h
table/engines.h
table/genland.h
+table/heightmap_colours.h
table/industry_land.h
table/landscape_sprite.h
table/newgrf_debug_data.h
@@ -649,6 +666,7 @@ table/roadveh_movement.h
table/sprites.h
table/station_land.h
table/strgen_tables.h
+table/string_colours.h
../objs/langs/table/strings.h
table/town_land.h
table/townname.h
@@ -712,13 +730,8 @@ script/squirrel_std.hpp
3rdparty/squirrel/squirrel/sqpcheader.h
3rdparty/squirrel/squirrel/sqstate.h
3rdparty/squirrel/include/sqstdaux.h
-3rdparty/squirrel/include/sqstdblob.h
-3rdparty/squirrel/sqstdlib/sqstdblobimpl.h
-3rdparty/squirrel/include/sqstdio.h
3rdparty/squirrel/include/sqstdmath.h
-3rdparty/squirrel/sqstdlib/sqstdstream.h
3rdparty/squirrel/include/sqstdstring.h
-3rdparty/squirrel/include/sqstdsystem.h
3rdparty/squirrel/squirrel/sqstring.h
3rdparty/squirrel/squirrel/sqtable.h
3rdparty/squirrel/include/squirrel.h
@@ -808,6 +821,8 @@ script/api/script_signlist.hpp
script/api/script_station.hpp
script/api/script_stationlist.hpp
script/api/script_story_page.hpp
+script/api/script_storypagelist.hpp
+script/api/script_storypageelementlist.hpp
script/api/script_subsidy.hpp
script/api/script_subsidylist.hpp
script/api/script_testmode.hpp
@@ -872,6 +887,8 @@ script/api/script_signlist.cpp
script/api/script_station.cpp
script/api/script_stationlist.cpp
script/api/script_story_page.cpp
+script/api/script_storypagelist.cpp
+script/api/script_storypageelementlist.cpp
script/api/script_subsidy.cpp
script/api/script_subsidylist.cpp
script/api/script_testmode.cpp
@@ -893,12 +910,26 @@ script/api/script_window.cpp
#else
blitter/32bpp_anim.cpp
blitter/32bpp_anim.hpp
+#if SSE
+blitter/32bpp_anim_sse4.cpp
+blitter/32bpp_anim_sse4.hpp
+#end
blitter/32bpp_base.cpp
blitter/32bpp_base.hpp
blitter/32bpp_optimized.cpp
blitter/32bpp_optimized.hpp
blitter/32bpp_simple.cpp
blitter/32bpp_simple.hpp
+#if SSE
+blitter/32bpp_sse_func.hpp
+blitter/32bpp_sse_type.h
+blitter/32bpp_sse2.cpp
+blitter/32bpp_sse2.hpp
+blitter/32bpp_sse4.cpp
+blitter/32bpp_sse4.hpp
+blitter/32bpp_ssse3.cpp
+blitter/32bpp_ssse3.hpp
+#end
blitter/8bpp_base.cpp
blitter/8bpp_base.hpp
blitter/8bpp_optimized.cpp
@@ -1082,7 +1113,10 @@ music/null_m.cpp
#else
#if DOS
#else
- music/extmidi.cpp
+ #if MORPHOS
+ #else
+ music/extmidi.cpp
+ #end
#end
#end
#end
diff --git a/src/3rdparty/README.licensing b/src/3rdparty/README.licensing
new file mode 100644
index 0000000000..112b02a087
--- /dev/null
+++ b/src/3rdparty/README.licensing
@@ -0,0 +1,3 @@
+The files in this directory are not licensed under the same terms as the
+rest of OpenTTD. Licensing details can be found in OpenTTD's readme.txt
+and in this directory or subdirectories as well.
diff --git a/src/3rdparty/md5/md5.cpp b/src/3rdparty/md5/md5.cpp
index d2d6fbab77..2111a8eb81 100644
--- a/src/3rdparty/md5/md5.cpp
+++ b/src/3rdparty/md5/md5.cpp
@@ -60,6 +60,8 @@
#include "../../core/endian_func.hpp"
#include "md5.h"
+#include "../../safeguards.h"
+
#define T_MASK ((uint32)~0)
#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
diff --git a/src/3rdparty/os2/getaddrinfo.c b/src/3rdparty/os2/getaddrinfo.c
new file mode 100644
index 0000000000..3cdda21f1b
--- /dev/null
+++ b/src/3rdparty/os2/getaddrinfo.c
@@ -0,0 +1,299 @@
+/*
+ * This file is part of libESMTP, a library for submission of RFC 2822
+ * formatted electronic mail messages using the SMTP protocol described
+ * in RFC 2821.
+ *
+ * Copyright (C) 2001,2002 Brian Stafford
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* An emulation of the RFC 2553 / Posix getaddrinfo resolver interface.
+ */
+
+#if !HAVE_GETADDRINFO
+
+/* Need to turn off Posix features in glibc to build this */
+#undef _POSIX_C_SOURCE
+#undef _XOPEN_SOURCE
+
+#include "getaddrinfo.h"
+//#include "compat/inet_pton.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+static struct addrinfo *
+dup_addrinfo (struct addrinfo *info, void *addr, size_t addrlen) {
+ struct addrinfo *ret;
+
+ ret = malloc (sizeof (struct addrinfo));
+ if (ret == NULL)
+ return NULL;
+ memcpy (ret, info, sizeof (struct addrinfo));
+ ret->ai_addr = malloc (addrlen);
+ if (ret->ai_addr == NULL) {
+ free (ret);
+ return NULL;
+ }
+ memcpy (ret->ai_addr, addr, addrlen);
+ ret->ai_addrlen = addrlen;
+ return ret;
+}
+
+int
+getaddrinfo (const char *nodename, const char *servname,
+ const struct addrinfo *hints, struct addrinfo **res)
+{
+ struct hostent *hp;
+ struct servent *servent;
+ const char *socktype;
+ int port;
+ struct addrinfo hint, result;
+ struct addrinfo *ai, *sai, *eai;
+ char **addrs;
+
+ if (servname == NULL && nodename == NULL)
+ return EAI_NONAME;
+
+ memset (&result, 0, sizeof result);
+
+ /* default for hints */
+ if (hints == NULL) {
+ memset (&hint, 0, sizeof hint);
+ hint.ai_family = PF_UNSPEC;
+ hints = &hint;
+ }
+
+ if (servname == NULL)
+ port = 0;
+ else {
+ /* check for tcp or udp sockets only */
+ if (hints->ai_socktype == SOCK_STREAM)
+ socktype = "tcp";
+ else if (hints->ai_socktype == SOCK_DGRAM)
+ socktype = "udp";
+ else
+ return EAI_SERVICE;
+ result.ai_socktype = hints->ai_socktype;
+
+ /* Note: maintain port in host byte order to make debugging easier */
+ if (isdigit (*servname))
+ port = strtol (servname, NULL, 10);
+ else if ((servent = getservbyname (servname, socktype)) != NULL)
+ port = ntohs (servent->s_port);
+ else
+ return EAI_NONAME;
+ }
+
+ /* if nodename == NULL refer to the local host for a client or any
+ for a server */
+ if (nodename == NULL) {
+ struct sockaddr_in sin;
+
+ /* check protocol family is PF_UNSPEC or PF_INET - could try harder
+ for IPv6 but that's more code than I'm prepared to write */
+ if (hints->ai_family == PF_UNSPEC || hints->ai_family == PF_INET)
+ result.ai_family = AF_INET;
+ else
+ return EAI_FAMILY;
+
+ sin.sin_family = result.ai_family;
+ sin.sin_port = htons (port);
+ if (hints->ai_flags & AI_PASSIVE)
+ sin.sin_addr.s_addr = htonl (INADDR_ANY);
+ else
+ sin.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
+ /* Duplicate result and addr and return */
+ *res = dup_addrinfo (&result, &sin, sizeof sin);
+ return (*res == NULL) ? EAI_MEMORY : 0;
+ }
+
+ /* If AI_NUMERIC is specified, use inet_pton to translate numbers and
+ dots notation. */
+ if (hints->ai_flags & AI_NUMERICHOST) {
+ struct sockaddr_in sin;
+
+ /* check protocol family is PF_UNSPEC or PF_INET */
+ if (hints->ai_family == PF_UNSPEC || hints->ai_family == PF_INET)
+ result.ai_family = AF_INET;
+ else
+ return EAI_FAMILY;
+
+ sin.sin_family = result.ai_family;
+ sin.sin_port = htons (port);
+ if (inet_pton(result.ai_family, nodename, &sin.sin_addr)==0)
+ return EAI_NONAME;
+ sin.sin_addr.s_addr = inet_addr (nodename);
+ /* Duplicate result and addr and return */
+ *res = dup_addrinfo (&result, &sin, sizeof sin);
+ return (*res == NULL) ? EAI_MEMORY : 0;
+ }
+
+#if HAVE_H_ERRNO
+ h_errno = 0;
+#endif
+ errno = 0;
+ hp = gethostbyname(nodename);
+ if (hp == NULL) {
+#ifdef EAI_SYSTEM
+ if (errno != 0) {
+ return EAI_SYSTEM;
+ }
+#endif
+ switch (h_errno) {
+ case HOST_NOT_FOUND:
+ return EAI_NODATA;
+ case NO_DATA:
+ return EAI_NODATA;
+#if defined(NO_ADDRESS) && NO_ADDRESS != NO_DATA
+ case NO_ADDRESS:
+ return EAI_NODATA;
+#endif
+ case NO_RECOVERY:
+ return EAI_FAIL;
+ case TRY_AGAIN:
+ return EAI_AGAIN;
+ default:
+ return EAI_FAIL;
+ }
+ return EAI_FAIL;
+ }
+
+ /* Check that the address family is acceptable.
+ */
+ switch (hp->h_addrtype) {
+ case AF_INET:
+ if (!(hints->ai_family == PF_UNSPEC || hints->ai_family == PF_INET))
+ return EAI_FAMILY;
+ break;
+#ifndef __OS2__
+ case AF_INET6:
+ if (!(hints->ai_family == PF_UNSPEC || hints->ai_family == PF_INET6))
+ return EAI_FAMILY;
+ break;
+#endif
+ default:
+ return EAI_FAMILY;
+ }
+
+ /* For each element pointed to by hp, create an element in the
+ result linked list. */
+ sai = eai = NULL;
+ for (addrs = hp->h_addr_list; *addrs != NULL; addrs++) {
+ struct sockaddr sa;
+ size_t addrlen;
+
+ if (hp->h_length < 1)
+ continue;
+ sa.sa_family = hp->h_addrtype;
+ switch (hp->h_addrtype) {
+ case AF_INET:
+ ((struct sockaddr_in *) &sa)->sin_port = htons (port);
+ memcpy (&((struct sockaddr_in *) &sa)->sin_addr,
+ *addrs, hp->h_length);
+ addrlen = sizeof (struct sockaddr_in);
+ break;
+#ifndef __OS2__
+ case AF_INET6:
+#if SIN6_LEN
+ ((struct sockaddr_in6 *) &sa)->sin6_len = hp->h_length;
+#endif
+ ((struct sockaddr_in6 *) &sa)->sin6_port = htons (port);
+ memcpy (&((struct sockaddr_in6 *) &sa)->sin6_addr,
+ *addrs, hp->h_length);
+ addrlen = sizeof (struct sockaddr_in6);
+ break;
+#endif
+ default:
+ continue;
+ }
+
+ result.ai_family = hp->h_addrtype;
+ ai = dup_addrinfo (&result, &sa, addrlen);
+ if (ai == NULL) {
+ freeaddrinfo (sai);
+ return EAI_MEMORY;
+ }
+ if (sai == NULL)
+ sai = ai;
+ else
+ eai->ai_next = ai;
+ eai = ai;
+ }
+
+ if (sai == NULL) {
+ return EAI_NODATA;
+ }
+
+ if (hints->ai_flags & AI_CANONNAME) {
+ sai->ai_canonname = malloc (strlen (hp->h_name) + 1);
+ if (sai->ai_canonname == NULL) {
+ freeaddrinfo (sai);
+ return EAI_MEMORY;
+ }
+ strcpy (sai->ai_canonname, hp->h_name);
+ }
+
+ *res = sai;
+ return 0;
+}
+
+void
+freeaddrinfo (struct addrinfo *ai)
+{
+ struct addrinfo *next;
+
+ while (ai != NULL) {
+ next = ai->ai_next;
+ if (ai->ai_canonname != NULL)
+ free (ai->ai_canonname);
+ if (ai->ai_addr != NULL)
+ free (ai->ai_addr);
+ free (ai);
+ ai = next;
+ }
+}
+
+const char *
+gai_strerror (int ecode)
+{
+ static const char *eai_descr[] = {
+ "no error",
+ "address family for nodename not supported", /* EAI_ADDRFAMILY */
+ "temporary failure in name resolution", /* EAI_AGAIN */
+ "invalid value for ai_flags", /* EAI_BADFLAGS */
+ "non-recoverable failure in name resolution", /* EAI_FAIL */
+ "ai_family not supported", /* EAI_FAMILY */
+ "memory allocation failure", /* EAI_MEMORY */
+ "no address associated with nodename", /* EAI_NODATA */
+ "nodename nor servname provided, or not known", /* EAI_NONAME */
+ "servname not supported for ai_socktype", /* EAI_SERVICE */
+ "ai_socktype not supported", /* EAI_SOCKTYPE */
+ "system error returned in errno", /* EAI_SYSTEM */
+ "argument buffer overflow", /* EAI_OVERFLOW */
+ };
+
+ if (ecode < 0 || ecode > (int) (sizeof eai_descr/ sizeof eai_descr[0]))
+ return "unknown error";
+ return eai_descr[ecode];
+}
+
+#endif /* HAVE_GETADDRINFO */
diff --git a/src/3rdparty/os2/getaddrinfo.h b/src/3rdparty/os2/getaddrinfo.h
new file mode 100644
index 0000000000..0a588a40a2
--- /dev/null
+++ b/src/3rdparty/os2/getaddrinfo.h
@@ -0,0 +1,101 @@
+#ifndef _getaddrinfo_h
+#define _getaddrinfo_h
+
+/*
+ * Shamelessly duplicated from the fetchmail public sources
+ * for use by the Squid Project under GNU Public License.
+ *
+ * Update/Maintenance History:
+ *
+ * 15-Aug-2007 : Copied from fetchmail 6.3.8
+ * - added protection around libray headers
+ *
+ * 16-Aug-2007 : Altered configure checks
+ * Un-hacked slightly to use system gethostbyname()
+ *
+ * Original License and code follows.
+ */
+
+/*
+ * This file is part of libESMTP, a library for submission of RFC 2822
+ * formatted electronic mail messages using the SMTP protocol described
+ * in RFC 2821.
+ *
+ * Copyright (C) 2001,2002 Brian Stafford
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* Structure and prototypes taken from RFC 2553 */
+
+/* SG 23/09/2007:
+On Windows the following definitions are already available, may be that
+this could be needed on some other platform */
+typedef int socklen_t;
+
+struct addrinfo {
+ int ai_flags; /* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
+ int ai_family; /* PF_xxx */
+ int ai_socktype; /* SOCK_xxx */
+ int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
+ socklen_t ai_addrlen; /* length of ai_addr */
+ char *ai_canonname; /* canonical name for nodename */
+ struct sockaddr *ai_addr; /* binary address */
+ struct addrinfo *ai_next; /* next structure in linked list */
+};
+
+/* Supposed to be defined in */
+#define AI_ADDRCONFIG 0
+#define AI_PASSIVE 1 /* Socket address is intended for `bind'. */
+#define AI_CANONNAME 2 /* Request for canonical name. */
+#define AI_NUMERICHOST 4 /* Don't use name resolution. */
+
+/* Supposed to be defined in */
+#define EAI_ADDRFAMILY 1 /* address family for nodename not supported */
+#define EAI_AGAIN 2 /* temporary failure in name resolution */
+#define EAI_BADFLAGS 3 /* invalid value for ai_flags */
+#define EAI_FAIL 4 /* non-recoverable failure in name resolution */
+#define EAI_FAMILY 5 /* ai_family not supported */
+#define EAI_MEMORY 6 /* memory allocation failure */
+#define EAI_NODATA 7 /* no address associated with nodename */
+#define EAI_NONAME 8 /* nodename nor servname provided, or not known */
+#define EAI_SERVICE 9 /* servname not supported for ai_socktype */
+#define EAI_SOCKTYPE 10 /* ai_socktype not supported */
+
+#ifndef EAI_SYSTEM
+/* Not defined on mingw32. */
+#define EAI_SYSTEM 11 /* System error returned in `errno'. */
+#endif
+#ifndef EAI_OVERFLOW
+/* Not defined on mingw32. */
+#define EAI_OVERFLOW 12 /* Argument buffer overflow. */
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* RFC 2553 / Posix resolver */
+int getaddrinfo (const char *nodename, const char *servname,
+ const struct addrinfo *hints, struct addrinfo **res);
+/* Free addrinfo structure and associated storage */
+void freeaddrinfo (struct addrinfo *ai);
+
+/* Convert error return from getaddrinfo() to string */
+const char *gai_strerror (int code);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _getaddrinfo_h */
diff --git a/src/3rdparty/os2/getnameinfo.c b/src/3rdparty/os2/getnameinfo.c
new file mode 100644
index 0000000000..14fd89ef15
--- /dev/null
+++ b/src/3rdparty/os2/getnameinfo.c
@@ -0,0 +1,367 @@
+/*
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, 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.
+ */
+
+/*
+ * Issues to be discussed:
+ * - RFC2553 says that we should raise error on short buffer. X/Open says
+ * we need to truncate the result. We obey RFC2553 (and X/Open should be
+ * modified). ipngwg rough consensus seems to follow RFC2553. RFC3493 says
+ * nothing about it, but defines a new error code EAI_OVERFLOW which seems
+ * to be intended the code for this case.
+ * - What is "local" in NI_NOFQDN? (see comments in the code)
+ * - NI_NAMEREQD and NI_NUMERICHOST conflict with each other.
+ * - (KAME extension) always attach textual scopeid (fe80::1%lo0), if
+ * sin6_scope_id is filled - standardization status?
+ * - what should we do if we should do getservbyport("sctp")?
+ */
+
+/*
+ * Considerations about thread-safeness
+ * The code in this file is thread-safe, and so the thread-safeness of
+ * getnameinfo() depends on the property of backend functions.
+ * - getservbyport() is not thread safe for most systems we are targeting.
+ * - getipnodebyaddr() is thread safe. However, many resolver libraries
+ * used in the function are not thread safe.
+ * - gethostbyaddr() is usually not thread safe.
+ */
+
+#if !HAVE_GETNAMEINFO
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "getaddrinfo.h"
+#include "getnameinfo.h"
+
+static const struct afd {
+ int a_af;
+ int a_addrlen;
+ int a_socklen;
+ int a_off;
+ int a_portoff;
+} afdl [] = {
+#if INET6
+ {PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6),
+ offsetof(struct sockaddr_in6, sin6_addr),
+ offsetof(struct sockaddr_in6, sin6_port)},
+#endif
+ {PF_INET, sizeof(struct in_addr), sizeof(struct sockaddr_in),
+ offsetof(struct sockaddr_in, sin_addr),
+ offsetof(struct sockaddr_in, sin_port)},
+ {0, 0, 0, 0, 0},
+};
+
+#if INET6
+static int ip6_parsenumeric __P((const struct sockaddr *, const char *, char *,
+ size_t, int));
+static int ip6_sa2str __P((const struct sockaddr_in6 *, char *, size_t, int));
+#endif
+
+int
+getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
+const struct sockaddr *sa;
+socklen_t salen;
+char *host;
+size_t hostlen;
+char *serv;
+size_t servlen;
+int flags;
+{
+ const struct afd *afd;
+ struct servent *sp;
+ struct hostent *hp;
+ unsigned short port;
+ int family, i;
+ const char *addr;
+ uint32_t v4a;
+ char numserv[512];
+
+ if (sa == NULL)
+ return EAI_FAIL;
+
+#if HAVE_SA_LEN /*XXX*/
+ if (sa->sa_len != salen)
+ return EAI_FAIL;
+#endif
+
+ family = sa->sa_family;
+ for (i = 0; afdl[i].a_af; i++)
+ if (afdl[i].a_af == family) {
+ afd = &afdl[i];
+ goto found;
+ }
+ return EAI_FAMILY;
+
+found:
+ if (salen != afd->a_socklen)
+ return EAI_FAIL;
+
+ /* network byte order */
+ memcpy(&port, (const char *)sa + afd->a_portoff, sizeof(port));
+ addr = (const char *)sa + afd->a_off;
+
+ if (serv == NULL || servlen == 0) {
+ /*
+ * do nothing in this case.
+ * in case you are wondering if "&&" is more correct than
+ * "||" here: RFC3493 says that serv == NULL OR servlen == 0
+ * means that the caller does not want the result.
+ */
+ } else {
+ if (flags & NI_NUMERICSERV)
+ sp = NULL;
+ else {
+ sp = getservbyport(port,
+ (flags & NI_DGRAM) ? "udp" : "tcp");
+ }
+ if (sp) {
+ if (strlen(sp->s_name) + 1 > servlen)
+ return EAI_OVERFLOW;
+ strncpy(serv, sp->s_name, servlen);
+ } else {
+ snprintf(numserv, sizeof(numserv), "%u", ntohs(port));
+ if (strlen(numserv) + 1 > servlen)
+ return EAI_OVERFLOW;
+ strncpy(serv, numserv, servlen);
+ }
+ }
+
+ switch (sa->sa_family) {
+ case AF_INET:
+ v4a = (uint32_t)
+ ntohl(((const struct sockaddr_in *)sa)->sin_addr.s_addr);
+ if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a))
+ flags |= NI_NUMERICHOST;
+ v4a >>= IN_CLASSA_NSHIFT;
+ if (v4a == 0)
+ flags |= NI_NUMERICHOST;
+ break;
+#if INET6
+ case AF_INET6: {
+ const struct sockaddr_in6 *sin6;
+ sin6 = (const struct sockaddr_in6 *)sa;
+ switch (sin6->sin6_addr.s6_addr[0]) {
+ case 0x00:
+ if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr))
+ ;
+ else if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr))
+ ;
+ else
+ flags |= NI_NUMERICHOST;
+ break;
+ default:
+ if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr))
+ flags |= NI_NUMERICHOST;
+ else if (IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
+ flags |= NI_NUMERICHOST;
+ break;
+ }
+ }
+ break;
+#endif
+ }
+ if (host == NULL || hostlen == 0) {
+ /*
+ * do nothing in this case.
+ * in case you are wondering if "&&" is more correct than
+ * "||" here: RFC3493 says that host == NULL or hostlen == 0
+ * means that the caller does not want the result.
+ */
+ } else if (flags & NI_NUMERICHOST) {
+ /* NUMERICHOST and NAMEREQD conflicts with each other */
+ if (flags & NI_NAMEREQD)
+ return EAI_NONAME;
+
+ goto numeric;
+ } else {
+#if USE_GETIPNODEBY
+ int h_error = 0;
+ hp = getipnodebyaddr(addr, afd->a_addrlen, afd->a_af, &h_error);
+#else
+ hp = gethostbyaddr(addr, afd->a_addrlen, afd->a_af);
+#if 0 // getnameinfo.c:161:9: error: variable 'h_error' set but not used
+#if HAVE_H_ERRNO
+ h_error = h_errno;
+#else
+ h_error = EINVAL;
+#endif
+#endif /* 0 */
+#endif
+
+ if (hp) {
+#if 0
+ if (flags & NI_NOFQDN) {
+ /*
+ * According to RFC3493 section 6.2, NI_NOFQDN
+ * means "node name portion of the FQDN shall
+ * be returned for local hosts." The following
+ * code tries to implement it by returning the
+ * first label (the part before the first
+ * period) of the FQDN. However, it is not
+ * clear if this always makes sense, since the
+ * given address may be outside of "local
+ * hosts." Due to the unclear description, we
+ * disable the code in this implementation.
+ */
+ char *p;
+ p = strchr(hp->h_name, '.');
+ if (p)
+ *p = '\0';
+ }
+#endif
+ if (strlen(hp->h_name) + 1 > hostlen) {
+#if USE_GETIPNODEBY
+ freehostent(hp);
+#endif
+ return EAI_OVERFLOW;
+ }
+ strncpy(host, hp->h_name, hostlen);
+#if USE_GETIPNODEBY
+ freehostent(hp);
+#endif
+ } else {
+ if (flags & NI_NAMEREQD)
+ return EAI_NONAME;
+
+numeric:
+ switch (afd->a_af) {
+#if INET6
+ case AF_INET6: {
+ int error;
+
+ if ((error = ip6_parsenumeric(sa, addr, host,
+ hostlen,
+ flags)) != 0)
+ return(error);
+ break;
+ }
+#endif
+ default:
+ if (inet_ntop(afd->a_af, addr, host,
+ hostlen) == NULL)
+ return EAI_SYSTEM;
+ break;
+ }
+ }
+ }
+ return(0);
+}
+
+#if INET6
+static int
+ip6_parsenumeric(sa, addr, host, hostlen, flags)
+const struct sockaddr *sa;
+const char *addr;
+char *host;
+size_t hostlen;
+int flags;
+{
+ int numaddrlen;
+ char numaddr[512];
+
+ if (inet_ntop(AF_INET6, addr, numaddr, sizeof(numaddr)) == NULL)
+ return EAI_SYSTEM;
+
+ numaddrlen = strlen(numaddr);
+ if (numaddrlen + 1 > hostlen) /* don't forget terminator */
+ return EAI_OVERFLOW;
+ strncpy(host, numaddr, hostlen);
+
+ if (((const struct sockaddr_in6 *)sa)->sin6_scope_id) {
+ char zonebuf[SQUIDHOSTNAMELEN];
+ int zonelen;
+
+ zonelen = ip6_sa2str(
+ (const struct sockaddr_in6 *)(const void *)sa,
+ zonebuf, sizeof(zonebuf), flags);
+ if (zonelen < 0)
+ return EAI_OVERFLOW;
+ if (zonelen + 1 + numaddrlen + 1 > hostlen)
+ return EAI_OVERFLOW;
+
+ /* construct */
+ memcpy(host + numaddrlen + 1, zonebuf,
+ (size_t)zonelen);
+ host[numaddrlen] = SCOPE_DELIMITER;
+ host[numaddrlen + 1 + zonelen] = '\0';
+ }
+
+ return 0;
+}
+
+/* ARGSUSED */
+static int
+ip6_sa2str(sa6, buf, bufsiz, flags)
+const struct sockaddr_in6 *sa6;
+char *buf;
+size_t bufsiz;
+int flags;
+{
+ unsigned int ifindex;
+ const struct in6_addr *a6;
+ int n;
+
+ ifindex = (unsigned int)sa6->sin6_scope_id;
+ a6 = &sa6->sin6_addr;
+
+#if NI_NUMERICSCOPE
+ if ((flags & NI_NUMERICSCOPE) != 0) {
+ n = snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id);
+ if (n < 0 || n >= bufsiz)
+ return -1;
+ else
+ return n;
+ }
+#endif
+
+ /* if_indextoname() does not take buffer size. not a good api... */
+ if ((IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6) ||
+ IN6_IS_ADDR_MC_NODELOCAL(a6)) && bufsiz >= IF_NAMESIZE) {
+ char *p = if_indextoname(ifindex, buf);
+ if (p)
+ return (strlen(p));
+ }
+
+ /* last resort */
+ n = snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id);
+ if (n < 0 || n >= bufsiz)
+ return -1;
+ else
+ return n;
+}
+#endif /* INET6 */
+#endif
diff --git a/src/3rdparty/os2/getnameinfo.h b/src/3rdparty/os2/getnameinfo.h
new file mode 100644
index 0000000000..c1861aa033
--- /dev/null
+++ b/src/3rdparty/os2/getnameinfo.h
@@ -0,0 +1,29 @@
+#ifndef _getnameinfo_h
+#define _getnameinfo_h
+/*
+ * Reconstructed from KAME getnameinfo.c (in lib/)
+ */
+
+ /* getnameinfo flags */
+#define NI_NOFQDN 0x0001
+#define NI_NUMERICHOST 0x0002 /* return numeric form of address */
+#define NI_NAMEREQD 0x0004 /* request DNS name */
+#define NI_NUMERICSERV 0x0008
+#define NI_DGRAM 0x0010
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* RFC 2553 / Posix resolver */
+int getnameinfo(const struct sockaddr *sa,
+ socklen_t salen,
+ char *host,
+ size_t hostlen,
+ char *serv,
+ size_t servlen,
+ int flags );
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _getnameinfo_h */
diff --git a/src/3rdparty/squirrel/COMPILE b/src/3rdparty/squirrel/COMPILE
deleted file mode 100644
index 8dbbf8c2fc..0000000000
--- a/src/3rdparty/squirrel/COMPILE
+++ /dev/null
@@ -1,41 +0,0 @@
-Squirrel 2.2.4 stable
---------------------------------------------------------
-What is in this distribution?
-
-squirrel
- static library implementing the compiler and interpreter of the language
-
-sqstdlib
- the standard utility libraries
-
-sq
- stand alone interpreter
-
-doc
- The manual
-
-etc
- a minimalistic embedding sample
-
-samples
- samples programs
-
-
-HOW TO COMPILE
----------------------------------------------------------
-GCC USERS
-.........................................................
-There is a very simple makefile that compiles all libraries and exes
-from the root of the project run 'make'
-
-for 32 bits systems
-
- $ make
-
-for 64 bits systems
-
- $ make sq64
-
-VISUAL C++ USERS
-.........................................................
-Open squirrel.dsw from the root project directory and build(dho!)
diff --git a/src/3rdparty/squirrel/HISTORY b/src/3rdparty/squirrel/HISTORY
deleted file mode 100644
index 8de77ac16a..0000000000
--- a/src/3rdparty/squirrel/HISTORY
+++ /dev/null
@@ -1,357 +0,0 @@
-***version 2.2.5 stable***
--sq_getsize() now returns userdatasize for classes and instances
--added parameter 'isstatic' to _newmember metamethod(thx G.Meyer)
--now array.sort() is implemented with heapsort
--added SQUIRREL_VERSION_NUMBER preprocessor definition
--now floats in scientific notation also accept numbers with no '.' (eg. 1e+6 or 1e6)
--fixed some compiler warning
--fixed a minor compiler bug
--fixed some bugs when SQUSEDOUBLE is used in 32bits systems
--fixed bug in GC
-
-***2009-11-15 ***
-***version 2.2.4 stable***
--fixed bug in functions with default parameters
-
-***2009-06-30 ***
-***version 2.2.3 stable***
--added sq_getfunctioninfo
--added compile time flag SQUSEDOUBLE to use double precision floats
--added global slot _floatsize_ int the base lib to recognize single precision and double precision builds
--sq_wakeupvm can now resume the vm with an exception
--added sqstd_format
--generators can now be instantiated by calling sq_call() or closure.call()
--fixed a bug in sqstd_printcallstack(thx takayuki_h)
--fixed modulo by zero(thx jup)
--fixed negative enums and constants
--fixed generator crash bug if invoked as tail call (thx Mr.Accident)
--fixed some minor bug
-
-***2008-09-24 ***
-***version 2.2.2 stable***
--fixed some behaviour inconsistencies in thread.call() and thread.wakeup() (thx Mr.Accident)
--fixed coroutine error propagation
--fixed lingering return value from native function (thx Tom Leonard)
--fixed a bug if array.sort() is given a bad sort function (thx Tom Leonard)
--fixed some minor api bug
--added sq_arrayremove() and sq_arrayinsert()
-
-***2008-05-16 ***
-***version 2.2.1 stable***
--fixed a tailcall bug
-
-***2008-02-17 ***
-***version 2.2 stable ***
--added _newslot metamethod in classes
--added enums added constants
--added sq_pushconsttable, sq_setconsttable
--added default param
--added octal literals(thx Dinosaur)
--fixed debug hook, 'calls' and 'returns' are properly notified in the same number.
--fixed a coroutine bug
-
-***2007-07-29 ***
-***version 2.1.2 stable***
--new behaviour for generators iteration using foreach
-now when a generator is iterated by foreach the value returned by a 'return val' statement
-will terminate the iteration but will not be returned as foreach iteration
--added sq_setclassudsize()
--added sq_clear()
--added table.clear(), array.clear()
--fixed sq_cmp() (thx jyuill)
--fixed minor bugs
-
-***2006-08-21 ***
-***version 2.1.1 stable***
--vm refactoring
--optimized internal function memory layout
--new global symbol _version_ (is the version string)
--code size optimization for float literals(on 32bits float builts)
--now the raw ref API(sq_addref etc...) is fully reentrant.
--fixed a bug in sq_getdelegate() now pushes null if the object doesn't have a delegate(thx MatzeB)
--improved C reference performances in NO_GARBAGE_COLLECTOR builds
--sq_getlocal() now enumerates also outer values.
--fixed regexp library for GCC users.
-
-***2006-03-19 ***
-***version 2.1 stable***
--added static class fields, new keyword static
--added 64bits architecture support
--added global slot _intsize_ int the base lib to recognize 32bits and 64bits builds
--added functions with fixed environment, closure.bindenv() built-in function
--all types except userdata and null implement the tostring() method
--string concatenation now invokes metamethod _tostring
--new metamethods for class objects _newmember and _inherited
--sq_call() sq_resume() sq_wakeupvm() have a new signature
--new C referencing implementation(scales more with the amount of references)
--refactored hash table
--new api functions sq_newslot(),sq_tobool(),sq_getbase(), sq_instanceof(), sq_bindenv()
--the api func sq_createslot was deprecated but still supported in form of C macro on top of sq_newslot
--sq_setreleasehook() now also works for classes
--stream.readstr() and stream.writestr() have been deprecated(this affects file and blob)
--fixed squirrel.h undeclared api calls
--fixed few minor bugs
--SQChar is now defined as wchar_t
--removed warning when building with -Wall -pedantic for GCC users
--added new std io function writeclosuretofile()
--added new std string functions strip(),rstrip(),lstrip() and split()
--regular expressions operators (+,*) now have more POSIX greedyness behaviour
--class constructors are now invoked as normal functions
-
-***2005-10-02 ***
-***version 2.0.5 stable***
--fixed some 64bits incompatibilities (thx sarge)
--fixed minor bug in the stdlib format() function (thx Rick)
--fixed a bug in dofile() that was preventing to compile empty files
--added new API sq_poptop() & sq_getfreevariable()
--some performance improvements
-
-***2005-08-14 ***
-***version 2.0.4 stable***
--weak references and related API calls
--added sq_objtobool()
--class instances memory policies improved(1 mem allocation for the whole instance)
--typetags are now declared as SQUserPointer instead of unsigned int
--first pass for 64bits compatibility
--fixed minor bug in the stdio stream
--fixed a bug in format()
--fixed bug in string.tointeger() and string.tofloat()
-
-***2005-06-24 ***
-***version 2.0.3 stable***
--dofile() and loadfile() in the iolib now can decode ASCII, UTF8 files UCS2 big-endian and little-endian
--sq_setparamscheck() : now typemesk can check for null
--added string escape sequence \xhhhh
--fixed some C++ standard incompatibilities
-
-***2005-05-15 ***
-***version 2.0.2 stable***
--performances improvements (expecially for GCC users)
--removed all dependencies from C++ exception handling
--various bugfixes
-
-***2005-04-12 ***
-***version 2.0.1 stable***
--various bugfixes
--sq_setparamscheck() now allows spaces in the typemask
-
-***2005-04-03 ***
-***version 2.0 stable***
--added API sq_gettypetag()
--added built-in function to the bool type(tointeger, tostring etc...)
-
-***2005-02-27 ***
-***version 2.0 release candidate 1(RC 1)***
--added API sq_reseterror()
--modified sq_release()
--now class instances can be cloned
--various bufixes
-
-***2005-01-26 ***
-***version 2.0 beta 1***
--added bool type
--class properties can be redefined in a derived class
--added ops *= /= and %=
--new syntax for class attributes declaration instead of ( and )
--increased the max number of literals per function from 65535 to 16777215
--now free variables have proper lexical scoping
--added API sq_createinstance(), sq_pushbool(), sq_getbool()
--added built-in function type()
--added built-in function obj.rawin(key) in table,class and instance
--sq_rawget() and sq_rawset() now work also on classes and instances
--the VM no longer uses C++ exception handling (more suitable for embedded devices)
--various bufixes
-
-***2004-12-21 ***
-***version 2.0 alpha 2***
--globals scoping changed, now if :: is omitted the VM automatically falls back on the root table
--various bufixes
--added class level attributes
-
-***2004-12-12 ***
-***version 2.0 alpha 1***
--codebase branch from version 1.x
--added classes
--added functions with variable number of parameters(vargc & vargv and the ...)
--0 and 0.0 are now considered 'false' by all conditional statements(if,while,for,?,do-while)
--added new api functions sq_newclass() sq_setinstanceup() sq_getinstanceup() sq_getattributes() sq_setattributes()
--modified api sq_settypetag()
-
-***2004-11-01 ***
-***version 1.0 stable***
--fixed some minor bug
--improoved operator 'delete' performances
--added scientific notation for float numbers( eg. 2.e16 or 2.e-2)
-
-***2004-08-30 ***
-***version 1.0 release candidate 2(RC 2)***
--fixed bug in the vm(thx Pierre Renaux)
--fixed bug in the optimizer(thx Pierre Renaux)
--fixed some bug in the documentation(thx JD)
--added new api functions for raw object handling
--removed nested multiline comments
--reduced memory footprint in C references
-
-***2004-08-23 ***
-***version 1.0 release candidate 1(RC 1)***
--fixed division by zero
--the 'in' operator and obj.rawget() do not query the default delegate anymore
--added function sq_getprintfunc()
--added new standard library 'auxlib'(implements default error handlers)
-
-***2004-07-12 ***
-***version 1.0 beta 4***
--fixed a bug in the integer.tochar() built-in method
--fixed unary minus operator
--fixed bug in dofile()
--fixed inconsistency between != and == operators(on float/integer comparison)
--added javascript style unsigned right shift operator '>>>'
--added array(size) constructor built-in function
--array.resize(size,[fill]) built-in function accepts an optional 'fill' value
--improved debug API, added sq_getclosureinfo() and sq_setnativeclosurename()
-
-***2004-05-23 ***
-***version 1.0 beta 3***
--minor vm bug fixes
--string allocation is now faster
--tables and array memory usage is now less conservative(they shrink)
--added regular expression routines in the standard library
--The 'c' expression now accepts only 1 character(thx irbrian)
--multiline strings <[ ]> have been substituted with C# style verbatim strings (eg. @"string")
--added new keyword 'parent' for accessing the delegate of tables and unserdata
--The metamethod '_clone' has been renamed '_cloned'
--the _delslot metamethod's behaviour and prototype have been changed
--new default function in the integer and float object 'tochar()'
--the built-in function chcode2string has been removed
--the default method [table].getdelegate() has been removed
--new api sq_rawdeleteslot()
--new table built-in method rawdelete(key)
--the dynamic mudule loading has been removed from the standard distribution
--some optimizations in the VM
-
-***2004-04-21 ***
-***version 1.0 beta 2***
--minor compiler/parser bug fixes
--sq_newclosure has a different prototype, the "paramscheck" of paramter has been moved to the new function sq_setparamscheck()
--sq_setparamscheck allows to add automatic parameters type checking in native closures
--sq_compile() lost the lineinfo parameter
--new api sq_enabledebuginfo() globally sets compiler's debug info generation
--added consistency check on bytecode serialization
--fixed += operator, now works on strings like +
--added global slot in the base lib _charsize_ to recognize unicode builds from ascii builds runtime
--added registry table
--new api call sq_pushregistrytable()
--added type tag to the userdata type sq_settypetag()
--sq_getuserdata now queries the userdata typetag
--the built in function collect_garbage() as been renamed collectgarbage() for consistency reasons
--new standard libraries(sqlibs are now obsolete)
-
-***2004-02-20 ***
-***version 1.0 beta 1***
--fixed a bug in the compiler (thanks Martin Kofler)
--fixed bug in the switch case statement
--fixed the _unm metamethod
--fixed minor bugs in the API
--fixed automatic stack resizing
--first beta version
- first pass code clean up in the VM and base lib
- first pass code coverege test has been done on VM and built-in lib
--new VM creation API sq_open() sq_close() (sq_newvm and sq_releasevm are now obsolete)
--new api allows to specifiy a "print" function to output text(sq_printfunc)
--added some small optimizations
--new cooperative multi-threading capabilities in the base library(coroutines), VMs are now a built in type("thread")
--new built in functions have been added for manipulating the new "thread" type
--friend virtual machines share the same root table, error handler and debug hook by default
--new compile time options
-
-***2004-01-19 ***
-***version 0.9 alpha***
--fixed a garbage collection bug
--fixed some API bugs(thanks to Joshua Jensen)
--fixed tail calls (in the version 0.8 the tail call optimization was erroneously disabled)
--new function parameters semantic, now passing a wrong number of parameters generates an exception
--native closures have now a built in parameter number checking
--sq_rawget and sq_rawset now work also on arrays
--sq_getsize now woks also on userdata
--the userdata release hook prototype is changed(now passes the size of the userdata)
--the lexer reader function now returns an integer instead of a char that allows better error checking on the input(thx Joshua Jensen)
--faster compiler
--try/catch blocks do not cause any runtime memory allocation anymore
-
-***2003-12-06 ***
-***version 0.8 alpha***
--fixed a bug that was preventing to have callable userdata throught the metamethod _call
--fixed a garbage collection bug
--fixed == operator now can compare correctly different types
--new built in method getstackinfos(level)
--improoved line informations precision for the debug hook
--new api call sq_compilebuffer()
--new built-in api function compilestring()
--new syntactic sugar for function declarations inside tables
--the debug API has been finalized
-
-***2003-11-17 ***
-***version 0.7 alpha***
--fixed critical bug SQInteger the tail call system
--fixed bug in the continue statement code generation
--fixed func call param issue(thanks to Rewoonenco Andrew)
--added _delslot metamethod(thanks to Rewoonenco Andrew)
--new multiline string expression ( delimited by <[ and ]> )
--normal strings ("") do not allow embedded new line anymore
--reduced vm memory footprint(C refs are shared between friend VMs)
--new api method sq_deleteslot()
--new debug hook event 'r' is triggered when a function returns
-
-***2003-11-04 ***
-***version 0.6 alpha***
--fixed switch statement(was executing the default case after a break)
--sq_call() doesn't pop the closure (just the params)
--the vm execution can be suspended from the C API anytime (micro-threads)
--new api calls sq_suspendvm() sq_wakeupvm() sq_getvmstate() and sq_reservestack()
-
-***2003-10-13 ***
-***version 0.5 alpha***
--fixed some minor bug
--tested with non ASCII identifiers in unicode mode(I've tried chinese chars)
--added built-in function string.find()
--the built-in function array.sort() optionally accepts a cmp(a,b) function
--the debug hook function now has a new prototype debug_hook(event_type,sourcefile,line,functionname)
--fixed some debug info imprecision
-
-***2003-10-01 ***
-***version 0.4 alpha***
--faster VM
--sq_call will pop arguments and closure also in case of failure
--fixed a bug in sq_remove
--now the VM detects delegation cycles(and throws an exception)
--new operators ++ and --
--new operator ',' comma operator
--fixed some expression precedence issue
--fixed bug in sq_arraypop
-
-***2003-09-15 ***
-***version 0.3 alpha***
--fixed a bug in array::insert()
--optional Unicode core(define SQUNICODE or _UNICODE on Win32)
--sq_compiler uses a new reader function SQLEXREADFUNC
--the debug hook passes 'l' instead of 'line' for line callbacks
- and 'c' instead of 'call' for call callbacks
--new array.extend() bulit-in function
--new API sq_clone()
-
-***2003-09-10 ***
-***version 0.2 pre-alpha***
--new completely reentrant VM (sq_open and sq_close are now obsolete)
--sq_newvm() has a new prototype
--allocators are now global and linked in the VM
--_newslot meta method added
--rawset creates a slot if doesn't exists
--the compiler error callback pass the vm handle(thanks Pierre Renaux)
--sq_setforeignptr() sq_getforeingptr() are now public
--sq_resume() now is possible to resume generators from C
--sq_getlasterror() retrieve the last thrown error
--improved docs
-
-***2003-09-06 ***
-***version 0.1 pre-alpha***
-first release
diff --git a/src/3rdparty/squirrel/Makefile b/src/3rdparty/squirrel/Makefile
deleted file mode 100644
index 594ec8b1c2..0000000000
--- a/src/3rdparty/squirrel/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-
-SQUIRREL=.
-MAKE=make
-
-sq32:
- cd squirrel; $(MAKE)
- cd sqstdlib; $(MAKE)
- cd sq; $(MAKE)
-
-sqprof:
- cd squirrel; $(MAKE) sqprof
- cd sqstdlib; $(MAKE) sqprof
- cd sq; $(MAKE) sqprof
-
-sq64:
- cd squirrel; $(MAKE) sq64
- cd sqstdlib; $(MAKE) sq64
- cd sq; $(MAKE) sq64
-
-clean:
- $(MAKE) -C squirrel clean
- $(MAKE) -C sqstdlib clean
- $(MAKE) -C sq clean
diff --git a/src/3rdparty/squirrel/README b/src/3rdparty/squirrel/README
deleted file mode 100644
index 9c3bd7b76d..0000000000
--- a/src/3rdparty/squirrel/README
+++ /dev/null
@@ -1,22 +0,0 @@
-The programming language SQUIRREL 2.2.5 stable
-
---------------------------------------------------
-The project has been compiled and run on Windows(Windows XP/2000 on Intel x86 Windows XP Pro on AMD x64) and
-Linux(Slackware 9.0 on Intel x86, Fedora Core 4 on AMD x64).
-
-Has been tested with the following compilers:
- MS Visual C++ 6.0,7.0,7.1 and 8.0 (32 and 64bits)
- MinGW gcc 3.2 (mingw special 20020817-1)
- Cygnus gcc 3.2
- Linux gcc 3.2.3
- Linux gcc 4.0.0 (x86 64bits)
-
-
-Feedback and suggestions are appreciated
-project page - http://www.squirrel-lang.org
-community forums - http://www.squirrel-lang.org/Forums
-wiki - http://wiki.squirrel-lang.org
-author - alberto@demichelis.net
-
-END OF README
-
diff --git a/src/3rdparty/squirrel/doc/sqstdlib2.chm b/src/3rdparty/squirrel/doc/sqstdlib2.chm
deleted file mode 100644
index fbf53ec2af..0000000000
Binary files a/src/3rdparty/squirrel/doc/sqstdlib2.chm and /dev/null differ
diff --git a/src/3rdparty/squirrel/doc/sqstdlib2.pdf b/src/3rdparty/squirrel/doc/sqstdlib2.pdf
deleted file mode 100644
index 72fc15c505..0000000000
--- a/src/3rdparty/squirrel/doc/sqstdlib2.pdf
+++ /dev/null
@@ -1,1714 +0,0 @@
-%PDF-1.3
-%
-4 0 obj
-<< /Type /Info
-/Producer (FOP 0.20.5) >>
-endobj
-5 0 obj
-<< /Length 246 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gaqd[\IQJ1&-UA:?a4/j=Osr[Jq*pMi=8^1`.4Za_?id24lM2b[+uF7AnR]0Q4ej;k9Tg),:)c*7W;lXW&kJok9tubis9_(_4P/*D/T*8;Q*)>(=mXhjT`"b>?n0Pb;#0GGp)YQMZ:%Nr.,]Ee)267S5JJPh(qWc.2JUaBD$]k#7;O+_fr2/Q4AiQp[&KcBNMUK-,KPb[[BBjHJC?@,=d"kc#.j8KbXf_i75B.qI)8(I~>
-endstream
-endobj
-6 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 5 0 R
->>
-endobj
-7 0 obj
-<< /Length 1047 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gasao966RV&AJ$CE(_tHW'$$Ddo4`99KG>D'5hXt!eaDq&+nrXf8D?8/YXB;^F4ot&;YF>$C33$R8(!afRg9emADDoN/Gq^kFG<%$"-FhiSoSSum`^8D^FT^E01>:QhB:j8S4iIc_3g`<(ZIeSFbcT)eJi3m:JO/0#ego2NMb(gI!*VY0P8Z-r@N'UT(?F"h&Y_<=^n-jDu4[b6tEH.H$cf-MA$FdM91QcQO2Y@7BLign\JkFbaS>$e3FcoJ8#_N6]YFu[7/uM16Gq?!%D'plAM.ilY2J3tif8V;%hMiO1D))GSQfbBUk8fujAtdoh%J0tictI5qs*AfS5DYn(Z39C&Oq!\YQr0-]D2BYiB#%'CkGuNnB-rtlq5%>`+ohaG([_Q,;0ekW8V3\9YY*8O:nV)n_%m^$N_@a(U%h&K?iem:)hFG6`XgqAkXEtJb#>mX`8g\)2frpN&1dqs'E(s<="*3eS;[87[IUJu*[?gVp3qK5f\oWadQc"(BZkuPdi.GH%,8S(K?6hi/DHRaZ"p9eoW5gf3)U.`2-e1b0HE4V;_4N5Et!nH-l]A^eYNg`ShQa#iU^IbipEr$0fPPB-//Fbr\r#uldV%o!ih_KBDnR/Zn4JU,"Y((^5(AZrjJ5d\'KQN/A9ARObUYE/M=g&.6pIj4RWPm4;<3RfEBJpQs(EM&jBY#d$^AG6
-endstream
-endobj
-8 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 7 0 R
->>
-endobj
-9 0 obj
-<< /Length 71 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Garg^iGoCd.c`?]8EV`b1=.gR0K1`91K?+0ZOMGdU/Zh'Y!=Te%#&:?HH*JE!
-endstream
-endobj
-10 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 9 0 R
->>
-endobj
-11 0 obj
-<< /Length 1275 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gb"/l9llag*6.GrMEQ\]$2_`c1!(]3FJdNRE9m.H8dl^SK@iclkmOSI`N7'NX((Wn%fY*'\qfHgs">qd@INiG'C+8p-fJpg+ep)):AID:a)$O@DI<]9P&O*DS:ja(N@j^PH(H$I.`b2)gH*!g-:L$GAet26_GB9i-)"(ZQ1E)@X&;t-\AG_S8(D1M?!Tj!j!WHB,0u#86'5]AEg05+)Qcb2rs+*?TU1HA;'B4)d>Ig?YAkY]\PIGdlW,j5(T1X&7JYAjVFa"5o#L%5-p.&P5p/usnSD4qoruWp7e&G3o-DZBZk;uafB`!XQcl&I9Et\%Fid0Z^G6EO)^G0GB)P9,OkJd)T;Al/+:s=""pb@c7ad<1,^krR=pQfQUKJmUEVLu55bS)06Tlt&hUo`"[1Y8$%nQa4#dat0il2.[oNC3Ff9<"$U,;ZZ/P7A6%hAR*5p4OT'JI[fpZT1"-0tSg#?lPM)m]Qr5eD1Cf?oHoK05ReFil6R-Bh:_&5@o(_(NFW1tB/H>B*-I'k])P$RFbfSdu)0g/d;b!cTD'"$e!UhAs]sXuf#ockl`a]d;C6G[G5]C_ngt)?YXc%m:./#kX/f&/a`&!pt`p@R#NY)^V6TV/NJj>m'(Ol%&J-#o\"PU!VR.jktbX]&B"?KRe.rU]?Ufq-#XNssdD'^NI*bRo([LB-,Na"/%TXR0ZUNj5/mn.U/XB%d/s[VJ[TY0'h8Q%5_;8WV&/dIZl[r(dK4jDXGKW$QO@QPScZYA#7H@AqAOAGa7CNW$kV&JP1:PY7:Vb?70sg:.rftX[KufNH4>6Uptf>`j8hDb?h(SHmJSST`;.3]!BXEX`)Rm/TYM'D#Rh1mO=;Ihgn&]L_amFbR\o0/fsEh!eL&^5:WUn>+=M_SnD4tE>M?(WCeQEEU\7(5jt2n.TqHOK'LJW@9gbn!mbuiJO!M:V4T>XTXYDWpH=:jHHOUIda06O2*3,G0tH\"l^`g3-b@1W`q,K#admI76]'m4n
-endstream
-endobj
-12 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 11 0 R
-/Annots 13 0 R
->>
-endobj
-13 0 obj
-[
-14 0 R
-16 0 R
-18 0 R
-20 0 R
-22 0 R
-24 0 R
-26 0 R
-28 0 R
-30 0 R
-32 0 R
-34 0 R
-36 0 R
-38 0 R
-40 0 R
-42 0 R
-44 0 R
-46 0 R
-48 0 R
-50 0 R
-52 0 R
-54 0 R
-56 0 R
-58 0 R
-60 0 R
-62 0 R
-64 0 R
-66 0 R
-68 0 R
-70 0 R
-72 0 R
-74 0 R
-76 0 R
-78 0 R
-80 0 R
-82 0 R
-84 0 R
-86 0 R
-88 0 R
-]
-endobj
-14 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 120.0 655.001 179.44 645.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 15 0 R
-/H /I
->>
-endobj
-16 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 120.0 644.001 228.88 634.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 17 0 R
-/H /I
->>
-endobj
-18 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 633.001 194.83 623.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 19 0 R
-/H /I
->>
-endobj
-20 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 622.001 231.06 612.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 21 0 R
-/H /I
->>
-endobj
-22 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 611.001 205.5 601.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 23 0 R
-/H /I
->>
-endobj
-24 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 600.001 169.28 590.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 25 0 R
-/H /I
->>
-endobj
-26 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 589.001 219.11 579.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 27 0 R
-/H /I
->>
-endobj
-28 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 578.001 210.5 568.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 29 0 R
-/H /I
->>
-endobj
-30 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 567.001 292.71 557.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 31 0 R
-/H /I
->>
-endobj
-32 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 120.0 556.001 196.66 546.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 33 0 R
-/H /I
->>
-endobj
-34 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 545.001 194.83 535.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 35 0 R
-/H /I
->>
-endobj
-36 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 534.001 231.06 524.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 37 0 R
-/H /I
->>
-endobj
-38 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 523.001 225.77 513.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 39 0 R
-/H /I
->>
-endobj
-40 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 512.001 169.28 502.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 41 0 R
-/H /I
->>
-endobj
-42 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 501.001 219.11 491.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 43 0 R
-/H /I
->>
-endobj
-44 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 490.001 214.39 480.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 45 0 R
-/H /I
->>
-endobj
-46 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 120.0 479.001 198.32 469.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 47 0 R
-/H /I
->>
-endobj
-48 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 468.001 194.83 458.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 49 0 R
-/H /I
->>
-endobj
-50 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 457.001 231.06 447.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 51 0 R
-/H /I
->>
-endobj
-52 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 446.001 169.28 436.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 53 0 R
-/H /I
->>
-endobj
-54 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 435.001 219.11 425.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 55 0 R
-/H /I
->>
-endobj
-56 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 120.0 424.001 206.66 414.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 57 0 R
-/H /I
->>
-endobj
-58 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 413.001 194.83 403.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 59 0 R
-/H /I
->>
-endobj
-60 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 402.001 231.06 392.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 61 0 R
-/H /I
->>
-endobj
-62 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 391.001 169.28 381.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 63 0 R
-/H /I
->>
-endobj
-64 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 380.001 219.11 370.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 65 0 R
-/H /I
->>
-endobj
-66 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 120.0 369.001 201.66 359.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 67 0 R
-/H /I
->>
-endobj
-68 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 358.001 194.83 348.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 69 0 R
-/H /I
->>
-endobj
-70 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 347.001 231.06 337.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 71 0 R
-/H /I
->>
-endobj
-72 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 336.001 220.49 326.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 73 0 R
-/H /I
->>
-endobj
-74 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 325.001 169.28 315.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 75 0 R
-/H /I
->>
-endobj
-76 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 314.001 219.11 304.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 77 0 R
-/H /I
->>
-endobj
-78 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 303.001 212.45 293.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 79 0 R
-/H /I
->>
-endobj
-80 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 292.001 247.16 282.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 81 0 R
-/H /I
->>
-endobj
-82 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 120.0 281.001 194.43 271.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 83 0 R
-/H /I
->>
-endobj
-84 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 270.001 169.28 260.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 85 0 R
-/H /I
->>
-endobj
-86 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 259.001 226.6 249.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 87 0 R
-/H /I
->>
-endobj
-88 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 120.0 248.001 142.77 238.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 89 0 R
-/H /I
->>
-endobj
-90 0 obj
-<< /Length 971 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gas1_9lHOU&A@P9n8Y3KKWesRgleV$dR2K`83JdmGer`M1,^j6$2sN;0Z5l'C8I3YH"NZH4C`H)D/MO-.#bjW+[T>Bn^2%a+?K1_oT0L)u?7'<'Uc<.IgYI(MXYSh0b7UseQ*4HA+>@ot>=.0YoI#q_d9RA:nfmE="Y]=WF]2C+F1.:S5Ptjk"\nDH/A/3%'Eaf\B&b/"qbEg=^47!#no2XVcga.TRAe30!LU%FfUH]Br5g^OuBPH.:?gGZ2J7ZhGJGWph&\0A'BQ7^Ea[i-@JF\X6RMQf*R;fF,"?Bp.'LHK8,r^ZQ>M<6J\)!\Q:IU03Ya@FDimSA(MM0+Zi+>n^7Y#om:hK)RFBB:X,nb=qJ6YCaT.u>UW24(%@8__iKUmj!F:YFl!J*m_#m,Pn9Tm.FO0TlR(S*ujDD!hQN/CC3L,\uI2JA^tAI5M1_nLm$C8>#~>
-endstream
-endobj
-91 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 90 0 R
->>
-endobj
-92 0 obj
-<< /Length 2083 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gau`Uhf%7-&:Vr4+loI0eh[)=$,[h8@NDb@D5`@U1ju$.3n>WNY!f\>rq]L'U[BPbEI^1d!Kt&>ms+b$hFB&6=')m",;5!EQ:9YFHf]Sb=+TP(T>4Zc_Y;J0(MUPSp.R^AYask)\7pQ0VJZ:H.-CDtTUA,k1rnN+qje3<\;K8CLZDb8c\l&3h$N(1iIk5rA[Gg\t$K]rH3F[^GJE@ci-o9W5?NJ)%:g_,>s>E>UnQM%0&leZ@jH,RIpud66mK:";sXK&@&88`gtY"9NG/D-[7X>(,W8iRljkFs@0*)F(P0&W,^'AmeUY[3PmY+.*`-nC!L.ML_/a.Ense3C#tYg1aLhGCq#F8S"DY\`?$F?hCuo!^JHsXSg't5\&#n;i]fn4T/ea.%7Nutfhi("INMFD>kE>`A+rM+ZndhR]WV`=7)So/K\9Q3!&!lmUfl5ZfeZ4p8-@3XQN?Ld]PkpY.g0$#:mUdlt/'8.l!NPCDp5am!!2=_Bl>+3120L'l2HmRZqht$:0E]G,cmK9)F-Pr"a?PgTaB<`a]@%O04b3`6;L-/TAFRpW%J"hLtL7C3.-l2gg:$q*9h;2^Q]("sg`7>7bc3IID(WRE"WRo%=Z=-`k6DI9SDRmW>MjT!9soB\5AEf\)>i;+(k%4rpWk\>*Rd)mtrZV8[",NO)%J\ZIoIJM%OLRa&PF2ke7Rnrr4VKGl2*,si=!;6gr]QY[jFPV&RMa)MF9]%2a]Y"9tW6po'#Phg',SjpQO[No).J<;iH6%V?qVjS`(,/O^;>agHSb1W<"W!0U>knB+4'4aN9?:Dss+PV<%.R[:8:K.KYY'nBi$5?68@'N[b8J"lB8$Z*JF($YiF)^q8KBn5-(7DXZ(noEf[a_=UR]\RQr6dqe%(!ME]udD*1N(*T0;5ep:h=6kFfI$)DG@;MMX:/N4YKI!la+%r#-]'@4h4C%id963q3e6(+#Uo-tgrGejS2;RLuZ]'d=2L"aZ_oG&,K2P?*S#W'TYuWs^[59F!96,BbL^$MEOEG`s3tg;^f&`L2Yq)J.r/7serVV.S,I/6]fiY.h^O/&mO7EF<\:nL49(C6c9AqXa">C>R?#Vk]IS/-=5g1#=^i8Gd=dO@K-Y0P:Zc~>
-endstream
-endobj
-93 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 92 0 R
->>
-endobj
-94 0 obj
-<< /Length 1700 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gatm=bAQW(&Dd46gf5=:@DnKR/\:-t=s+!+[X`SRG9P_*,?0t68PY@rI;+fZLPeL)Llk+oC*%#BUZ%a(bBi^N/&k4%TO>=U(;]RG^ro"Ba?=RsN%dO0?ET@4Y:EI-pWIKuol!_Wl#h;t)@tmfX3LSR]a"M8dNQnJO5PaDs`$bh=-Ml9g\:o@ms(#iQX6P+>*e8VqTmHeL\li477j7aIBKEtb0PHDB^oTM[RE<6I&0Yq,lr$Xl0BoO)!16bT;8$,KFR>k!hK:q1dF.@2h-GKm^dl884=/apD+9O1Sn^)9T$*[D\;8HRA4^GG2Y.3J4:Z4]9n"M0IK[P5&&[USOCN/N^Ni'KnjCLho:6$/D@/F6#5$1C1m!cHdi@@O+qCS<]_+MujCA3@o:'4O`*gkQ0E_.0pQcOo2a&H<,-q9Wn/OQF%D9@Z47$Pi^PZdd^/8IZ>#argK,<2unnoC?qJ$X]q9A/[2n]\*3l,IP=]6cRKNk(Z,\K+225AD59Yc&PcY!V]0?&.0oW_hQ?:!@,U@@"R++d\+S+rjfJl=-ZUFd&/2<&)32P\40j1s1ZOYS@dYWQ#&-ZTA`sXA2SFe=?0h5]dS`gd^A;/h#nLWSWO4>h>]dNSA4t",*g`b+oFbA4=!^0Sps]Z_I5k?TsS)Gg=;Z/kS<,`#.=4Nd9BrHc?ubqUomoGqZJq>Zg91KU7CtYn#NL*,Y+,kVM6p[%h%0u/SSZo/q[nqiSV&L,TR35&/pb_5LXML0'G0a1n>j=M@MCfVjl3dli)O`hQ^KIU1i_CAO`fO#PCh$'jOp%PC#4ce(XXK%>\rh?Q-!O]P.W$]`&C8Y-^e;hYd0IBh6F52dE;MA:(q@6>n27XZY#ftgmh][sQ(4A1b+fs;+/"E`2%cpK/[1c85Fn?nR&A*%\PO,-OSNiLTIT4k`Y-Up:lV08JK+PG;Gm.O1%qeT2#Ku)<;m"<)-S?OTePAs6)C@0%B$q"d:2hjN`M@-O65+6OXBih30CMVpk:cn*DQ^#pKZPJD#7I"g!N`l1&WK-6:02^Jni@!VQunC&)M7;^'+d?i#@Q%U0/X"R:);e.A(2QN"ZKr@*XSJ:RVe+k>m;^O*89VDAAXHen8lVn,*^"sLmG*6rd<;N^T87OW.24RJ$DP5b.GYFc,ced/@3<&M_FDd&R'?l*_I_=O(`FCL)99!GriE1J"0a=bNp#?[SH/_E<%/GON7:naUG-'kH`QBahBM%+$<-s3<~>
-endstream
-endobj
-95 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 94 0 R
->>
-endobj
-96 0 obj
-<< /Length 1355 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GatU495iiK&AJ$Cki`^d7\ltaHYS'JFcf+T7(\e'Z(PsfAlk;2&tNk8lUsg63Kbgq:(\W-ORqVY2cT4.amI;nE/7'G,jUH:W5Z@C8>TK^.MV.V4Jd$m[l^,,b"=JL@M5tj]kUJN%pg6,X0WFAbu;qj/;_%e,@2IO#P@>^o_.E04/UG4Y$"SERteI!K(&LU:jj8Zk1"'_QoFM=te-\g]CfES$e-J@)X'EbQak$ie<#kcQA94f2Wj"T'fatG$K;jraO=CT#MUKV;b!1d[mHpGp3jflfbi3=g?ouqJUN6pSh"dE-Wiejn]3#HaHANdEjD>SfZ41H?QCb-M'A[=G$]hY*uj\X?e#_'Q)9G_,b^8F;*ROT7j-qF$dL#)f:cCuN@JUt6ZOcgFi4Im=b/.e0ffGR5F_?;j)"^6Ds5>7kP-[U;a]`Ofbd\al3@1;MoPW,5b_DaFknlR>;RqFa:AhF-%O#GKH,WkoU_\*T1N=/pH3'+T-gGksN'lEB*`6[Zfa?oJ5>X^#K;qOe0YIm>pF=T*PQd.!fY68icQp0l`S80kfurblgr+hbT6/$5Yb;+qUOQ6Ob&er\CPD;H1g@7FE'S7@EQjQBF]L?,!1`Buo::2:/m4XWRI+RS2gs('f^c+F[G#%_#4;7J``Mlc$Al"Wi2UeS6[PP6HEfPHfFUXdFiOo[0q?t1k.GTa&/l_$3s/Hk%Sdp/I"_%?PGTR:ZXOq253[uc)DcHbU73'Dop/_Y3&?>=l6=E=TgN(B6>T8k&H%4m!5Ui8=_@rgDmIjfe;'m&RME'Df0p0E@9'UB+_:"mYlk.ap)L[FbP6k1ZK?M5."1`3!ZO+Cc!&.TY3$$:3Zm18d]c\#2H/76WPJ#Z?<*H]T(kGfE%^((b*(9(1'+%'-O'*~>
-endstream
-endobj
-97 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 96 0 R
->>
-endobj
-98 0 obj
-<< /Length 2063 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gb!;d?#SIU'Re<2&Gf;&881rYlJ#DZUO'.l;.eFoF.^mT$0on\A\!dYlo@dAtsHMjrJe%j0[,qYP2?QP.\:?.ThGFFR`QH!Ri5KGHM5]=!Z!M8U+T0HrS/,^_o`9Hf!r`b`jB=J+81+r(rWYH\>n1l?o8hT[C^/2`?_$kd[leJgGKYb`PaLg9ffXDbB]sVbQ"]JV_0=Vu$-fo+6&t!rjcI&Pm$NrXXFkB[e\hZ<*.ckf`Gg=F66$*\/CW%u5RR!)VOhWO-:h!1DsnFbA>Tl;j8em4J81#B-NDdn,\+M4YUfjXU8L2!m4&-;(.`U\WS+AtDuY.UdisRd:ATG5hPhq*?_-!=;gno;oK4>hd]qUCkW68TUT"EJS2%E3N^6c[iYLNu%UWA?%mpGkDi+Nn9tMF_K!\[DVm[C]1q9/gThE`U_CH?)keHgmkrU*a^8f;oj[gThg%q'hu^qaDM%Z#rX+;F(7b'fED+MPbj5SSoK_[j,P9qWTMkuE$p0g=?.7L<7hDQO?,Lp=<,X$FVLHlRXgFRSY*fQt^^l8D4A"]>i\q18U@Xu)';gPVcdR/j(QsjunnV0r<-a&\OYD0Kb"IEa%aBQjBri4K,lMEC<9$j-9>j_n^`/5`(']-HK`QFP^9OWc"71oj:H]>e<^eAck<:CL0H#;"jR^=u`>`F#7$:>HlVQmF-^K(/BKGEq3!nib1Nktr=U.(t[1ej0rW&+KoDG5.G&]/i/pQ2FQ<$D`=-17W("$:Eq)lsoO"9ML&>$P6WO.m9]`I_"H+=88C;+M0,p%KROD0bVLSHhM]W[m')Ua?q4,hSlJ4I1+4*^ekB5r]@qNu*VdS*3j99-ANe)Yl#iU>b.E"elgPg=m,LLkbs0Sj;q"8;B.;K@D4?p_'hB,n?n=^9p6H,%NV50`>[,&:GIZ(W%E"`bPT`E&D#oB&4^H4X%r6Q%cAp'73\XV`#3kJOap9#,c\)),f;[oDb!=T'K0=s":9GYpapa<1ipl.JC*oRSRehLrre]hX6'87PP".[0N#h('48qBBp0>`l!%L5RgrIJ>__6$b$.8oG26I=DKa0,^tPGJ%t'VU4%mL"5,l0\j$iu_RH^[)B_$oB&b>9L[N;2DFJ!5"#8Rlp5?%`>BDd8MUu.J_oMLca)t8b'OU9PjFP@-8jf&1<<'/uUZAVUY'IeHX4_nSm"Z6eg?AN4o-WS2oXNle1d$4m))9>_&Q,qC$N^>5MHGYSRSaEnDB4&(&ZNY(s:`cq-S,Hn>#?3muXUjH%f(Hn9KTR+9&/qSP(mTGR*BHB6hsj'h9!U#!:"Gg?+:
-endstream
-endobj
-99 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 98 0 R
->>
-endobj
-100 0 obj
-<< /Length 727 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gasan?#SFN'Rf.Gp^sB4il!Q^Hg='WVG7edmU_q9"&?*:P12Csm+9R?PM"5Yp(X-gHd;S3EZ=bMEUUI$JYsR[4m7I%(Vp[@lKmc!?m+^YHag.&.U>SuCDTD2Tu/P%V9!dD'A3)&"WlJg!0u\+1&aFb!!JDP=1eg%0o1&3B4!hq[JBbF\74b\Q[?PJT(%sR^b67KFbj&50nEhFLs,U'\pV#KCWFgC6>af02&V`l400skgq4Sg+@'Q`O8U`Tq87$RR,7l<2?6)YKdEXH\8f;Fc_PUNErL>W7<_mf^e&4H5A1Do.Roh-7X+3=n>T,8Hst).#-';#Wk>R/a0VZ$H,A7Se[iOIW*h]aQuL$!h9?JI[WA>'YU#X1bn>B#p=LX&cjNoZMs]f=m'V2EER+&4BWFQ;Zr4hS+f!QJab-_4+64>EbJ;YFih,\Y/clW%TGgo^j*>bgVq3qXOT&)D7Abhu`)2&crQ2.^fuNU[#D(9V+%-dg%g`Z$G+:fsJ!a`Tc<437e`cm:l%bH`?O83Bh*D@%_7ME(0@9DhpUlMWXO'28hjUb~>
-endstream
-endobj
-101 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 100 0 R
->>
-endobj
-102 0 obj
-<< /Length 1445 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gatm<9=(*G']/^gclIE[<4L`)>_I.G<_6E-JA'$cmmlM%#q/s=Fn/M$kLuOeJgM@OJ`sq_DqnZT,:uLk'5s1+=mE,7bJ',a`8G1uU-W,P[3(URB;rk*j\TBc:b;scias'hP]tJYt^$VHC"6SRXg9UEj[P;JT3"HU]P0S.ag*N"\ojQp@k''(cc5AINUqVTEfTSEfu.Yl1[&24FG-A2m+qR:]d]2/jZS=7+S,GkJ,KE?i!>J?5n-IjN_Zk:hpc@c@SUT_UR[4d6bdkW6Tb4Jj)MlaFcnnlS0JbFYO2^?p.8eMg`4j^mh-6pJc;E5U&mJLc8UHshu1c3Hi;9:ggONfci7CB]iH4TS5Kp0jTH5<6N('pl!M9#h`h@=k"7--I74I#EcF0#Y,1X1R"2CY(?LNLY9rU$E#n\nCZ$pn8C"I!Ekc#.7)C[E`+.E[d@daDg@R^pTfCsJ0TdLcu>CK.'f"3)KUT%s2epH!-];3jn9I"^^E*c-3-Qp=DVQrduY^S:$F$]fB&"Xm+dRfEI511H"FL&;D8;\2uJS\,?K-2;S*&R$3BfcC+HehLRXMm`Pm8A^SZB5F&gnEq[W#GC+9-.t6pc[_M.Wb,INa1tPF5H_o-q=NL;,Wq@N@5V]bJeNtXGXoNa`36WF9orV'sM;qF^#=_e^Pp'Wk13aj;48NX:S-Zfj;d^lCf2L9$TVG689b`B(d"De79eDPXmg?!c:[>#?JgM>6H\R/$J8+:"PWo)L$6"u."loP1.l]WNfG2g@`Jbgp_0XX6j9o[eFR^-6pf(rN2U[_GokHF,^KOW[jpkkcL#/R7,Z5cn07+oZG]Q+qM2=6`n)CCS&2*jqLB)_^EH*,US6t;1mUaI<9)kAWgQ&`pHWcq)@3n4Ab/+D3s6586mMo3tINQ5P.oku]-,^-Hs`]u@%hF%#l6Iht;OHWa99B:n!GSG=D#^M^bqqO^rnGR&NYd)-l2fE=od]_EMp[55[X7@[WLtO5kr>sU08p]1Qn'10AI#s,>:7dsAe,csi(e(o`US>U$ItpNe"9~>
-endstream
-endobj
-103 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 102 0 R
->>
-endobj
-104 0 obj
-<< /Length 1752 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gb!kuhiFNj&:Vr4_:rRu4V$KoR.dL`[F/*Ue4P"uS5(>\4]I#S5^'R0f67K1*YU5t\o1TE-oNm\^):eV2f0;HqhkYDI=@S0\PnpFi_a=,d/P:S$s%LSW[L:Um6GuIJ,RKJ/op!%CmBC,O1&HAOX(aid`=,D(GJ8J7+_q6r4,K3,9/md+en_+*"#(/FTH&!5GWZZVb+4=,u(lm]jF#CaigMu(?@Ur#L"mY/RXOuj`3$GpZ0P.C,fktS?`"]IEMt_1bakk'[@?@_K5@F$2&Lt"n[nh$%DoB*[+J["S!^WNIQ*M4a!12`B\"HDH4.>5:[('ho(Il6Vs"\d/"g?jbJn82^piB.,>J2XH%iMS_Y0_PVD3'^1@%`9b+J:ro--\U$I]C]WEqVE7Dbrg&;7_-bX>YpI=/0fAh\^4m42-F[$<=lu<%cP'1V7\qOJ2_8RW=-t@b3\Zdm:MolI%7Wt6PthnDVJ%M*sUgo[olDE]b#"aCNHHpa?.(,)"f2]jL[5/JrgPtUnuO?Q^"f!Mrf8o6ZSqaP6,,h*a/o_'F:"1NN+]d)kqh+4/`BiWW(g`e-^rcB&lX\P]NJ;[f,BhJkFS/?B6jNkfPUgAD"[JWJ^i\%at%X'[)F5iL>\%D#D4?o&`@43>7*GFj-V]g!T`)3<_Kdt.6N3JGb+1t:0\Q\8HF'eMomPF:X:5pNm2@Xh)jCZhn7Jgc",JKp3!dJU%+(WbJqZm*f]8Q@'T2N-fY8.&_DQFVE$X>?%mZg%]56f8kJNRQPX`ZU7P)ae,o8+_;;1"b9q(B*3OToe$GC]>P0MV1l2.kKJB2QBL-P3i<=`tq[%B^b;&'mjZ0]\'_nOnmEu2aA=D'HHd5U.5>c+N2U2q!&6bPOnUmck]I609lUj'jMgNI"k'5!\WN,`21@]ASfb$aNFSr5;fjGi6p:sa[aV%(/#KtWMYk="Q2I]DQf#>'c'F>f7<,a)Ni7%3-9h`V3W=%IBtnitJ9RUZrJL5!6'V*k'TD4VUP,aO1:ZY8eU@/8o4RlM*:1*iBL(ek(R:GcPC&0[,-LsFk77RZe\]bS3^KjB;SbjcU5bFRoTp9fpB5'Dh_qNRh&dpZ$erE(M"'&.&GY%];D28Q]mAHV8J8oC$$R\WCh6/,*_$8mCKFX]fO8R31$nE^Bao`2O-DsIE8TsCn>1_P64M?;9:I\pHoGqV`!@KE@uX_V_3lJK-.=p4i3`ApAS2"FP3Qm(=>6A-iq>kiTJ4]kc`W7&Zd?HH@3OA~>
-endstream
-endobj
-105 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 104 0 R
->>
-endobj
-106 0 obj
-<< /Length 1223 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gb!;c92jS!&AI=/pf?TTR3-B7ujSa8:?*-:^qs!2?k9N;(^`]1D@'H#k!3.+J&?[?)KL(9CoK)cPF#lHE3'B>qGCs6gqGdP.lB+4ZU'"A?;p($UJhQ[mEq+Lb>g8T1XS7in\0*IF\G3W+j`GflG]IhDo_j"nGSe4(Z?,b]pLEZID,R>H#SRV;lR+?+R:j_@03:n&X.;oK#?4(?;dF#[]B4uCq*C>dDW[\E&rXSj8t.Vr9E,?,Na47h4d>ir(RcXc.+T?GZMd!oUb>8gl_-#Zr3o0V;#dql+"]'(pgl"@UD>1-u^YLF&_';\.&0Hu%sRn'VPrlZ<^@`7>mXZd!B11`9;V5g`W,(5(7o\Y?S>@MTHI6T%4bDDpaN0fY^F(6U?9-L0aaM[/"tXQ8Bq.PL'nF!V`7^fVQLXd4UI'L'r:6OXOTRp+nNNfQ`d\tdYIeGH2n=Be,LPQiae>cohLK'-TcD5sr4?d*P)/+.^`k,ebKVnr'"FmCY+8E[OKn>\@raK:_o1so#>Ia\)r,Eb=Zc"s,?O6WEO)-K/)o._mNpk*Li4iiA78_.Y>Nj.?JcZ;$NISs9;,(LeheEg%BZ5.>!>j#NhgaZ?BjCK\*RJVBBFG08lBQ[mU$&`pQUYEf9c3-Yg[e2kC#@^@L!AsL2$ZN0WQe:IPn?HfHGF%!S"ZRYJA1j-"l[,8!?oW`\9K)Xh'*gk:JK#!Y4;;6eKTBDYp[it0DY=\5C:/'@-fh+H48t:?*32QqPMAdL;.:YTG^m/L]NW:T$O:isUnlQO-^C$sKn?jbqWhKoHemdH0Yi'1N>)C*#7&;R<(jh2c\[i/js_Qn,=7T2Z=BFW@iP'(+m))NOUj~>
-endstream
-endobj
-107 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 106 0 R
->>
-endobj
-108 0 obj
-<< /Length 452 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GasId3H)bg']/F34MlWRF#G&$5c&3#^h'K+38bck85dKYkc\n7A31>@AU2VBG)eP=RegFA4pXOAO`X0W%YV4bG=3!N`?]\[mS4Y48]Pg]^JN0hlBZdT(I1)P;aGO(0I](iR6I4X"9q:kVV,'?aMHBK,j*JE[P)i0M\6$^C*@lt/kT&KHC,lqtSlK9ifY1qS]ZVKpW]55f>K9"KcKV0\IDB58DGH._p?-.>)B2$KfM.@*MDGe^.q;%Jk+2lbY<)G(D%L!sX@&:#!N5kD:ZgBXqNoAl\5(8"p6>q/L%GU`D!Jh~>
-endstream
-endobj
-109 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 108 0 R
->>
-endobj
-110 0 obj
-<< /Length 1150 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GauHLac>C>&A@rkG]X&P)XaCTVp$7i&g0Gkpm0$QG%e>b/T+1PFT6d3D9F9f7@[a40ORusCO**UO!T9Xbhi:H#a\r$+H,oOP0JptMB>:r#>2?T5YFH[2>M=mn]>Wp+!/KJ2[0U^$Vfardd+l9:D\J&rDU:*Q-8+&lN?s@/:PDD'O_\c@Jh9,j80"^,qr7;K(fMb70/]Pb/q:[qE;$ThfN9Gg<\m<^.VOoXt*S?^-$k(f0d19bJnaf/hb5TS.HuAbIUr<@UGf'3"!02qQeE:?ImlRf=pM*j,qCpGtLKcQ#-UN^9QZ3N)27hLMCl2<$#oUGi"]/q!(g?8I_);s4bk^+(g&X$TG*DTE[>>M8XtZ[X#DH/o.U@dpU:mh1IC7i&X';@C(W,;Q>S$[f7cWFHjF9gcQe"..R?(FSLjAeK>tOU59-"'4Ias!$)pU\ptiEaVNB_@3YqQN91VaG%kr'IFVSB!FY0atG_WD9G8e\!^2@`b*UXhb9Rjk/L.%mIT(%(?%5dbKAQmj+cU'>\Nt@>];kF-Imks8qr86!PfP1rf8m?u;9>Oorcr]Ih2WH/He"?QKA\0d),2]%5Vn&X9rRg@0pig=QA4C-PGd8E.,@jQ26$Tad+esV#0l`mgI]bK5pg9J"fOQF`Y@-=hf<_IY8mRDNCWBKFhuVBO,r^%h?5bs^niLBn0W.0)\d?V0f6R,aGE>\'O0hEVO^^'g+Rl3q],`,)>O3B@IpO8BfVmh,ae`H2$K[fd=-2IS[X[(FQ:V6tZ7M!'6%paQ%hcEis-[\[GlQ$Fmt\mKq='0\+bjO#E$!j8VYDZdZC_"YqlgoUe>PT5pKcf]:kfAQW]p@$_UpmH^Dp)BYQ~>
-endstream
-endobj
-111 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 110 0 R
->>
-endobj
-112 0 obj
-<< /Length 1243 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gasap?#uJp'Rf_Zi6chK<^IFNmSg\kB=$(R1l9uOb^(W]A!o#.i!A,LrUgmIL+<=ma\2oT4nn!lUFZ/rC@T=LmLY>]Ze@"8'.o#mbo^q]>J:g(779,9`;+>N^8M!Jt1"T[k/eK%:H7B=>/9-Inij@L[YSDUt:V_"VQo\X5c)gPK8pTD4D@kJu$BM#e:-WJL)B*a2@Sbn"9$N^WrL,@H@#@n%=T?c4'Amp?UgS(,b5=j!3&U`L-kY>iCd[."PRI:RB8d6%FQ[.JH7I(R4t$1[F-H5WkE6n&nRCf\A#.AoAZU,##+HF6_oh,.+?LdT5:S`-Rh%[@P9f&W8Wh;8jpaL"&P]7W^!J?T);#Xc8sP^N4kNrKd]pr3rap#ZHj4N-0?7^*:E_B0'50U/2CoE\mgo%Ver"JPV"9k'"VREgs"m_@SW3,BlVG!VPNTS9?bp!r@q+.)Ft^]`2-l!j+6)^6]qgH<_?5"1"o:'q7&boW\Drl\)!g[Ym$(ObW.s]9D7t^PK+Kcenhuej.a#;MM+u,rH="kY;,.F75uok"4N5DSkkMdF+(;n0'$qRiE0b;_H'QJ/OhUYEj);:UC0p[9L?78AO33/DB;#l>YWL3_>:CXE.\M7?JieLq=iqJkM(cIRu^qE9TM>AX*`.aFF@a>gc12;*UR6%_)?u(^-cD(*G!oL`ITg?EK8rQKI#H@#4P/!R%mZ_h('Hi1QR^tWYXRDp.Y38Ck0`U,(c/lQ[:_+/%qAU2HKJppmtOh+'[1(Ki1>`nX-OW/ZR-<)4&
-endstream
-endobj
-113 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 112 0 R
->>
-endobj
-114 0 obj
-<< /Length 1631 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gau0D9lJcG&A@7.kS=D:=HV*GM`kmg?S,)^GN1h;iZ)X"ZAD,:.oAme?b_gOR6t2A($mOk'I'YI(q7\tQ73,:j=I=fC,\=[lmMS;I8TOW9GDh[1*u")gdoR#OU3ZP%t.V":'_(0i-k*C\G.F&>JV-sIWI6BUSV(@JofU+CS5%"RMqcJln%563i*6mOfLj2V;u]pW66@a0p&I-``Ujm++kNcm)tM4u*1)WJ5\P,q1qO-o\^ih&M;Mq-)LMn,R],/8nt>h,[PN-*9+VHLa")4#YWnk'.o9oX$k[;"D+A=]pY]PkhZC7ZrI'QO:ViYgKPHir4:1>sID/&b+K8"8B%lI9Mjq;\-3Di'o,NB>d%mqo&uOKSg(M70(!Vq!kfI6bRGc]hoN/=i`=WZU.[\VK=e:pN0jd\a-1h3(rKRi9iE2=K5cOj?hE)OBO5@1Uo<'I_<6XQam1-<\kJF:=_.2[#gDG!W_XX:#l(A"%.3+\BD2mV`.K$YT#Hgi&GjuK-'f,5jcmun?l6X;K?m6BD/nqiIP?iN/CK1g"tuLka9%1mqg^AbP?M$E$,YPdSAbS?A+b+JKHXe]_U"`:?Igq5P2=`0_u>XiqJ\?McLM)^7Ql#WOa>Xn)Yd7qJM6h1qa/3Q0GCE7EpeJL]"h\md2%K,b,!>sHiao<9I]Or6=L[jZW+9S&2[APW^#KN&A?X\LhI1cP`%hPE"R[7#3t.c:qk5Xbs43tD-&[W>QHV=\d#+JQ60tf)k]__+YApo_c'TKf$CG'BWd*R_9F^g"]6p>KQ]t(\^G?lABPj\@TH3%cQm;W]A3*V&u)=[r]/C"<3!![;9"ua>eM&1WrLnWm3J-"4a]-"%LnN,$4j^^Yo,0QaZ@%%a_pWKt%L]UH'\T@7JbE==kIG:t]KdP@f)"tpJfB+_8tMs_*p9_nYgLandlBOfYn>]-.Im"UY9:8dW@#SZ$`p34a[lbTD'6]CG=o$+7<\iq<$MLXYX4eD0AWA7=N@N?"p)q@>'=:d'JGCiZ'ZDb7E&Jde=ca>lJd^kt5)hu(>li1T;h`11'3*>%X0!Q1$hY.'kG_hC:0Fk`lnmEg[#N1!o/)^W]&NJ(7fu@.N-$AO>d6J'N.1NrrEepnV$~>
-endstream
-endobj
-115 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 114 0 R
->>
-endobj
-116 0 obj
-<< /Length 586 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GasIe9iJn_&A@g>j9Q!+dO$EnRklb`kQ*):`,Pj5R\:EhU5o5!e'Gs9o[M.Z]sfZ,41RtrET4ZX&>U?STFXh(q"Aoj)i!:r'rl8#m.pQH?o19?eO\W>"*Z,#F!!P[1MgZLpA.K^cl;d*3-co;\1m_#'dsUkW=:`4m88]GW=YQS!KIYu/3ZHB]G=`6+T-2XLCfqA&\68?A`AUeOarZ?/:Y*``i%)F(C+0T[qBamalK?oM#7B3(%9rR\%MJ4q]1dLm#alJkJiIlYUtXFD]'?A6_Ph"pZdf/"XDfbpu,L7R<%\`n+BH"ll3\"qG$+lpDJuY>d`5lF>g*C6UF:Tcf@id3XDI3S!;2b*;^lrCu=fC(5L[WQoaet<_gMdR]SB$m*bObkks'o5MU9OZd$c:5@1k\Y(hq,4mE\QZbr5Cp>#)`c[M+B,rfT8dG.e\gXCS<0KS_X[A0TrnIe67jJ2Q;8DI@o:Mk>`3GJctB=4t6R2IEUCE[MZ^&^uf5(`~>
-endstream
-endobj
-117 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 116 0 R
->>
-endobj
-118 0 obj
-<< /Length 1596 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gatm<>E@K-'Ro4H=K!`9b"g!$4-^]r8s3601h!B5.Scgk*PdhVCCf6,[JfPW@-fm`0P6N+(XI%Qhmn.kp?R"m]/QU!=N'f)D8,:4D;EYu$9qg;%72qmo8-tfg-!qM%43$[$(_[8CVt:Omnqui"qFM^o*nb[DFGTnCNV9;(HK[2L>$9Wr\Ird24]=X5YuaXNST?L=@@B3d_.%\gUfZS7;]G;K13;=1QQ,iWbBZsC*im^a**n4_*JHL4TYm!h.MBP&e)PDXL/N5ZR\[)0"-&20:ukia7jumb+gS#7HNC"Wr0#n\Ql$-h-RZb!^2-D\iI_tWd*_RM;cgqE[/g3oMSgC\XTjo`>ln!BLWb+l,-B6TciX?]]hm7A0^350**.*aNbrt+EdY`,\m0m`/u<\C:,s^iKu;#.Zb'XLt0%`;]Qc_rBH`$T]ErFrNnh"Y!sJhre]Z,:@a4Wr]"O?Rji/bA8btkhiD*DMr:IN=,F4tC#&]OP_2@"0s\`0o55\^;hPkg6_BQo_7TM60'D9H(GMiOA+rQmHRo^%^*lZ77W@r'+aAKX!
-endstream
-endobj
-119 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 118 0 R
->>
-endobj
-120 0 obj
-<< /Length 1842 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gatm+T$L,Ie[3(i2HYru;odXCu6Q>Frd''4("?:9M.O/+1eo#(+Zp,R<#Md0o+]PsFl"a4/H_[\$#9ShU(EOFkT@Aql0oCM=[Np!8Q6.!C+cM29WHJ?DWKEIf7`d`,,#5rT*]34$<3;r3(9g^d%>_Lb4+(P;03FN2c3a!<0Q?$+D,R0a.h9H52UH>;XI1cl-=*_SalJ-&N"A-(THH/rcPMH.UM8EM9n'9,mjCNgC(aST0U/47^!!R&/g'.?5_.;nS6sJZE1(.H<%CGJ0u6&b^g6ss;#m+mb?eFd!*$KSQ-]dR!(QE1Nq(249XgoYk@JK3%h3G#YqoE%K.agM7oUo2@ik7coLf3nfX-RU,#aa&7bJIL7Sbtf7Jed%CpL2jCK0@W*)+ubPBW67i)6e\Nn&#;+,qlFHpiU?nD^^ah_1q>Jo1!ge=XRH4sPHo1W)X%SDmK\h!`roMBNRbZb*RVFTG+E<'^*LPScUI][,M2Kp>9Gi)BB#'Qf:/[R-DVuIS6Z9UVs34k2$'k**XMEE8#pml7J4)jfr6PH"TQT?]"'#:/)kbpN)PEi$#,k)A!&Z@$+?.6/YL5Pbm7_@35Yh&DrQ"JbP.j.1de$$=%[C#kn?!i(_KLLpS&^)]DEB7_N2Kl+F`<.-":l\%OqC3io"$m8^@E#rQ]7/)-nQo-ds/W"eE<1F7#.,P6`eJceMIdlR*(RQU%RmGdaB)=cLkYOslCN]lqU4!G2ETm_E1Su?i,[P[n'3<9J3r)kgaB3+<)84Tf2TiLM/q!$/Wenc+&]HpXH7\@4\rUT(>rK)+Cn>Vhf"Ba>g>,rWZRZHHjpSo,AaO?lL+5XsgKO!Tm=]Ebn;o8Y$V's7P9Adl(*(J8W0?EFD(r2P$B=p!i43sX",/jM9JlgrQ+o>7T@PL=!(FRajL?MpohMlY1_*gYi^f<44#l;ZPA?Mnj60K!iI+-&_Xm;r]9nV`g'=uo=>Q$I>/huXG:PA&Ibm8jq]Be15@:&b7:DhMK~>
-endstream
-endobj
-121 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 120 0 R
->>
-endobj
-122 0 obj
-<< /Length 1681 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GauHLD/\/e&H;*)+UBK(@h'`HHtcp>$sqOITU+pMG6/6AD*7/]QDeUhhe'q8u<;8+,0cHNoIbAT&\WOIg@Fb*utGfa>1X*`%j4aCfp1^%8.V`VK'jOio^;(#=#HgIeGEOVB!+P/*Xg"8"Soe3VJp@l5ll-i3f0#kh)6]T[MfKL,aY"h_.V_E&=$,P<3Ma\$`UQ_KR:.!Z4'J[Q[!guHgC;HXaA[/>5'&6FcmQ;'NrSe/1XNc<`^;;Kij3'4FW-U120dkBVoT;TAg[KjNCh0`^s2>pfQsmqimAgau1l=&#]Xc3!)nrf+*o2eAk:-b;]Y5Y#V+`=[)j0+*4l!chhDPWu4X,B_<%">.fcjGOa@IpLet-@(CTsO(Mu\]?k2Z"t0baY%rQpm`hIgXOg@iKM!Cu78Z$Ye=]Fh)gOr(39(R&Oi*JmhmLU%549f6EU;7R>Zu$Ura6I!2i-\RT8N;/6`.p1S0`Ko(b9V8BI`36"4S)lG--c"X*j/GIZ!,6nT&!hcIk7Lkok0-)m&G*f=:E`e]L>l8*$TMm3oD>GW/sFOVf.>Lf,b(qJM%)7&JGUUPk1ba;6h<3^Kf#6Z+3't-aHkoOfR]/Y3JIYHk]dENBa#1.)L6;HmE0.IDb5:HI_)/d3Y6Q5,[kC2:*odc22f'AWP8W=N:(aPG/n:o`/[64RJr[k@ObNN]/1]Z'h_i?p]K$q/?rS2-U^e*YaCSA/A]r=^G$jKd@KqL"42C]q!R[g=.sUjs+VD(-/5HYR@e]FZX3TlOA4?OiG'"[Tdk@ZFF#=SF*n.P:kD6;XeR89s%c:9CQk2.6PaB_o"PRC3a7"eoJZOjX@C;noEKo&TRbU?H7o,K3_k]\>-B7CEh/k!=X&R5Jc$X"NUPm!W0aI0<)>YdP:b#U4]nB/4JCUFIM'2Gm_Yq%W.m&]#%4*BuaF^#k!#8F__.k^2_U0N,!_G#iMjkjgCdc=^B/G:4P6tkF`hd##eq%SjLJ'[P`^#Dj)G#bS+/(+"`gZpLo2`I(q^4)AZnotKhW-BJ&$mcA*8cu#)\E%NidT:Zr,K!+D3.Fe/BJuNo8KO;jmd"Na`s(TO.AGY=H+\iLm(E+=ZnVecf`[2,5$K82,/2khd0UjTmtR*Bo_JsT!P*C~>
-endstream
-endobj
-123 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 122 0 R
->>
-endobj
-124 0 obj
-<< /Length 1763 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GatU4968iG&AJ$CE,q*t%8?8noTkG!9ukM;D7Q"5PCY/R@RH7d#l2kT?P!3g,m@Im3kf"OphFM42S_@;@iJ@-bJ#/6&!]+L#-XZYB!t!Q+\>X6Z_+9$[^sqT`i5/N7SO6YQc2B\X&HW]-X)XPYnBsSf->u/Z3DOdAEue887=oG[Q3E5n#>H31!&Y;onN0G#Shitum2fc!AggK:;'.=bA-j!EV,c<@Y(12Wf5*>&Oq4][bNG^YqV`OD"Fr$_2g&>H:M>\=i3$*ZHCIZ-529H`@:UPk;.tO5;:,b4*9&N7IB,!DqFLjcY6p:@TphK[Ie/RD90N^fo?']ad+`0WPMWR]D(bF;7-%%e_Cf)^1h=/.V3mcg^\F9UN`A(Qcd9;qt0j);O3;$b(-;bq7cD>6L!Am`umK>fS4uC3k\$H8pm\af`;eV(b5MQ#<4:3@hCtq7CAl9+=ku1meT5K8QdVt5#^0)NnG]L3nsjk!#72_'s_ION&[]XN1(f;`M11c2"e22X"a@)Sd)OdH>Fn]k`LG>aF)?S0BaVX+F)JSFNlgCh^RC=0"WrTO/(U"pZ_lH_DH#fm=FVN:7/`Di9aI3GD";e-9RM2(?[2UD(JRdNICu!V,LSoefpg5+k;PbHP3]U:194(q%Pfo)hgqU*Ug:*kl4YI^;20==EMH!e!9g[Cp1:/n\+0+r5<6_KjV%Lm&ZVPH*ZBJ#_j45D%L!A!i8+bF'0E_p(SVW7e,pJF?jf^]u$f.k9AuopqYFMA@pc;H/G3904Eu`A7u5co3-$glSul]WZ?t!q9WC3q2/nE?'2$SS/6ALqCATOX)"/)[o]DS-:8p4,KgC,+To=?o*^IU:QR>6Xm28f6+HaEuq,MG6u;*WOmf[l--E?k#c7]I1.58'u?Q+5d)-YQ>>od&Jg)d)S9TtWF+%N0g#4Rdg#4)D?S/P(V0))eo>17G8O&XJZ!tTMYt.~>
-endstream
-endobj
-125 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 124 0 R
->>
-endobj
-126 0 obj
-<< /Length 1330 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gb!Slc#]@8&AS+Gi958$<>(+Kp6JHpGdfND]tDGu>K"`FOFmDirqB22+Y?e5aL(E_*#qQ,hsP5DIZ(biXM/OP5??E`?4i&,p*-"Ljot,jb>lNpCj!4uJV'[0$'RW4OAIPLE\(mg9Znm&9$V#Cdr"*,k'3(=Gu%%W`$:MT\-.MJ[s@NC?IqDVZ$WSIkqT4u^[hBo2Lbbtek?dPLa_eCbC$4A52?i\N#2[:,+Jk1IiXdM_#X>9^;'Qj:KQCqL`>=G#J9&pf8$C[7NFSb7/>+pjD/m"Ic,h0;?q'P>c2`oeQ'8bo?a"1/^.?SMqQgV_5/0qB'LR[.n7$JlKSDs^s1L7kuW"K,G&haT.B-pF^&QW.eqcC?[T7PX4,G>jf_Mk(R1!QJuofh-(:SS4j\G.0&]>1i6@h:I'Y3H9YC`1.lZ,Y!@YUZ/S8MPa@#T:qq*^T!7KmdnZ*0+C>2@");4iu7`cM[ei^'(f[^QWPU+H)(1Kal\EPmmJ:ABk:'4daOE5sIb-;IB@4%]&c:6Gp"Dj'>QAR5puNk%-Z8i(Kmahj_X@aEBLa\YH2/Hn.[noVBcK3C61KAjY([nDtiI/fUcH%#jaG,F&HKq!O9u3X@VA_N@HiDq+ctOfCMJWdj>*]lZD2VlnWIGDdXO0dnDN:>[)E2*Wc.q'X:ZbR6i[i6^=Zm0B#-`%L9TTi&6/Z7-&
-endstream
-endobj
-127 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 126 0 R
->>
-endobj
-128 0 obj
-<< /Length 1612 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gb!Sl997gc&AJ$CkdVRJ)3LY"a_cq=B[IkZ<_deBODW\a?qVG1DDqO/'M4ESRC;0F%RmXX--%e`B86#P*j`i_c`)\JjEoQtiHtG*p3cjp4\U02N!YBHQQJs$i!7+\YSP$Ug-,Mj1]TqB:I_Z^#`%\B8l1sKeHKo&E4KGYqiCS[_XkC)&2?JEJro`K=q28C'_Mf0DJ$_$_QI^.Jq.se]1l^tlJ2RO^YadRD->QQnbu4bm@(?7gU&OoPfL(>>FW;)0nK"\2u/SYX;UQmOKn%q[<:@oKXDJKW'FUP`"lWnr(%i_qdlV:.XIU>9Mbm?YsOP;glAK?l]+U>OC$^-+FP0P,eB:S:9ie0!CJjZ5i9EA!`ScDj?1Csm[,g4h7I=*IS%/=DTVn/=j@%:o_U#&2hb)MXC@P%cMJCu\h%QHE1#aFiX_UG_A/")'J+@:*N$a\AQL89\u72#^\@b-f2s4Bi/AXH@'(fo]?4Ci3Jobr(iA$%.;PCBCVPb/tI0pIc6G67QrSUmCU!o9g]_MhnT4JXkjZ.)8a9W5Nj21!PJ@(63(#`j4Zo6*GO:/f?DX&_@KBg@LRJ+FlSTqUi8T+_Df_H!B,OJS\I]h7S(#6?a_[7_'AEdeGF0oJ!=Xm9TU@@a`9^n)3/<>q$]`8[Ud$&b6d9_a5sCDh[9`&M/Q"*3YK&PPk05mRZ-<%DS&(gW:(kkF+Dh=djgi89V:Z3:C82l>Ei\&qNXb3W$DtN;H!o1:/'M>^L4`>LMVQ!<+)#5nAZlLj+nJ+).qI3KK]Onc6O-Fk?q&q\bl-rE6)0t$2+;rI(Di6tO!(>0GR0f)F?`ZC(hi!"MBi[ji0tgf;?_UC'-F3@f3Y5FM0c#Oe`gB)"TU*e`7<0NUj*<)C:_"JJafM=firg]hB/$BebukS4FXB4;!I;UO&:25A3'_7NBX+7epcN!^cOFCR9RI&12t+tfk[)-qTL.I`77grMYj[*;:eP*ob!3EA((Aj2ImAIBas=>,a@UADgo3WM^Sq8Segg8Z@A)_Wm2g&62DCZ3Hd1~>
-endstream
-endobj
-129 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 128 0 R
->>
-endobj
-130 0 obj
-<< /Length 263 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gas1X]afWJ(u5!&h["kB/Oe0O6j>S:2rfElYR-Ut^n8*FLp7tZl#K#%?8!%,T#Er$-6Od+TLKWO4VT:``Iop='+bu4"\/3Jhj@MV,ZH0^WVGmn#oOO,I/+d8r0]ulPcc$FeA7C3q7CO\EV-^l,1LpYK__O(;>8KH]09R>~>
-endstream
-endobj
-131 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 130 0 R
->>
-endobj
-132 0 obj
-<< /Length 907 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GatU2hf$st&:X(TiQ"t#cTgFmT%LE,+ct=^]MO8Jla@C>dO!2Wq!2o4Vfiu^l\>8a]A.hlqhUR+1N\(-/-KW,RquH6l>lY*HBduj7;e+68Jq--I7"kb]#1/D*<7W5$-2jt6Jgm42V%L<*&H%R?&?D.N$ii*1:38'Tn%`7^fh+3%S@%.PFK[>m"F@h5N%uikg1X^#C_n8'NF]YR(cUt3\:j2X$BnpKE3R^\WH1sb=h"MTE0bke,*2W4k91!ZT0qZ2[EqAu#p@e(;[nhuE$(B#rLA]-(cLPGhW$-Cdd0BTLB&K^97[:pN^9[<0^Ci;.!.BW,;1-cqb?rmL9M)4qOUkY:.0AB[RId84'7J/:eCRCB/6<(N>g4\N_GPTrS&$&]D4s%$79#mNOhY7VD#OR/=A1Rd%![D,s-e(d7GB8[s8bmasaE/spV7n^=;K_qFFEGd'-AKTC"M(-*DUk79;*7_4TG4dAR1?p^k3D-0eaaBeF#8f*lZ="M5V;pt_MF$NelRS\8[s&&C5Oo)bPlC^a&7^k~>
-endstream
-endobj
-133 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 132 0 R
->>
-endobj
-134 0 obj
-<< /Length 1408 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gat=lhf%7-&BE],=6Qmi2GH=5e75em6\i,&3^4$$MEnFX=/]rGP1jIFl[-'NPG1gL1'C,Lj$$!(m`W5;n!8mh?LnFjC^cAjRmds,(G&2JLIE-@,Z5tKQ-dp!(O^]$B"uW`DPBqSnk\=W`"KFBC.K`b1S&^-0/q:^+HL+fi$LM`F["76Nu0**j2>SNr#*:]D`hJQ(@L&KN4:g<`k]3gh$+Ak.S`]NS38^c-;X!TSk3_4Wb)6fYWu.RK7HY+"kmbs?sis778-0D8eWSBFnf5j>Z/XFS)4"8X<*+Q*c0,lgiHnTHk7sb*k8W8Pi%qU6%XY6b'Y;<:RJPno5$SQ(a;\/:iI;G;jV0T+1["@&lHXm9qHh@!`D+q@s3AF+k2Sb6%V09DtC7C!oRVeYqFbc$SY:0mSS<4R8bn"-8li)r:c;1\Q1HARa-5E*SPG>RiJ<(CW;W]Tr-X2ECC!N,K5`n?k[&RGF6#kK*?dHE/:f'IIZSPJH0a&\r9>f)c@D$hH/?rTjRubQ^ciXS[E`^F.g'2<1BW+LFjjW4^hg97>JVbDNCic)*nuc\sX0-"mNOA3]o'_8V5bjG4=hEDOJmSl[.sBS;,"iEX3("Fo.Phen>a#_HmSiWE5qpS9BSDQ5EY:g7Er)-`T!4TrJ>oGSuJ2L%%\e$)FQ.pSoBNO*0\r:DH50db9>VSV+7YRPk(VqOEYIWil`(8$ES/A2tR.M&2UqgVk5J%qLA=m4^iRq$!C;s!)_H@Y#coS)aNGWd&@["\n?c3t:[JC[5UXX=J0O?/DQ%^cc/o/Hud"A<>\RQ4'jf#?Tnq3*d7R.I]`/f;pp3%/ofNac/%U166s>_4UDkY(;M_<"(bA$4/?DqqbaW!f@OE2XgjQZCUcE%DdO?ec1Nh2)j7cFI1kqt5pHEFY+A\*m\\^UsGg"pWdaM6*TGZn.R_3r32B66t"PZLrO@oV$0@98/(3$uJ.=\>:MUk:ml+e)XXPJ64`O1A=JSlMK*tVh\gB6MkRX#NDn&68+7g!Co*AkaniJ[!BNn:92[V5=&uc[Y7\]kCjK:alG^91\S4FT+pc,AXs7eg[sS-Hpq2t:_rFu=`k.=4j/5TgDS2m6cq]`G(%-B)`3uh;OU'dP-ih7"ARqBb+hIJp#stLA-+qTDY%rs=NZ"*48,c)16YD)T%YQ2PnNkn824h+P\A`lXI.?uH`2jN]?3`^XkDW8#.-o<=2#'DO%%O[p&4FUAT@)`h>;_bcn7M>C?T(M#](cpM[)rSkFmqC]sD7F\VlY]!SVHT2fqnf8,BPurkgr^cO5.F1Ql4<5M`NCh-l]'Mj.R#(LKsFPb&pn>2XJto_f1Z`W,3cg+<50gatZN/,4HDAW3WMnH7%~>
-endstream
-endobj
-135 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 134 0 R
-/Annots 136 0 R
->>
-endobj
-136 0 obj
-[
-]
-endobj
-137 0 obj
-<< /Length 550 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gat=i92C1*&:j6IMESD)Y09)gC8-RA9Lq8_e'PC"&dl3dA,Z.>+3Kga9/R\3S,GN_L=tNDMf.r/JXFG&/#/I_,9X8+J8")s1b]9*A1R4+krq.0bcKLA8o)Z$P[$#TjX-'aaXbIS#A=MHFD5!hSt!tdi`R8\<>qLi([\eRit@me,cf]PhF8/T.LE>MamCCYe0e[o2p:af.A6s#c8]
-endstream
-endobj
-138 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 137 0 R
-/Annots 139 0 R
->>
-endobj
-139 0 obj
-[
-]
-endobj
-142 0 obj
-<<
- /Title (\376\377\0\123\0\161\0\165\0\151\0\162\0\162\0\145\0\154\0\40\0\123\0\164\0\141\0\156\0\144\0\141\0\162\0\144\0\40\0\114\0\151\0\142\0\162\0\141\0\162\0\171\0\40\0\62\0\56\0\62)
- /Parent 140 0 R
- /Next 144 0 R
- /A 141 0 R
->> endobj
-144 0 obj
-<<
- /Title (\376\377\0\124\0\141\0\142\0\154\0\145\0\40\0\157\0\146\0\40\0\103\0\157\0\156\0\164\0\145\0\156\0\164\0\163)
- /Parent 140 0 R
- /Prev 142 0 R
- /Next 145 0 R
- /A 143 0 R
->> endobj
-145 0 obj
-<<
- /Title (\376\377\0\103\0\150\0\141\0\160\0\164\0\145\0\162\0\240\0\61\0\56\0\240\0\111\0\156\0\164\0\162\0\157\0\144\0\165\0\143\0\164\0\151\0\157\0\156)
- /Parent 140 0 R
- /Prev 144 0 R
- /Next 146 0 R
- /A 15 0 R
->> endobj
-146 0 obj
-<<
- /Title (\376\377\0\103\0\150\0\141\0\160\0\164\0\145\0\162\0\240\0\62\0\56\0\240\0\124\0\150\0\145\0\40\0\111\0\156\0\160\0\165\0\164\0\57\0\117\0\165\0\164\0\160\0\165\0\164\0\40\0\154\0\151\0\142\0\162\0\141\0\162\0\171)
- /Parent 140 0 R
- /First 147 0 R
- /Last 150 0 R
- /Prev 145 0 R
- /Next 154 0 R
- /Count -7
- /A 17 0 R
->> endobj
-147 0 obj
-<<
- /Title (\376\377\0\123\0\161\0\165\0\151\0\162\0\162\0\145\0\154\0\40\0\101\0\120\0\111)
- /Parent 146 0 R
- /First 148 0 R
- /Last 149 0 R
- /Next 150 0 R
- /Count -2
- /A 19 0 R
->> endobj
-148 0 obj
-<<
- /Title (\376\377\0\107\0\154\0\157\0\142\0\141\0\154\0\40\0\163\0\171\0\155\0\142\0\157\0\154\0\163)
- /Parent 147 0 R
- /Next 149 0 R
- /A 21 0 R
->> endobj
-149 0 obj
-<<
- /Title (\376\377\0\106\0\151\0\154\0\145\0\40\0\143\0\154\0\141\0\163\0\163)
- /Parent 147 0 R
- /Prev 148 0 R
- /A 23 0 R
->> endobj
-150 0 obj
-<<
- /Title (\376\377\0\103\0\40\0\101\0\120\0\111)
- /Parent 146 0 R
- /First 151 0 R
- /Last 153 0 R
- /Prev 147 0 R
- /Count -3
- /A 25 0 R
->> endobj
-151 0 obj
-<<
- /Title (\376\377\0\111\0\156\0\151\0\164\0\151\0\141\0\154\0\151\0\172\0\141\0\164\0\151\0\157\0\156)
- /Parent 150 0 R
- /Next 152 0 R
- /A 27 0 R
->> endobj
-152 0 obj
-<<
- /Title (\376\377\0\106\0\151\0\154\0\145\0\40\0\157\0\142\0\152\0\145\0\143\0\164)
- /Parent 150 0 R
- /Prev 151 0 R
- /Next 153 0 R
- /A 29 0 R
->> endobj
-153 0 obj
-<<
- /Title (\376\377\0\123\0\143\0\162\0\151\0\160\0\164\0\40\0\154\0\157\0\141\0\144\0\151\0\156\0\147\0\40\0\141\0\156\0\144\0\40\0\163\0\145\0\162\0\151\0\141\0\154\0\151\0\172\0\141\0\164\0\151\0\157\0\156)
- /Parent 150 0 R
- /Prev 152 0 R
- /A 31 0 R
->> endobj
-154 0 obj
-<<
- /Title (\376\377\0\103\0\150\0\141\0\160\0\164\0\145\0\162\0\240\0\63\0\56\0\240\0\124\0\150\0\145\0\40\0\102\0\154\0\157\0\142\0\40\0\154\0\151\0\142\0\162\0\141\0\162\0\171)
- /Parent 140 0 R
- /First 155 0 R
- /Last 158 0 R
- /Prev 146 0 R
- /Next 161 0 R
- /Count -6
- /A 33 0 R
->> endobj
-155 0 obj
-<<
- /Title (\376\377\0\123\0\161\0\165\0\151\0\162\0\162\0\145\0\154\0\40\0\101\0\120\0\111)
- /Parent 154 0 R
- /First 156 0 R
- /Last 157 0 R
- /Next 158 0 R
- /Count -2
- /A 35 0 R
->> endobj
-156 0 obj
-<<
- /Title (\376\377\0\107\0\154\0\157\0\142\0\141\0\154\0\40\0\163\0\171\0\155\0\142\0\157\0\154\0\163)
- /Parent 155 0 R
- /Next 157 0 R
- /A 37 0 R
->> endobj
-157 0 obj
-<<
- /Title (\376\377\0\124\0\150\0\145\0\40\0\142\0\154\0\157\0\142\0\40\0\143\0\154\0\141\0\163\0\163)
- /Parent 155 0 R
- /Prev 156 0 R
- /A 39 0 R
->> endobj
-158 0 obj
-<<
- /Title (\376\377\0\103\0\40\0\101\0\120\0\111)
- /Parent 154 0 R
- /First 159 0 R
- /Last 160 0 R
- /Prev 155 0 R
- /Count -2
- /A 41 0 R
->> endobj
-159 0 obj
-<<
- /Title (\376\377\0\111\0\156\0\151\0\164\0\151\0\141\0\154\0\151\0\172\0\141\0\164\0\151\0\157\0\156)
- /Parent 158 0 R
- /Next 160 0 R
- /A 43 0 R
->> endobj
-160 0 obj
-<<
- /Title (\376\377\0\102\0\154\0\157\0\142\0\40\0\157\0\142\0\152\0\145\0\143\0\164)
- /Parent 158 0 R
- /Prev 159 0 R
- /A 45 0 R
->> endobj
-161 0 obj
-<<
- /Title (\376\377\0\103\0\150\0\141\0\160\0\164\0\145\0\162\0\240\0\64\0\56\0\240\0\124\0\150\0\145\0\40\0\115\0\141\0\164\0\150\0\40\0\154\0\151\0\142\0\162\0\141\0\162\0\171)
- /Parent 140 0 R
- /First 162 0 R
- /Last 164 0 R
- /Prev 154 0 R
- /Next 166 0 R
- /Count -4
- /A 47 0 R
->> endobj
-162 0 obj
-<<
- /Title (\376\377\0\123\0\161\0\165\0\151\0\162\0\162\0\145\0\154\0\40\0\101\0\120\0\111)
- /Parent 161 0 R
- /First 163 0 R
- /Last 163 0 R
- /Next 164 0 R
- /Count -1
- /A 49 0 R
->> endobj
-163 0 obj
-<<
- /Title (\376\377\0\107\0\154\0\157\0\142\0\141\0\154\0\40\0\163\0\171\0\155\0\142\0\157\0\154\0\163)
- /Parent 162 0 R
- /A 51 0 R
->> endobj
-164 0 obj
-<<
- /Title (\376\377\0\103\0\40\0\101\0\120\0\111)
- /Parent 161 0 R
- /First 165 0 R
- /Last 165 0 R
- /Prev 162 0 R
- /Count -1
- /A 53 0 R
->> endobj
-165 0 obj
-<<
- /Title (\376\377\0\111\0\156\0\151\0\164\0\151\0\141\0\154\0\151\0\172\0\141\0\164\0\151\0\157\0\156)
- /Parent 164 0 R
- /A 55 0 R
->> endobj
-166 0 obj
-<<
- /Title (\376\377\0\103\0\150\0\141\0\160\0\164\0\145\0\162\0\240\0\65\0\56\0\240\0\124\0\150\0\145\0\40\0\123\0\171\0\163\0\164\0\145\0\155\0\40\0\154\0\151\0\142\0\162\0\141\0\162\0\171)
- /Parent 140 0 R
- /First 167 0 R
- /Last 169 0 R
- /Prev 161 0 R
- /Next 171 0 R
- /Count -4
- /A 57 0 R
->> endobj
-167 0 obj
-<<
- /Title (\376\377\0\123\0\161\0\165\0\151\0\162\0\162\0\145\0\154\0\40\0\101\0\120\0\111)
- /Parent 166 0 R
- /First 168 0 R
- /Last 168 0 R
- /Next 169 0 R
- /Count -1
- /A 59 0 R
->> endobj
-168 0 obj
-<<
- /Title (\376\377\0\107\0\154\0\157\0\142\0\141\0\154\0\40\0\163\0\171\0\155\0\142\0\157\0\154\0\163)
- /Parent 167 0 R
- /A 61 0 R
->> endobj
-169 0 obj
-<<
- /Title (\376\377\0\103\0\40\0\101\0\120\0\111)
- /Parent 166 0 R
- /First 170 0 R
- /Last 170 0 R
- /Prev 167 0 R
- /Count -1
- /A 63 0 R
->> endobj
-170 0 obj
-<<
- /Title (\376\377\0\111\0\156\0\151\0\164\0\151\0\141\0\154\0\151\0\172\0\141\0\164\0\151\0\157\0\156)
- /Parent 169 0 R
- /A 65 0 R
->> endobj
-171 0 obj
-<<
- /Title (\376\377\0\103\0\150\0\141\0\160\0\164\0\145\0\162\0\240\0\66\0\56\0\240\0\124\0\150\0\145\0\40\0\123\0\164\0\162\0\151\0\156\0\147\0\40\0\154\0\151\0\142\0\162\0\141\0\162\0\171)
- /Parent 140 0 R
- /First 172 0 R
- /Last 175 0 R
- /Prev 166 0 R
- /Next 179 0 R
- /Count -7
- /A 67 0 R
->> endobj
-172 0 obj
-<<
- /Title (\376\377\0\123\0\161\0\165\0\151\0\162\0\162\0\145\0\154\0\40\0\101\0\120\0\111)
- /Parent 171 0 R
- /First 173 0 R
- /Last 174 0 R
- /Next 175 0 R
- /Count -2
- /A 69 0 R
->> endobj
-173 0 obj
-<<
- /Title (\376\377\0\107\0\154\0\157\0\142\0\141\0\154\0\40\0\163\0\171\0\155\0\142\0\157\0\154\0\163)
- /Parent 172 0 R
- /Next 174 0 R
- /A 71 0 R
->> endobj
-174 0 obj
-<<
- /Title (\376\377\0\122\0\145\0\147\0\145\0\170\0\160\0\40\0\143\0\154\0\141\0\163\0\163)
- /Parent 172 0 R
- /Prev 173 0 R
- /A 73 0 R
->> endobj
-175 0 obj
-<<
- /Title (\376\377\0\103\0\40\0\101\0\120\0\111)
- /Parent 171 0 R
- /First 176 0 R
- /Last 178 0 R
- /Prev 172 0 R
- /Count -3
- /A 75 0 R
->> endobj
-176 0 obj
-<<
- /Title (\376\377\0\111\0\156\0\151\0\164\0\151\0\141\0\154\0\151\0\172\0\141\0\164\0\151\0\157\0\156)
- /Parent 175 0 R
- /Next 177 0 R
- /A 77 0 R
->> endobj
-177 0 obj
-<<
- /Title (\376\377\0\106\0\157\0\162\0\155\0\141\0\164\0\164\0\151\0\156\0\147)
- /Parent 175 0 R
- /Prev 176 0 R
- /Next 178 0 R
- /A 79 0 R
->> endobj
-178 0 obj
-<<
- /Title (\376\377\0\122\0\145\0\147\0\165\0\154\0\141\0\162\0\40\0\105\0\170\0\160\0\145\0\163\0\163\0\151\0\157\0\156\0\163)
- /Parent 175 0 R
- /Prev 177 0 R
- /A 81 0 R
->> endobj
-179 0 obj
-<<
- /Title (\376\377\0\103\0\150\0\141\0\160\0\164\0\145\0\162\0\240\0\67\0\56\0\240\0\124\0\150\0\145\0\40\0\101\0\165\0\170\0\40\0\154\0\151\0\142\0\162\0\141\0\162\0\171)
- /Parent 140 0 R
- /First 180 0 R
- /Last 180 0 R
- /Prev 171 0 R
- /Next 182 0 R
- /Count -2
- /A 83 0 R
->> endobj
-180 0 obj
-<<
- /Title (\376\377\0\103\0\40\0\101\0\120\0\111)
- /Parent 179 0 R
- /First 181 0 R
- /Last 181 0 R
- /Count -1
- /A 85 0 R
->> endobj
-181 0 obj
-<<
- /Title (\376\377\0\105\0\162\0\162\0\157\0\162\0\40\0\150\0\141\0\156\0\144\0\154\0\151\0\156\0\147)
- /Parent 180 0 R
- /A 87 0 R
->> endobj
-182 0 obj
-<<
- /Title (\376\377\0\111\0\156\0\144\0\145\0\170)
- /Parent 140 0 R
- /Prev 179 0 R
- /A 89 0 R
->> endobj
-183 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F11
-/BaseFont /Courier-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-184 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
-/Encoding /WinAnsiEncoding >>
-endobj
-185 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F10
-/BaseFont /Courier-Oblique
-/Encoding /WinAnsiEncoding >>
-endobj
-186 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F5
-/BaseFont /Times-Roman
-/Encoding /WinAnsiEncoding >>
-endobj
-187 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-188 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F9
-/BaseFont /Courier
-/Encoding /WinAnsiEncoding >>
-endobj
-189 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F6
-/BaseFont /Times-Italic
-/Encoding /WinAnsiEncoding >>
-endobj
-190 0 obj
-<< /Type /Font
-/Subtype /Type1
-/Name /F7
-/BaseFont /Times-Bold
-/Encoding /WinAnsiEncoding >>
-endobj
-1 0 obj
-<< /Type /Pages
-/Count 28
-/Kids [6 0 R 8 0 R 10 0 R 12 0 R 91 0 R 93 0 R 95 0 R 97 0 R 99 0 R 101 0 R 103 0 R 105 0 R 107 0 R 109 0 R 111 0 R 113 0 R 115 0 R 117 0 R 119 0 R 121 0 R 123 0 R 125 0 R 127 0 R 129 0 R 131 0 R 133 0 R 135 0 R 138 0 R ] >>
-endobj
-2 0 obj
-<< /Type /Catalog
-/Pages 1 0 R
- /Outlines 140 0 R
- /PageMode /UseOutlines
- >>
-endobj
-3 0 obj
-<<
-/Font << /F1 184 0 R /F11 183 0 R /F10 185 0 R /F5 186 0 R /F3 187 0 R /F9 188 0 R /F6 189 0 R /F7 190 0 R >>
-/ProcSet [ /PDF /ImageC /Text ] >>
-endobj
-15 0 obj
-<<
-/S /GoTo
-/D [91 0 R /XYZ 115.0 725.0 null]
->>
-endobj
-17 0 obj
-<<
-/S /GoTo
-/D [93 0 R /XYZ 115.0 725.0 null]
->>
-endobj
-19 0 obj
-<<
-/S /GoTo
-/D [93 0 R /XYZ 115.0 666.009 null]
->>
-endobj
-21 0 obj
-<<
-/S /GoTo
-/D [93 0 R /XYZ 115.0 632.684 null]
->>
-endobj
-23 0 obj
-<<
-/S /GoTo
-/D [93 0 R /XYZ 115.0 233.665 null]
->>
-endobj
-25 0 obj
-<<
-/S /GoTo
-/D [95 0 R /XYZ 115.0 127.26 null]
->>
-endobj
-27 0 obj
-<<
-/S /GoTo
-/D [97 0 R /XYZ 115.0 725.0 null]
->>
-endobj
-29 0 obj
-<<
-/S /GoTo
-/D [97 0 R /XYZ 115.0 514.701 null]
->>
-endobj
-31 0 obj
-<<
-/S /GoTo
-/D [99 0 R /XYZ 115.0 725.0 null]
->>
-endobj
-33 0 obj
-<<
-/S /GoTo
-/D [103 0 R /XYZ 115.0 725.0 null]
->>
-endobj
-35 0 obj
-<<
-/S /GoTo
-/D [103 0 R /XYZ 115.0 655.009 null]
->>
-endobj
-37 0 obj
-<<
-/S /GoTo
-/D [103 0 R /XYZ 115.0 621.684 null]
->>
-endobj
-39 0 obj
-<<
-/S /GoTo
-/D [103 0 R /XYZ 115.0 347.085 null]
->>
-endobj
-41 0 obj
-<<
-/S /GoTo
-/D [105 0 R /XYZ 115.0 177.98 null]
->>
-endobj
-43 0 obj
-<<
-/S /GoTo
-/D [105 0 R /XYZ 115.0 144.655 null]
->>
-endobj
-45 0 obj
-<<
-/S /GoTo
-/D [107 0 R /XYZ 115.0 570.14 null]
->>
-endobj
-47 0 obj
-<<
-/S /GoTo
-/D [111 0 R /XYZ 115.0 725.0 null]
->>
-endobj
-49 0 obj
-<<
-/S /GoTo
-/D [111 0 R /XYZ 115.0 655.009 null]
->>
-endobj
-51 0 obj
-<<
-/S /GoTo
-/D [111 0 R /XYZ 115.0 621.684 null]
->>
-endobj
-53 0 obj
-<<
-/S /GoTo
-/D [113 0 R /XYZ 115.0 415.7 null]
->>
-endobj
-55 0 obj
-<<
-/S /GoTo
-/D [113 0 R /XYZ 115.0 382.375 null]
->>
-endobj
-57 0 obj
-<<
-/S /GoTo
-/D [115 0 R /XYZ 115.0 725.0 null]
->>
-endobj
-59 0 obj
-<<
-/S /GoTo
-/D [115 0 R /XYZ 115.0 655.009 null]
->>
-endobj
-61 0 obj
-<<
-/S /GoTo
-/D [115 0 R /XYZ 115.0 621.684 null]
->>
-endobj
-63 0 obj
-<<
-/S /GoTo
-/D [115 0 R /XYZ 115.0 145.225 null]
->>
-endobj
-65 0 obj
-<<
-/S /GoTo
-/D [115 0 R /XYZ 115.0 111.9 null]
->>
-endobj
-67 0 obj
-<<
-/S /GoTo
-/D [119 0 R /XYZ 115.0 725.0 null]
->>
-endobj
-69 0 obj
-<<
-/S /GoTo
-/D [119 0 R /XYZ 115.0 666.009 null]
->>
-endobj
-71 0 obj
-<<
-/S /GoTo
-/D [119 0 R /XYZ 115.0 632.684 null]
->>
-endobj
-73 0 obj
-<<
-/S /GoTo
-/D [121 0 R /XYZ 115.0 209.54 null]
->>
-endobj
-75 0 obj
-<<
-/S /GoTo
-/D [123 0 R /XYZ 115.0 281.78 null]
->>
-endobj
-77 0 obj
-<<
-/S /GoTo
-/D [123 0 R /XYZ 115.0 248.455 null]
->>
-endobj
-79 0 obj
-<<
-/S /GoTo
-/D [125 0 R /XYZ 115.0 662.0 null]
->>
-endobj
-81 0 obj
-<<
-/S /GoTo
-/D [125 0 R /XYZ 115.0 335.841 null]
->>
-endobj
-83 0 obj
-<<
-/S /GoTo
-/D [133 0 R /XYZ 115.0 725.0 null]
->>
-endobj
-85 0 obj
-<<
-/S /GoTo
-/D [133 0 R /XYZ 115.0 666.009 null]
->>
-endobj
-87 0 obj
-<<
-/S /GoTo
-/D [133 0 R /XYZ 115.0 632.684 null]
->>
-endobj
-89 0 obj
-<<
-/S /GoTo
-/D [135 0 R /XYZ 67.0 725.0 null]
->>
-endobj
-140 0 obj
-<<
- /First 142 0 R
- /Last 182 0 R
->> endobj
-141 0 obj
-<<
-/S /GoTo
-/D [10 0 R /XYZ 115.0 725.0 null]
->>
-endobj
-143 0 obj
-<<
-/S /GoTo
-/D [12 0 R /XYZ 115.0 715.0 null]
->>
-endobj
-xref
-0 191
-0000000000 65535 f
-0000053910 00000 n
-0000054176 00000 n
-0000054269 00000 n
-0000000015 00000 n
-0000000071 00000 n
-0000000408 00000 n
-0000000514 00000 n
-0000001653 00000 n
-0000001759 00000 n
-0000001920 00000 n
-0000002027 00000 n
-0000003395 00000 n
-0000003518 00000 n
-0000003804 00000 n
-0000054435 00000 n
-0000003940 00000 n
-0000054500 00000 n
-0000004076 00000 n
-0000054565 00000 n
-0000004212 00000 n
-0000054632 00000 n
-0000004348 00000 n
-0000054699 00000 n
-0000004483 00000 n
-0000054766 00000 n
-0000004619 00000 n
-0000054832 00000 n
-0000004755 00000 n
-0000054897 00000 n
-0000004890 00000 n
-0000054964 00000 n
-0000005026 00000 n
-0000055029 00000 n
-0000005162 00000 n
-0000055095 00000 n
-0000005298 00000 n
-0000055163 00000 n
-0000005434 00000 n
-0000055231 00000 n
-0000005570 00000 n
-0000055299 00000 n
-0000005706 00000 n
-0000055366 00000 n
-0000005842 00000 n
-0000055434 00000 n
-0000005978 00000 n
-0000055501 00000 n
-0000006114 00000 n
-0000055567 00000 n
-0000006250 00000 n
-0000055635 00000 n
-0000006386 00000 n
-0000055703 00000 n
-0000006522 00000 n
-0000055769 00000 n
-0000006658 00000 n
-0000055837 00000 n
-0000006794 00000 n
-0000055903 00000 n
-0000006930 00000 n
-0000055971 00000 n
-0000007066 00000 n
-0000056039 00000 n
-0000007202 00000 n
-0000056107 00000 n
-0000007338 00000 n
-0000056173 00000 n
-0000007474 00000 n
-0000056239 00000 n
-0000007610 00000 n
-0000056307 00000 n
-0000007746 00000 n
-0000056375 00000 n
-0000007882 00000 n
-0000056442 00000 n
-0000008018 00000 n
-0000056509 00000 n
-0000008154 00000 n
-0000056577 00000 n
-0000008290 00000 n
-0000056643 00000 n
-0000008426 00000 n
-0000056711 00000 n
-0000008562 00000 n
-0000056777 00000 n
-0000008698 00000 n
-0000056845 00000 n
-0000008833 00000 n
-0000056913 00000 n
-0000008969 00000 n
-0000010032 00000 n
-0000010140 00000 n
-0000012316 00000 n
-0000012424 00000 n
-0000014217 00000 n
-0000014325 00000 n
-0000015773 00000 n
-0000015881 00000 n
-0000018037 00000 n
-0000018145 00000 n
-0000018965 00000 n
-0000019075 00000 n
-0000020614 00000 n
-0000020724 00000 n
-0000022570 00000 n
-0000022680 00000 n
-0000023997 00000 n
-0000024107 00000 n
-0000024652 00000 n
-0000024762 00000 n
-0000026006 00000 n
-0000026116 00000 n
-0000027453 00000 n
-0000027563 00000 n
-0000029288 00000 n
-0000029398 00000 n
-0000030077 00000 n
-0000030187 00000 n
-0000031877 00000 n
-0000031987 00000 n
-0000033923 00000 n
-0000034033 00000 n
-0000035808 00000 n
-0000035918 00000 n
-0000037775 00000 n
-0000037885 00000 n
-0000039309 00000 n
-0000039419 00000 n
-0000041125 00000 n
-0000041235 00000 n
-0000041591 00000 n
-0000041701 00000 n
-0000042701 00000 n
-0000042811 00000 n
-0000044313 00000 n
-0000044439 00000 n
-0000044460 00000 n
-0000045103 00000 n
-0000045229 00000 n
-0000056978 00000 n
-0000057032 00000 n
-0000045250 00000 n
-0000057098 00000 n
-0000045504 00000 n
-0000045705 00000 n
-0000045941 00000 n
-0000046288 00000 n
-0000046486 00000 n
-0000046654 00000 n
-0000046798 00000 n
-0000046954 00000 n
-0000047123 00000 n
-0000047288 00000 n
-0000047562 00000 n
-0000047862 00000 n
-0000048060 00000 n
-0000048228 00000 n
-0000048395 00000 n
-0000048551 00000 n
-0000048720 00000 n
-0000048870 00000 n
-0000049170 00000 n
-0000049368 00000 n
-0000049521 00000 n
-0000049677 00000 n
-0000049831 00000 n
-0000050143 00000 n
-0000050341 00000 n
-0000050494 00000 n
-0000050650 00000 n
-0000050804 00000 n
-0000051116 00000 n
-0000051314 00000 n
-0000051482 00000 n
-0000051638 00000 n
-0000051794 00000 n
-0000051963 00000 n
-0000052123 00000 n
-0000052315 00000 n
-0000052609 00000 n
-0000052750 00000 n
-0000052903 00000 n
-0000053018 00000 n
-0000053131 00000 n
-0000053240 00000 n
-0000053356 00000 n
-0000053467 00000 n
-0000053581 00000 n
-0000053688 00000 n
-0000053800 00000 n
-trailer
-<<
-/Size 191
-/Root 2 0 R
-/Info 4 0 R
->>
-startxref
-57164
-%%EOF
diff --git a/src/3rdparty/squirrel/doc/squirrel2.chm b/src/3rdparty/squirrel/doc/squirrel2.chm
deleted file mode 100644
index f289edd1e6..0000000000
Binary files a/src/3rdparty/squirrel/doc/squirrel2.chm and /dev/null differ
diff --git a/src/3rdparty/squirrel/doc/squirrel2.pdf b/src/3rdparty/squirrel/doc/squirrel2.pdf
deleted file mode 100644
index af3e0fde9b..0000000000
--- a/src/3rdparty/squirrel/doc/squirrel2.pdf
+++ /dev/null
@@ -1,6426 +0,0 @@
-%PDF-1.3
-%
-4 0 obj
-<< /Type /Info
-/Producer (FOP 0.20.5) >>
-endobj
-5 0 obj
-<< /Length 242 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gaqco]*cD?&4QKpMCE&o3;_QsMHU9D\t)sA0PV_"go0+KHisl,*LLp9/;hPIK/+9qL3ODc"L/XD-R"&PP9?to9cdO^b_(UoJR,^t4fXaV*l1s(hf6dZA.$iuD"u).S!&PO>r7V:qqXVEI0U=0mG7sAWmV*Z%c@b(d,nP\Eb_Xje&sj6s,!HjU@qn5CB!ftO"(S1
-endstream
-endobj
-6 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 5 0 R
->>
-endobj
-7 0 obj
-<< /Length 1100 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gasao968Q9&AI=/pdUZcKcb0YV5PX5.]$TD`djHhOm=Z8n=#bBB0ulWKOLp;rIK:J%!SknV>3/6R/#6>VLpZWMkUF9,F?<#%=hM6Mkp!uBj5X$B2#V2>=u>L)5!(7V&8*!fU%#V69""keG\0eUbVCc5.r[(!8>"DSYhfG[893-2tT1i8c%;:Z3D/uE8j?BK!h$XJApc)$;3-ItK1.bP!IVr357,=/cjMBSALe)R#Po&70$jj*1c,Haa9iTARZD>$lCoK*T6^XuqdGRg:a=7sCF&@T:+8e'qhSZ$hkpkh(3/N^S+25;.:g"Q8%WNhlUF6rg(0&1BXO((l>;:%"FU<.[UZE^W'Z'?VtckL)2MZNV3*-J>irIPqji:W.#TTu%jI5EX$d;62d51St5A8+Vm&R"8iCZ#^r&J,(ZM2DTb\)BGmcq+h5ghXK-Rii#oKG?CT>/@u_0ML$gnDYSfs)M.]auTrhRM/Hi8fGL2O"tk<&ncl4F46`Mlpi!2AtnGL!`:[)QlcS*7A8[R)7\pHK15rmH>*7]a?>;jh0J.0ln"S@mk-",=nfhiqo&j+^$Hd23H9aXfL8\GGK[=C2s>7'6p87ej'W@H'[TPF:ha)(JJ3*V^OLDAEAT7o\N/pk_klbaiBNK)d)dMIAX8?J!B;A5`pZL%t'I<)4e*Q2ef^NoVMGn\J!0L$d%f~>
-endstream
-endobj
-8 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 7 0 R
->>
-endobj
-9 0 obj
-<< /Length 71 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Garg^iGoCd.c`?]8EV`b1=.gR0K1`91K?+0ZOMGdU/Zh'Y!=Te%#&:?HH*JE!
-endstream
-endobj
-10 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 9 0 R
->>
-endobj
-11 0 obj
-<< /Length 1807 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gb"/lc#]C5(rl%A=)dGlK*hD4CSj8IC#!]tBr9-%4Z#;5ZEp.qndD\&+UTAM7%q7/dba*rb2SW+[6XLX*.U<3(_$_!5`E'Y>1UTB9Z=T`0d-Q!*>*.1K(\G_mrgb^ZFIGZ>SsBoLOT@.3WOISrcPKdUFuQ'a&s^WP_"9Ec55mkig$s)1OPsJ5bLV=#`J[6+WEd^R]jjn:K6>+\aYW35SL$R0W0Y8oI#b[9?Hku`/3cO?n0D$JO!!X#CaE-&Ao%TDC+A<=UDr)\p4kNi+Z:6>f5J[^Qp'ECW)2,&P(MrIe7Lu$H/%0D)-+WO@oE"Kofpe`qJIlp!2$N_=pdEPhKDSKMfL@6gqa7GVP/#94"kPdEq76GmBE:.;$Sa[f<[5fZX%Efbb3#e6;Z9O_N2i3Qj?g(Z,,P/T1oh2oJ:XTO,DN?=ecDF2hl0AOJ+4p^eFn`S:)pZU6=4uHD*R7;`mLIlj0PoH=(;Qa@PELC(dl=1Q7,7&BfZptLk@9tIfV)GA/58_#`+:r3[]qG=M6)'nVns*C.91'P25bK@"4j)_%<]lLG2n!bd@4a,Z@B>JpAOV%5pS[jo(6.0O&EjF1_`(h,Df2$bm[KVboVWhY!DofsXBu"@Sg/S@I@nf]b:74$^#/pOcNA`i2+[U?U*8;GZRnQlQ>rna'`1XW5_ht6..lst9:0.U9XhFG25G,d!pu;d'0O`bmJ_665/2TBcQ1S`?Rm)>V%+Z7`uH-WZB9V(roZKNC[m_~>
-endstream
-endobj
-12 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 11 0 R
-/Annots 13 0 R
->>
-endobj
-13 0 obj
-[
-14 0 R
-16 0 R
-18 0 R
-20 0 R
-22 0 R
-24 0 R
-26 0 R
-28 0 R
-30 0 R
-32 0 R
-34 0 R
-36 0 R
-38 0 R
-40 0 R
-42 0 R
-44 0 R
-46 0 R
-48 0 R
-50 0 R
-52 0 R
-54 0 R
-56 0 R
-58 0 R
-60 0 R
-62 0 R
-64 0 R
-66 0 R
-68 0 R
-70 0 R
-72 0 R
-74 0 R
-76 0 R
-78 0 R
-80 0 R
-82 0 R
-84 0 R
-86 0 R
-88 0 R
-90 0 R
-92 0 R
-94 0 R
-96 0 R
-98 0 R
-100 0 R
-102 0 R
-104 0 R
-106 0 R
-108 0 R
-110 0 R
-112 0 R
-114 0 R
-116 0 R
-118 0 R
-]
-endobj
-14 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 120.0 655.001 179.44 645.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 15 0 R
-/H /I
->>
-endobj
-16 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 120.0 644.001 184.15 634.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 17 0 R
-/H /I
->>
-endobj
-18 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 633.001 211.48 623.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 19 0 R
-/H /I
->>
-endobj
-20 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 622.001 209.1 612.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 21 0 R
-/H /I
->>
-endobj
-22 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 611.001 209.1 601.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 23 0 R
-/H /I
->>
-endobj
-24 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 600.001 207.43 590.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 25 0 R
-/H /I
->>
-endobj
-26 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 589.001 219.38 579.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 27 0 R
-/H /I
->>
-endobj
-28 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 578.001 198.55 568.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 29 0 R
-/H /I
->>
-endobj
-30 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 567.001 211.34 557.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 31 0 R
-/H /I
->>
-endobj
-32 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 556.001 233.7 546.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 33 0 R
-/H /I
->>
-endobj
-34 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 545.001 196.32 535.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 35 0 R
-/H /I
->>
-endobj
-36 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 534.001 188.56 524.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 37 0 R
-/H /I
->>
-endobj
-38 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 523.001 192.45 513.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 39 0 R
-/H /I
->>
-endobj
-40 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 512.001 185.78 502.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 41 0 R
-/H /I
->>
-endobj
-42 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 501.001 187.45 491.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 43 0 R
-/H /I
->>
-endobj
-44 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 490.001 190.77 480.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 45 0 R
-/H /I
->>
-endobj
-46 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 479.001 191.32 469.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 47 0 R
-/H /I
->>
-endobj
-48 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 468.001 203.56 458.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 49 0 R
-/H /I
->>
-endobj
-50 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 457.001 189.67 447.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 51 0 R
-/H /I
->>
-endobj
-52 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 446.001 224.94 436.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 53 0 R
-/H /I
->>
-endobj
-54 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 435.001 207.98 425.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 55 0 R
-/H /I
->>
-endobj
-56 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 424.001 203.54 414.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 57 0 R
-/H /I
->>
-endobj
-58 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 413.001 196.32 403.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 59 0 R
-/H /I
->>
-endobj
-60 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 402.001 238.24 392.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 61 0 R
-/H /I
->>
-endobj
-62 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 391.001 218.72 381.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 63 0 R
-/H /I
->>
-endobj
-64 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 380.001 206.32 370.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 65 0 R
-/H /I
->>
-endobj
-66 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 369.001 187.89 359.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 67 0 R
-/H /I
->>
-endobj
-68 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 358.001 191.89 348.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 69 0 R
-/H /I
->>
-endobj
-70 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 347.001 268.01 337.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 71 0 R
-/H /I
->>
-endobj
-72 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 336.001 193.0 326.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 73 0 R
-/H /I
->>
-endobj
-74 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 325.001 190.21 315.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 75 0 R
-/H /I
->>
-endobj
-76 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 314.001 202.44 304.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 77 0 R
-/H /I
->>
-endobj
-78 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 303.001 191.88 293.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 79 0 R
-/H /I
->>
-endobj
-80 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 292.001 188.0 282.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 81 0 R
-/H /I
->>
-endobj
-82 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 281.001 276.3 271.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 83 0 R
-/H /I
->>
-endobj
-84 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 270.001 250.49 260.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 85 0 R
-/H /I
->>
-endobj
-86 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 259.001 236.6 249.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 87 0 R
-/H /I
->>
-endobj
-88 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 248.001 202.99 238.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 89 0 R
-/H /I
->>
-endobj
-90 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 237.001 191.33 227.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 91 0 R
-/H /I
->>
-endobj
-92 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 226.001 189.11 216.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 93 0 R
-/H /I
->>
-endobj
-94 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 215.001 190.22 205.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 95 0 R
-/H /I
->>
-endobj
-96 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 204.001 251.6 194.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 97 0 R
-/H /I
->>
-endobj
-98 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 193.001 192.33 183.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 99 0 R
-/H /I
->>
-endobj
-100 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 182.001 290.1 172.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 101 0 R
-/H /I
->>
-endobj
-102 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 171.001 207.43 161.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 103 0 R
-/H /I
->>
-endobj
-104 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 160.001 238.26 150.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 105 0 R
-/H /I
->>
-endobj
-106 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 149.001 201.32 139.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 107 0 R
-/H /I
->>
-endobj
-108 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 138.001 189.66 128.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 109 0 R
-/H /I
->>
-endobj
-110 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 127.001 238.81 117.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 111 0 R
-/H /I
->>
-endobj
-112 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 116.001 170.66 106.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 113 0 R
-/H /I
->>
-endobj
-114 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 105.001 219.67 95.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 115 0 R
-/H /I
->>
-endobj
-116 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 94.001 218.83 84.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 117 0 R
-/H /I
->>
-endobj
-118 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 83.001 218.84 73.001 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 119 0 R
-/H /I
->>
-endobj
-120 0 obj
-<< /Length 2026 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gb"/l>Ar7S!/9>//,V6B&+r>QPiTk298a;D_cdk'(^>VYka7`*V6lIFqt8FW1?CoaHJ)]Z4tTTY@Ot#!FH1T+,d6C+T3q1EEMh$+^)B#l]+GoB`EtAIN"q%1EMp_sc]dmk=2,Rs*]K;Q/(^C.5J!:!a;kft"St#s.sJNJ_.=lG%\"nq3)bFBe*@ZDL'eNVSQMNn8<$tRV[P1?Y+1A[oH%SnRr>u##7qs)\df!9hhnH(KPkNdX&4VLf/F,50*_m8[+OhWMk3XEW(FlkV2DWM$B%uSq_6In\"9S6e\gmG&hb!Yk(7S%sT;Ei3Id;R2kEMVX3Mj!WnoS2/79GeOo$K[48l3KFY&o![muPmfN^(6u)A;](PCA^tDr*Q:=lCSWqZOpXkfB!eJ']m^uKdHtJRKmpmaXRB=r:IVF/L^2snlF@ac-B@e+6CsqU.e?Wa.Vl%s",8`3=JM*I=gr$HaZ(&+8Y@jsQr(e)HFe6[cl`KILGL8AMJ\Fd8h4[QgK*,;q,Rb7J%&h2HR*EK2H/14[%fh.b6B."niW.V!b5>D7`<5RR_+E,+0\G.U7poGe-Y_0"$HW\+A8gGIbr,Kgg(=F`"p&.%pH6+Z7>0Q%PLMn@+tW/mc15TnG*3=)rO_M+;J2fW$'"G_:/#]sD&irmj9$5\h`[na^eL+#?\1Sr))\gIJ6f7jqT,)SuW5i3jnFQq<8)hb\H2Y1L*.WM>lif?RB4gBT1\Cfl)!_H3!Fa1<.>!=TP'FK%e)!Ss7?S]G=j9mIYtk0"moi96i*X)ch$iPk+f`Ruc<-bC+.=1JfbgVXR2/V$)66&k*#mDrDE`'#&=HkWDN&R3@q*g:.R=3F=`d&I>%L*p?r[+:RMM*0(bI\V5*l"Wq<:60iO+OGC3UX<^Y7ChMM>\^$]FDBo_>;V\ABQ%7E&"dlRN%El&S=gH'!hC0FXahF*@_4pA62)W^O&l.7d,M4^]]ePJ/r![J(n'n1"SPu0CO6blq(e90ptj(gD>*[#?cB"CZq"b!^MshK586^t;d?fOUrGUj@B(E,B'FL.QTF>t!eF*uH8P*F"P6k[1*pE&cbU**M@D^6TRfq7lt>@q[B_rbjdNAWFkR@o#g7Y:R?('&5TimqT2[fa_JMuJZ&l)_-lpD_FiP.X"U#_NodH7hLD69bXmYd_A9HK?4oVR65c7D;+G9)3]5(ncmrP&!UfD8uq`St8Tqf,8W+-AW"T"`*q^gB&/!egEf1h^hX*Ci:9N^)'7bq-mCNE1+#(ZtP4dpS2''r*+#8Q,iQRke6DCZ!7)RNL/G<48=ZY?N\,=U1`TsqCYdqo2CFFuirUIOgM;t>LaO3PX!QL3V,N`l\-Lr\'WT6?q@N1PYSO;`8P>BScI8"W8rphj&,Nq=3WnhI2t.EKU#C@qDeHG5SOq$!!!*t2H]Ek53$*k[giBqu5CDs)=2kN1+r?'jIahuD[N:kohJS5.c2pHR:`qA3NsR&9~>
-endstream
-endobj
-121 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 120 0 R
-/Annots 122 0 R
->>
-endobj
-122 0 obj
-[
-123 0 R
-125 0 R
-127 0 R
-129 0 R
-131 0 R
-133 0 R
-135 0 R
-137 0 R
-139 0 R
-141 0 R
-143 0 R
-145 0 R
-147 0 R
-149 0 R
-151 0 R
-153 0 R
-155 0 R
-157 0 R
-159 0 R
-161 0 R
-163 0 R
-165 0 R
-167 0 R
-169 0 R
-171 0 R
-173 0 R
-175 0 R
-177 0 R
-179 0 R
-181 0 R
-183 0 R
-185 0 R
-187 0 R
-189 0 R
-191 0 R
-193 0 R
-195 0 R
-197 0 R
-199 0 R
-201 0 R
-203 0 R
-205 0 R
-207 0 R
-209 0 R
-211 0 R
-213 0 R
-215 0 R
-217 0 R
-219 0 R
-221 0 R
-223 0 R
-225 0 R
-227 0 R
-229 0 R
-231 0 R
-233 0 R
-235 0 R
-237 0 R
-]
-endobj
-123 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 719.0 171.21 709.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 124 0 R
-/H /I
->>
-endobj
-125 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 708.0 183.45 698.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 126 0 R
-/H /I
->>
-endobj
-127 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 697.0 250.49 687.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 128 0 R
-/H /I
->>
-endobj
-129 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 686.0 224.39 676.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 130 0 R
-/H /I
->>
-endobj
-131 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 675.0 318.27 665.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 132 0 R
-/H /I
->>
-endobj
-133 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 664.0 224.37 654.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 134 0 R
-/H /I
->>
-endobj
-135 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 653.0 223.82 643.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 136 0 R
-/H /I
->>
-endobj
-137 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 642.0 174.0 632.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 138 0 R
-/H /I
->>
-endobj
-139 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 631.0 236.6 621.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 140 0 R
-/H /I
->>
-endobj
-141 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 620.0 228.83 610.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 142 0 R
-/H /I
->>
-endobj
-143 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 609.0 212.98 599.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 144 0 R
-/H /I
->>
-endobj
-145 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 598.0 222.44 588.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 146 0 R
-/H /I
->>
-endobj
-147 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 587.0 187.87 577.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 148 0 R
-/H /I
->>
-endobj
-149 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 576.0 251.78 566.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 150 0 R
-/H /I
->>
-endobj
-151 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 565.0 207.45 555.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 152 0 R
-/H /I
->>
-endobj
-153 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 554.0 223.55 544.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 154 0 R
-/H /I
->>
-endobj
-155 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 543.0 254.94 533.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 156 0 R
-/H /I
->>
-endobj
-157 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 532.0 176.21 522.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 158 0 R
-/H /I
->>
-endobj
-159 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 521.0 223.27 511.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 160 0 R
-/H /I
->>
-endobj
-161 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 510.0 214.24 500.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 162 0 R
-/H /I
->>
-endobj
-163 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 499.0 187.88 489.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 164 0 R
-/H /I
->>
-endobj
-165 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 488.0 198.44 478.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 166 0 R
-/H /I
->>
-endobj
-167 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 477.0 184.11 467.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 168 0 R
-/H /I
->>
-endobj
-169 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 466.0 185.22 456.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 170 0 R
-/H /I
->>
-endobj
-171 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 455.0 204.11 445.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 172 0 R
-/H /I
->>
-endobj
-173 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 444.0 199.67 434.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 174 0 R
-/H /I
->>
-endobj
-175 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 433.0 187.44 423.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 176 0 R
-/H /I
->>
-endobj
-177 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 422.0 186.89 412.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 178 0 R
-/H /I
->>
-endobj
-179 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 411.0 188.56 401.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 180 0 R
-/H /I
->>
-endobj
-181 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 400.0 185.78 390.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 182 0 R
-/H /I
->>
-endobj
-183 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 389.0 203.56 379.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 184 0 R
-/H /I
->>
-endobj
-185 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 378.0 190.78 368.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 186 0 R
-/H /I
->>
-endobj
-187 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 367.0 198.55 357.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 188 0 R
-/H /I
->>
-endobj
-189 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 356.0 190.22 346.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 190 0 R
-/H /I
->>
-endobj
-191 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 345.0 187.44 335.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 192 0 R
-/H /I
->>
-endobj
-193 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 334.0 199.66 324.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 194 0 R
-/H /I
->>
-endobj
-195 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 323.0 193.0 313.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 196 0 R
-/H /I
->>
-endobj
-197 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 312.0 203.56 302.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 198 0 R
-/H /I
->>
-endobj
-199 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 301.0 208.55 291.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 200 0 R
-/H /I
->>
-endobj
-201 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 290.0 222.43 280.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 202 0 R
-/H /I
->>
-endobj
-203 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 279.0 214.84 269.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 204 0 R
-/H /I
->>
-endobj
-205 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 268.0 231.06 258.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 206 0 R
-/H /I
->>
-endobj
-207 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 257.0 237.7 247.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 208 0 R
-/H /I
->>
-endobj
-209 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 120.0 246.0 210.83 236.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 210 0 R
-/H /I
->>
-endobj
-211 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 235.0 232.04 225.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 212 0 R
-/H /I
->>
-endobj
-213 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 224.0 177.88 214.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 214 0 R
-/H /I
->>
-endobj
-215 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 213.0 271.76 203.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 216 0 R
-/H /I
->>
-endobj
-217 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 202.0 290.1 192.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 218 0 R
-/H /I
->>
-endobj
-219 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 191.0 215.93 181.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 220 0 R
-/H /I
->>
-endobj
-221 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 180.0 222.61 170.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 222 0 R
-/H /I
->>
-endobj
-223 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 169.0 184.27 159.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 224 0 R
-/H /I
->>
-endobj
-225 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 158.0 223.27 148.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 226 0 R
-/H /I
->>
-endobj
-227 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 168.0 147.0 245.5 137.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 228 0 R
-/H /I
->>
-endobj
-229 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 136.0 237.88 126.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 230 0 R
-/H /I
->>
-endobj
-231 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 125.0 218.45 115.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 232 0 R
-/H /I
->>
-endobj
-233 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 114.0 216.22 104.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 234 0 R
-/H /I
->>
-endobj
-235 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 103.0 222.04 93.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 236 0 R
-/H /I
->>
-endobj
-237 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 92.0 269.81 82.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 238 0 R
-/H /I
->>
-endobj
-239 0 obj
-<< /Length 835 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gb"/jbAs(+'Sc?EKpH.EMJc[bFkY-N1S1BKl))p`N+H3F#"Q[Ie#+k9"u-V]U=0TDI)_XOa+BFira,nM(a[J^NuVTco2.8eI'diHnuE9jR'A+X@cH>X,qJW\ibg"69U*C_D[89l>_mc>)s6JP6KP&nRjuQo@%pt]]C1<$J5-cW7@3o7u5gaFa3L(>iDYWs5D2kb%=O:idNDrlZFCgWSNgS8LFgpt4Y6F-5%n:[ug'!!35uk:T"nQQV)f(LWh]@)i)`9sXng:]uUt&C?hDj!nJeDSa6AYZeX_bJcc#>f;1kC1K)`?%OqPAtHc/V6YmFGAtoUpbcJ6j&ZN@9b_NQiEd,ffG:*=*_Vn:ZVE[)7VX5)ot->@NVLlL!<43
-endstream
-endobj
-240 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 239 0 R
-/Annots 241 0 R
->>
-endobj
-241 0 obj
-[
-242 0 R
-244 0 R
-246 0 R
-248 0 R
-250 0 R
-252 0 R
-254 0 R
-256 0 R
-258 0 R
-260 0 R
-262 0 R
-264 0 R
-266 0 R
-268 0 R
-270 0 R
-]
-endobj
-242 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 719.0 250.64 709.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 243 0 R
-/H /I
->>
-endobj
-244 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 708.0 214.54 698.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 245 0 R
-/H /I
->>
-endobj
-246 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 697.0 398.68 687.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 247 0 R
-/H /I
->>
-endobj
-248 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 686.0 208.69 676.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 249 0 R
-/H /I
->>
-endobj
-250 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 120.0 675.0 189.14 665.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 251 0 R
-/H /I
->>
-endobj
-252 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 664.0 209.82 654.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 253 0 R
-/H /I
->>
-endobj
-254 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 653.0 181.78 643.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 255 0 R
-/H /I
->>
-endobj
-256 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 642.0 212.6 632.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 257 0 R
-/H /I
->>
-endobj
-258 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 631.0 259.81 621.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 259 0 R
-/H /I
->>
-endobj
-260 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 620.0 164.56 610.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 261 0 R
-/H /I
->>
-endobj
-262 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 609.0 229.83 599.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 263 0 R
-/H /I
->>
-endobj
-264 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 598.0 233.15 588.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 265 0 R
-/H /I
->>
-endobj
-266 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 587.0 226.77 577.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 267 0 R
-/H /I
->>
-endobj
-268 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 144.0 576.0 208.14 566.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 269 0 R
-/H /I
->>
-endobj
-270 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 120.0 565.0 142.77 555.0 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 271 0 R
-/H /I
->>
-endobj
-272 0 obj
-<< /Length 726 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-GarnUa_oie&A@B[G]]$LeRgDR-:i[\&erluk^f$h'G2r)76,M*^=3orJdV[t]]Y^AbjZ&`9CL%sN2"8:o,*aP(Eh^k-nrCIAW\(-1b\b`a\^+,YJX:s3t:Hb*MY1WM``CcF9qgsr[,"8oh]?P`?"f7b4"JO'++i*c()"M9Xe&2d'@SZspI@s151\p$6mJ`H'sV)ou[_OOOjS5:cXJ-e>?WeR)X!OZLG[.YAT(=^G::sIotd8u3KH?5I>Ot?dh%H/#U+m9^-EM05Z%u[1'd@m8Fh_J/IZ#3uCo^qV%P='?J;I-ce)2n?Df"0]5)L>%)_!J!KLHRfW(iU&`$>$QefQE-RGgs[WPL6jFN^%mOWKr;'gKXg!o>VGLG7J/l_'91H4EF)E-L!L9$Vt=\I5XRD#jj9*0F-ouns[1p?IQ%ZYW,Ao6#rI-i^pKK\!ap\,G&Z3GfXn[\;KkGNDO1.srTF3.qt`_q=*mt^X>mN'P^(uOsiRuW-RnE.8`?f]S*p^\5kD&i~>
-endstream
-endobj
-273 0 obj
-<< /Type /Page
-/Parent 1 0 R
-/MediaBox [ 0 0 612 792 ]
-/Resources 3 0 R
-/Contents 272 0 R
->>
-endobj
-274 0 obj
-<< /Length 1558 /Filter [ /ASCII85Decode /FlateDecode ]
- >>
-stream
-Gasap>Ar7S'Roe[:]iOGPF.W6HPQijLBZ<6.#.P3Bi`RnAJ:=XQ_NKLbP'[\8X+LraE-:+o:87?)im22+6Jd]GHQW_'Lf/^cR-*.S2ch:IZ>.PA6V>6UVI8>q:`DEs)CIcP)=J7'Sdih,EcA,d!Y7;"gr>ed=BYOkCWlO.#\d+t)-OE,>*'Lk[AFop9kg"$[\2`5*T`;SnmjH5.591-iK>MK.meG[U4&H0Y;Q_n*uI)kbTre7=OFck>^!W1.F]X[+Tn=,L>mM2GUM4\TJOrkq1[G\MAs@1#K(RJuV!P?*YZ+,^NKp<<;0ecY!Gm7@k<"RMsF[#J>*XGdUlMHtKQUUV&W!][!PAe=\lhCq>h9-'NI]>h___TKf")gXGrVdlV)^IseAc&2ZCm`G+U&(]TD0Od%/S]U(6NKKL=0!B&=R8U4Kk:g*BaqKS&L8QO2EWSqd;V+ZNmm,DeBj.fK-(_iJVmBtX_bcBm,lr$muJD)Ff'9r06nB#0]Z-!4GBDJJjQmP_i#-1'3V0NN4t+%EYCf6Hqe87ig:S`:+/@2l>VAFK(K`Rn9]<%SJm-jgpW83$=mG"u09'>Pe-h9g4j74bG"d==o0s$9.3A0Te56@(O&/Cb\.WhV?Uc]8b20J6HdAF]oSd8r7?5jZqGCPa6k."QK#XLqogA\j#B,tmm3]f8ZYp)@cQb8QFMX"o,??bg55La\k#rjFB$HFg^p^LjrqtQlZ[r)I[#],0p=X:)hi>u