- opravene regresnie, kotre vznikli, pri prepise naciatavania aren z *.zip

  ( a odstranene prebytocne subory z adresarovej struktury -- tie ktore su uz zabalene v zip )



git-svn-id: http://opensvn.csie.org/tuxanci_ng@265 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

62 files changed, 117 insertions, 279 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89846cf..d113702 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,11 +174,12 @@ ENDIF ( Win )
 ###############################################################################
 # SDL SEARCH
 ###############################################################################
+FIND_PACKAGE ( ZZIP REQUIRED )
+
 IF ( NOT Win AND NOT Server )
 	FIND_PACKAGE ( SDL REQUIRED )
 	FIND_PACKAGE ( SDL_image REQUIRED )
 	FIND_PACKAGE ( SDL_ttf REQUIRED )
-	FIND_PACKAGE ( ZZIP REQUIRED )
 	IF ( NOT NO_Audio )
 		FIND_PACKAGE ( SDL_mixer REQUIRED )
 	ENDIF ( NOT NO_Audio )
diff --git a/data/arena/ba_in_a_captivity_of_8-bit.map b/data/arena/ba_in_a_captivity_of_8-bit.map
deleted file mode 100644
index ebaa8fe..0000000
--- a/data/arena/ba_in_a_captivity_of_8-bit.map
+++ /dev/null
@@ -1,107 +0,0 @@
-
-name In a captivity of 8-bit
-netName BAIACO8B
-screen ba_in_a_captivity_of_8-bit.png
-
-loadModule file="libmodWall"
-loadModule file="libmodTeleport"
-
-loadMusic file="in_a_captivity_of_8-bit.ogg" name="in_a_captivity_of_8-bit"
-
-loadImage file="bal3.nic.png" name="nic" alpha="no"
-loadImage file="l3.ihlan.png" name="ihlan" alpha="yes"
-loadImage file="l3.kvader1.png" name="kvader1" alpha="yes"
-loadImage file="l3.kvader2.png" name="kvader2" alpha="yes"
-loadImage file="l3.teleport.png" name="teleport" alpha="yes"
-
-arena background="nic" w="2500" h="2500"
-
-playMusic music="in_a_captivity_of_8-bit"
-
-#wall rel="1" x="512" y="320" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-#wall rel="1" x="273" y="152" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-#wall rel="1" x="90" y="275" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-
-wwall rel="1" x="1518" y="426" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="1479" y="1228" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="1139" y="2241" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="1854" y="1988" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="270" y="140" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="1254" y="1107" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="1717" y="803" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="2228" y="771" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="1986" y="2311" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="2125" y="2299" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="2000" y="71" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="1077" y="1214" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="302" y="1194" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="2175" y="109" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="571" y="1964" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="328" y="387" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="1616" y="1378" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="2471" y="659" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="147" y="1607" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="1748" y="1825" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="433" y="1769" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="73" y="1854" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="125" y="1002" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="2165" y="1153" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="952" y="963" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="1035" y="642" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="708" y="1804" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="1850" y="964" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="1074" y="1011" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="475" y="1525" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="765" y="497" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="1875" y="2156" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="315" y="1233" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="340" y="698" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="23" y="1815" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="1084" y="2088" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="295" y="1808" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="1663" y="9" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="1162" y="1772" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="236" y="180" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="823" y="2115" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="271" y="1271" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="1087" y="1531" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="1394" y="2122" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="2499" y="1013" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="1510" y="1870" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="378" y="764" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="1997" y="2237" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="1787" y="693" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="1360" y="1190" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="2130" y="1811" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="2471" y="2445" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="2454" y="2425" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="1698" y="1634" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="1815" y="2469" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="2084" y="1934" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="2057" y="1490" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="1873" y="1207" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="829" y="644" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="1658" y="768" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="1490" y="2181" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="1797" y="2020" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="610" y="720" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="1413" y="147" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="1337" y="2397" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="560" y="274" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="1571" y="967" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="893" y="532" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="1018" y="377" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="346" y="91" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="877" y="333" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="675" y="1282" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="2490" y="434" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="2430" y="49" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="2169" y="2171" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-wall rel="1" x="1852" y="440" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-
-
-teleport x="100" y="100" w="58" h="58" layer="-1" image="teleport"
-teleport x="2342" y="100" w="58" h="58" layer="-1" image="teleport"
-teleport x="100" y="2342" w="58" h="58" layer="-1" image="teleport"
-teleport x="2342" y="2342" w="58" h="58" layer="-1" image="teleport"
-
diff --git a/data/arena/ba_in_a_captivity_of_8-bit.zip b/data/arena/ba_in_a_captivity_of_8-bit.zip
index 57df09f..2a7fbc4 100644
--- a/data/arena/ba_in_a_captivity_of_8-bit.zip
+++ b/data/arena/ba_in_a_captivity_of_8-bit.zip
diff --git a/data/arena/construction_site.map b/data/arena/construction_site.map
deleted file mode 100644
index e4ac7a1..0000000
--- a/data/arena/construction_site.map
+++ /dev/null
@@ -1,27 +0,0 @@
-
-name construction site
-netName CS
-screen construction_site.png
-
-loadModule file="libmodWall"
-
-loadMusic file="night_workshift.ogg" name="night_workshift"
-
-loadImage file="l4.pozadi.png" name="pozadi" alpha="no"
-loadImage file="l4.bagr.png" name="bagr" alpha="yes"
-loadImage file="l4.pytle.png" name="pytle" alpha="yes"
-loadImage file="l4.tvarnice.png" name="tvarnice" alpha="yes"
-loadImage file="l4.palety.png" name="palety" alpha="yes"
-loadImage file="l4.overlay.png" name="overlay" alpha="yes"
-
-arena background="pozadi" w="800" h="600"
-
-playMusic music="night_workshift"
-
-wall x="96" y="423" w="162" h="96" img_x="86" img_y="235" layer="0" image="bagr"
-wall x="425" y="358" w="120" h="55" img_x="410" img_y="326" layer="0" image="pytle"
-wall x="55" y="52" w="62" h="87" img_x="51" img_y="37" layer="0" image="tvarnice"
-wall x="92" y="0" w="198" h="118" img_x="65" img_y="0" layer="0" image="palety"
-wall x="0" y="0" w="0" h="0" img_x="0" img_y="0" layer="1" image="overlay"
-
-
diff --git a/data/arena/construction_site.zip b/data/arena/construction_site.zip
index 3b14bd8..db22e84 100644
--- a/data/arena/construction_site.zip
+++ b/data/arena/construction_site.zip
diff --git a/data/arena/for_a_good_night.map b/data/arena/for_a_good_night.map
deleted file mode 100644
index 2b4e5fd..0000000
--- a/data/arena/for_a_good_night.map
+++ /dev/null
@@ -1,23 +0,0 @@
-
-name For a good night
-netName FAGN
-screen for_a_good_night.png
-
-loadModule file="libmodWall"
-
-loadMusic file="for_a_good_night.ogg" name="for_a_good_night"
-
-loadImage file="l1.grow.png" name="grow" alpha="no"
-loadImage file="l1.hut.png" name="hut" alpha="yes"
-loadImage file="l1.peduncle.png" name="peduncle" alpha="yes"
-loadImage file="l1.tree.png" name="tree" alpha="yes"
-loadImage file="l1.wood.png" name="wood" alpha="yes"
-
-arena background="grow" w="800" h="600"
-
-playMusic music="for_a_good_night"
-
-wall x="1" y="1" w="0" h="0" img_x="75" img_y="20" layer="1" image="hut"
-wall x="120" y="159" w="180" h="65" img_x="90" img_y="159" layer="0" image="peduncle"
-wall x="520" y="260" w="161" h="100" img_x="500" img_y="180" layer="0" image="tree"
-wall x="220" y="400" w="110" h="10" img_x="200" img_y="370" layer="0" image="wood"
diff --git a/data/arena/for_a_good_night.zip b/data/arena/for_a_good_night.zip
index 9c5830b..3ee3207 100644
--- a/data/arena/for_a_good_night.zip
+++ b/data/arena/for_a_good_night.zip
diff --git a/data/arena/in_a_captivity_of_8-bit.map b/data/arena/in_a_captivity_of_8-bit.map
deleted file mode 100644
index dbe9293..0000000
--- a/data/arena/in_a_captivity_of_8-bit.map
+++ /dev/null
@@ -1,31 +0,0 @@
-
-name In a captivity of 8-bit
-netName IACO8B
-screen in_a_captivity_of_8-bit.png
-
-loadModule file="libmodWall"
-loadModule file="libmodTeleport"
-
-loadMusic file="in_a_captivity_of_8-bit.ogg" name="in_a_captivity_of_8-bit"
-
-loadImage file="l3.nic.png" name="nic" alpha="no"
-loadImage file="l3.ihlan.png" name="ihlan" alpha="yes"
-loadImage file="l3.kvader1.png" name="kvader1" alpha="yes"
-loadImage file="l3.kvader2.png" name="kvader2" alpha="yes"
-loadImage file="l3.teleport.png" name="teleport" alpha="yes"
-
-arena background="nic" w="800" h="600"
-
-playMusic music="in_a_captivity_of_8-bit"
-
-wall rel="1" x="512" y="320" w="125" h="100" img_x="-12" img_y="-195" layer="0" image="ihlan"
-wall rel="1" x="273" y="152" w="180" h="75" img_x="-23" img_y="-90" layer="0" image="kvader1"
-wall rel="1" x="90" y="275" w="87" h="205" img_x="-28" img_y="-88" layer="0" image="kvader2"
-
-#wall x="512" y="320" w="125" h="100" img_x="500" img_y="125" layer="0" image="ihlan"
-#wall x="273" y="152" w="180" h="75" img_x="250" img_y="62" layer="0" image="kvader1"
-#wall x="90" y="275" w="87" h="205" img_x="62" img_y="187" layer="0" image="kvader2"
-
-teleport x="112" y="112" w="58" h="58" layer="-1" image="teleport"
-teleport x="375" y="375" w="58" h="58" layer="-1" image="teleport"
-teleport x="700" y="120" w="58" h="58" layer="-1" image="teleport"
diff --git a/data/arena/in_a_captivity_of_8-bit.zip b/data/arena/in_a_captivity_of_8-bit.zip
index b0d07e6..cbefbb8 100644
--- a/data/arena/in_a_captivity_of_8-bit.zip
+++ b/data/arena/in_a_captivity_of_8-bit.zip
diff --git a/data/arena/night_workshift.map b/data/arena/night_workshift.map
deleted file mode 100644
index 9e13fbd..0000000
--- a/data/arena/night_workshift.map
+++ /dev/null
@@ -1,35 +0,0 @@
-
-name night workshift
-netName NW
-screen night_workshift.png
-
-loadModule file="libmodWall"
-loadModule file="libmodPipe"
-
-loadMusic file="night_workshift.ogg" name="night_workshift"
-
-loadImage file="l2.pitch.png" name="pitch" alpha="no"
-loadImage file="l2.potrubi.png" name="potrubi" alpha="yes"
-loadImage file="l2.retez.png" name="retez" alpha="yes"
-loadImage file="l2.barel.png" name="barel" alpha="yes"
-loadImage file="l2.nadrz.png" name="nadrz" alpha="yes"
-loadImage file="l2.trubky.png" name="trubky" alpha="yes"
-loadImage file="l2.trubka2.png" name="trubka2" alpha="yes"
-loadImage file="l2.trubka6.png" name="trubka6" alpha="yes"
-loadImage file="l2.trubka4.png" name="trubka4" alpha="yes"
-loadImage file="l2.trubka8.png" name="trubka8" alpha="yes"
-
-arena background="pitch" w="800" h="600"
-
-playMusic music="night_workshift"
-
-wall x="0" y="0" w="0" h="0" img_x="0" img_y="366" layer="1" image="potrubi"
-wall x="0" y="0" w="0" h="0" img_x="393" img_y="20" layer="1" image="retez"
-wall x="535" y="480" w="175" h="31" img_x="531" img_y="421" layer="0" image="barel"
-wall x="333" y="146" w="287" h="18" img_x="331" img_y="2" layer="0" image="nadrz"
-wall x="125" y="318" w="37" h="162" img_x="106" img_y="320" layer="0" image="trubky"
-
-pipe x="187" y="0" w="50" h="100" layer="0" position="2" id="1" id_out="4" image="trubka2"
-pipe x="0" y="187" w="100" h="50" layer="0" position="6" id="2" id_out="3" image="trubka6"
-pipe x="737" y="312" w="100" h="50" layer="0" position="4" id="3" id_out="2" image="trubka4"
-pipe x="400" y="500" w="50" h="100" layer="0" position="8"  id="4" id_out="1" image="trubka8"
diff --git a/data/arena/night_workshift.zip b/data/arena/night_workshift.zip
index 6b719bb..f69e8ec 100644
--- a/data/arena/night_workshift.zip
+++ b/data/arena/night_workshift.zip
diff --git a/data/images/ba_in_a_captivity_of_8-bit.png b/data/images/ba_in_a_captivity_of_8-bit.png
deleted file mode 100644
index 4d2158c..0000000
--- a/data/images/ba_in_a_captivity_of_8-bit.png
+++ /dev/null
diff --git a/data/images/bal3.nic.png b/data/images/bal3.nic.png
deleted file mode 100644
index 0690ffc..0000000
--- a/data/images/bal3.nic.png
+++ /dev/null
diff --git a/data/images/construction_site.png b/data/images/construction_site.png
deleted file mode 100644
index c6aecc3..0000000
--- a/data/images/construction_site.png
+++ /dev/null
diff --git a/data/images/for_a_good_night.png b/data/images/for_a_good_night.png
deleted file mode 100644
index da8e981..0000000
--- a/data/images/for_a_good_night.png
+++ /dev/null
diff --git a/data/images/l1.grow.png b/data/images/l1.grow.png
deleted file mode 100644
index 14a110e..0000000
--- a/data/images/l1.grow.png
+++ /dev/null
diff --git a/data/images/l1.hut.png b/data/images/l1.hut.png
deleted file mode 100644
index 7e42da6..0000000
--- a/data/images/l1.hut.png
+++ /dev/null
diff --git a/data/images/l1.peduncle.png b/data/images/l1.peduncle.png
deleted file mode 100644
index 258f34c..0000000
--- a/data/images/l1.peduncle.png
+++ /dev/null
diff --git a/data/images/l1.tree.png b/data/images/l1.tree.png
deleted file mode 100644
index 5e3995e..0000000
--- a/data/images/l1.tree.png
+++ /dev/null
diff --git a/data/images/l1.wood.png b/data/images/l1.wood.png
deleted file mode 100644
index ae1550a..0000000
--- a/data/images/l1.wood.png
+++ /dev/null
diff --git a/data/images/l2.barel.png b/data/images/l2.barel.png
deleted file mode 100644
index 8da54ef..0000000
--- a/data/images/l2.barel.png
+++ /dev/null
diff --git a/data/images/l2.nadrz.png b/data/images/l2.nadrz.png
deleted file mode 100644
index 4bc0a42..0000000
--- a/data/images/l2.nadrz.png
+++ /dev/null
diff --git a/data/images/l2.pitch.png b/data/images/l2.pitch.png
deleted file mode 100644
index 15150ba..0000000
--- a/data/images/l2.pitch.png
+++ /dev/null
diff --git a/data/images/l2.potrubi.png b/data/images/l2.potrubi.png
deleted file mode 100644
index 3afa5ff..0000000
--- a/data/images/l2.potrubi.png
+++ /dev/null
diff --git a/data/images/l2.retez.png b/data/images/l2.retez.png
deleted file mode 100644
index c97ea24..0000000
--- a/data/images/l2.retez.png
+++ /dev/null
diff --git a/data/images/l2.trubka2.png b/data/images/l2.trubka2.png
deleted file mode 100644
index f874ccc..0000000
--- a/data/images/l2.trubka2.png
+++ /dev/null
diff --git a/data/images/l2.trubka4.png b/data/images/l2.trubka4.png
deleted file mode 100644
index 7be65d2..0000000
--- a/data/images/l2.trubka4.png
+++ /dev/null
diff --git a/data/images/l2.trubka6.png b/data/images/l2.trubka6.png
deleted file mode 100644
index 29755ae..0000000
--- a/data/images/l2.trubka6.png
+++ /dev/null
diff --git a/data/images/l2.trubka8.png b/data/images/l2.trubka8.png
deleted file mode 100644
index 6026467..0000000
--- a/data/images/l2.trubka8.png
+++ /dev/null
diff --git a/data/images/l2.trubky.png b/data/images/l2.trubky.png
deleted file mode 100644
index 5d405ad..0000000
--- a/data/images/l2.trubky.png
+++ /dev/null
diff --git a/data/images/l3.ihlan.png b/data/images/l3.ihlan.png
deleted file mode 100644
index 20cb373..0000000
--- a/data/images/l3.ihlan.png
+++ /dev/null
diff --git a/data/images/l3.kvader1.png b/data/images/l3.kvader1.png
deleted file mode 100644
index 67973a9..0000000
--- a/data/images/l3.kvader1.png
+++ /dev/null
diff --git a/data/images/l3.kvader2.png b/data/images/l3.kvader2.png
deleted file mode 100644
index d0df146..0000000
--- a/data/images/l3.kvader2.png
+++ /dev/null
diff --git a/data/images/l3.nic.png b/data/images/l3.nic.png
deleted file mode 100644
index 3852007..0000000
--- a/data/images/l3.nic.png
+++ /dev/null
diff --git a/data/images/l3.teleport.png b/data/images/l3.teleport.png
deleted file mode 100644
index f901589..0000000
--- a/data/images/l3.teleport.png
+++ /dev/null
diff --git a/data/images/l4.anim.blikacka.png b/data/images/l4.anim.blikacka.png
deleted file mode 100644
index da353c6..0000000
--- a/data/images/l4.anim.blikacka.png
+++ /dev/null
diff --git a/data/images/l4.bagr.png b/data/images/l4.bagr.png
deleted file mode 100644
index a9f6a13..0000000
--- a/data/images/l4.bagr.png
+++ /dev/null
diff --git a/data/images/l4.overlay.png b/data/images/l4.overlay.png
deleted file mode 100644
index a8f8507..0000000
--- a/data/images/l4.overlay.png
+++ /dev/null
diff --git a/data/images/l4.palety.png b/data/images/l4.palety.png
deleted file mode 100644
index 3a3e797..0000000
--- a/data/images/l4.palety.png
+++ /dev/null
diff --git a/data/images/l4.pozadi.png b/data/images/l4.pozadi.png
deleted file mode 100644
index 9d9b214..0000000
--- a/data/images/l4.pozadi.png
+++ /dev/null
diff --git a/data/images/l4.pytle.png b/data/images/l4.pytle.png
deleted file mode 100644
index ea6a1f3..0000000
--- a/data/images/l4.pytle.png
+++ /dev/null
diff --git a/data/images/l4.tvarnice.png b/data/images/l4.tvarnice.png
deleted file mode 100644
index 0f2d99a..0000000
--- a/data/images/l4.tvarnice.png
+++ /dev/null
diff --git a/data/images/night_workshift.png b/data/images/night_workshift.png
deleted file mode 100644
index 08f4c42..0000000
--- a/data/images/night_workshift.png
+++ /dev/null
diff --git a/data/music/for_a_good_night.ogg b/data/music/for_a_good_night.ogg
deleted file mode 100644
index 3ce2996..0000000
--- a/data/music/for_a_good_night.ogg
+++ /dev/null
diff --git a/data/music/in_a_captivity_of_8-bit.ogg b/data/music/in_a_captivity_of_8-bit.ogg
deleted file mode 100644
index db8ee5c..0000000
--- a/data/music/in_a_captivity_of_8-bit.ogg
+++ /dev/null
diff --git a/data/music/night_workshift.ogg b/data/music/night_workshift.ogg
deleted file mode 100644
index c5ce5fc..0000000
--- a/data/music/night_workshift.ogg
+++ /dev/null
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 650c9a9..4504227 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@
 # LINKING ( for binary )
 ###############################################################################
 IF ( Server )
-	LINK_LIBRARIES ( ${CMAKE_DL_LIBS} )
+	LINK_LIBRARIES (  ${ZZIP_LIBRARY} ${CMAKE_DL_LIBS} )
 ELSE ( Server )
 	IF  ( NO_Audio )
 		LINK_LIBRARIES ( ${ZZIP_LIBRARY} ${SDL_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} )
diff --git a/src/audio/music.c b/src/audio/music.c
index f2ac6e1..f1c5cd8 100644
--- a/src/audio/music.c
+++ b/src/audio/music.c
@@ -50,13 +50,26 @@ static Mix_Music* loadMixMusic(char *file)
 {
 	Mix_Music *mixer;
 	char str[STR_PATH_SIZE];
+
 #ifdef DEBUG
 	printf(_("Loading music file: %s\n"), file);
 #endif
-	sprintf(str, PATH_MUSIC "%s", file);
+
+	if( isFillPath(file) )
+	{
+		strcpy(str, file);
+	}
+	else
+	{
+		sprintf(str, PATH_MUSIC "%s", file);
+	}
+
 	accessExistFile(str);
+
 	mixer = Mix_LoadMUS(str);
-	if( mixer == NULL )	{
+
+	if( mixer == NULL )
+	{
 		fprintf(stderr, _("Unable to load music from file: %s\n"), file);
 		return NULL;
 	}
diff --git a/src/base/arenaFile.c b/src/base/arenaFile.c
index 25e0582..6c50d34 100644
--- a/src/base/arenaFile.c
+++ b/src/base/arenaFile.c
@@ -61,6 +61,7 @@ int getArenaValue(char *line, char *env, char *val, int len)
 }
 
 
+#ifndef PUBLIC_SERVER
 image_t* loadImageFromArena(arenaFile_t *arenaFile, char *filename, char *group, char *name, int alpha)
 {
 	char *extractFile;
@@ -73,6 +74,18 @@ image_t* loadImageFromArena(arenaFile_t *arenaFile, char *filename, char *group,
 	return image;
 }
 
+#ifndef NO_SOUND
+void loadMusicFromArena(arenaFile_t *arenaFile, char *filename, char *group, char *name)
+{
+	char *extractFile;
+
+	extractFile = extractFileFromArchive(arenaFile->path, filename);
+	addMusic(extractFile, name, group);
+	deleteExtractFile(extractFile);
+}
+#endif
+#endif
+
 static void cmd_arena(arena_t **arena, char *line)
 {
 	char str_image[STR_SIZE];
@@ -121,13 +134,13 @@ static void cmd_loadImage(arenaFile_t *arenaFile, char *line)
 	if (getArenaValue(line, "alpha", str_alpha, STR_SIZE) != 0)
 		return;
 
-	printf("str_file=%s str_name=%s str_alpha=%s\n", str_file, str_name, str_alpha);
+	//printf("str_file=%s str_name=%s str_alpha=%s\n", str_file, str_name, str_alpha);
 	loadImageFromArena(arenaFile, str_file, IMAGE_GROUP_USER, str_name, isYesOrNO(str_alpha));
 
 	//addImageData(str_file, isYesOrNO(str_alpha), str_name, IMAGE_GROUP_USER);
 }
 
-static void cmd_loadMusic(char *line)
+static void cmd_loadMusic(arenaFile_t *arenaFile, char *line)
 {
 	char str_file[STR_SIZE];
 	char str_name[STR_SIZE];
@@ -137,7 +150,8 @@ static void cmd_loadMusic(char *line)
 	if (getArenaValue(line, "name", str_name, STR_SIZE) != 0)
 		return;
 #ifndef NO_SOUND
-	addMusic(str_file, str_name, MUSIC_GROUP_USER);
+	//addMusic(str_file, str_name, MUSIC_GROUP_USER);
+	loadMusicFromArena(arenaFile, str_file, MUSIC_GROUP_USER, str_name);
 #endif
 }
 
@@ -190,7 +204,7 @@ char *getArenaNetName(arenaFile_t *arenaFile)
 arenaFile_t* getArenaFileFormNetName(char *s)
 {
 	int i;
-
+// 
 	for (i = 0; i < listArenaFile->count; i++)
 	{
 		arenaFile_t *arenaFile;
@@ -213,6 +227,25 @@ arenaFile_t* getArenaFile(int n)
 	return (arenaFile_t *)listArenaFile->list[n];
 }
 
+int getArenaFileID(arenaFile_t *arenaFile)
+{
+	int i;
+
+	for (i = 0; i < listArenaFile->count; i++)
+	{
+		arenaFile_t *this;
+
+		this = (arenaFile_t *)listArenaFile->list[i];
+		
+		if( this == arenaFile)
+		{
+			return i;
+		}
+	}
+
+	return -1;
+}
+
 arena_t* getArena(arenaFile_t *arenaFile)
 {
 	textFile_t *ts;
@@ -230,7 +263,7 @@ arena_t* getArena(arenaFile_t *arenaFile)
 		if (strncmp(line, "loadImage", 9) == 0)
 			cmd_loadImage(arenaFile, line);
 		if (strncmp(line, "loadMusic", 9) == 0)
-			cmd_loadMusic(line);
+			cmd_loadMusic(arenaFile, line);
 		if (strncmp(line, "playMusic", 9) == 0)
 			cmd_playMusic(arena, line);
 #endif
@@ -254,7 +287,7 @@ arenaFile_t* newArenaFile(char *path)
 	new = malloc( sizeof(arenaFile_t) );
 	new->path = strdup(path);
 
-	extractFile = extractFileFromArchive(path, "mapa.map");
+	extractFile = extractFileFromArchive(path, "arena.map");
 	new->map = loadTextFile(extractFile);
 	deleteExtractFile(extractFile);
 
@@ -283,6 +316,7 @@ void initArenaFile()
 		char *line;
 	
 		line = (char *)( p->list->list[i] );
+
 		if (strstr(line, ".zip") != NULL &&
 			strstr(line, "~") == NULL) {
 			char path[STR_PATH_SIZE];
diff --git a/src/base/arenaFile.h b/src/base/arenaFile.h
index b4ca92b..4f1cdc5 100644
--- a/src/base/arenaFile.h
+++ b/src/base/arenaFile.h
@@ -21,8 +21,11 @@ extern char *getArenaName(arenaFile_t *arenaFile);
 extern char *getArenaNetName(arenaFile_t *arenaFile);
 extern arenaFile_t* getArenaFileFormNetName(char *s);
 extern char *getArenaImage(arenaFile_t *arenaFile);
+#ifndef PUBLIC_SERVER
 extern image_t* loadImageFromArena(arenaFile_t *arenaFile, char *filename, char *group, char *name, int alpha);
+#endif
 extern arenaFile_t* getArenaFile(int n);
+extern int getArenaFileID(arenaFile_t *arenaFile);
 extern arena_t* getArena(arenaFile_t *arenaFile);
 extern arenaFile_t* newArenaFile(char *path);
 extern void initArenaFile();
diff --git a/src/base/main.c b/src/base/main.c
index 62f433a..18ff5f3 100644
--- a/src/base/main.c
+++ b/src/base/main.c
@@ -112,6 +112,22 @@ int tryExistFile (const char *s)
 		return 0;
 }
 
+int isFillPath(const char *path)
+{
+	assert( path != NULL);
+
+#ifndef __WIN32__
+	if( path[0] == '/' ) // for Unix-like systems ;)
+#else
+	if( path[1] == ':' ) // for Windows-like systems ;)
+#endif
+	{
+		return 1;
+	}
+	
+	return 0;
+}
+
 #ifdef __WIN32__
 int WINAPI WinMain(
     HINSTANCE hInstance,
diff --git a/src/base/main.h b/src/base/main.h
index b50e56c..3555550 100644
--- a/src/base/main.h
+++ b/src/base/main.h
@@ -22,6 +22,7 @@
 	extern bool_t isParamFlag(char *s);
 	extern char *getString(int n);
 	extern int* newInt(int x);
+	extern int isFillPath(const char *path);
 	extern void accessExistFile(const char *s);
 	extern int tryExistFile (const char *s);
 #endif
diff --git a/src/base/proto.c b/src/base/proto.c
index 9c9163e..5097146 100644
--- a/src/base/proto.c
+++ b/src/base/proto.c
@@ -228,8 +228,7 @@ void proto_send_status_server(int type, client_t *client)
 	clients = getCurrentArena()->spaceTux->listIndex->count;
 	maxclients = getServerMaxClients();
 	uptime = (unsigned int)getUpdateServer();
-	//arena = getArenaNetName( getChoiceArenaId() );
-	//TODO
+	arena = getArenaNetName( getChoiceArena() );
 
 	snprintf(msg, STR_PROTO_SIZE,
 		"name: %s\n"
@@ -347,12 +346,10 @@ void proto_send_init_server(int type, client_t *client, client_t *client2)
 #endif
 
 	check_id = getNewIDcount(0);
-/*	
+	
 	snprintf(msg, STR_PROTO_SIZE, "init %d %d %d %d %s %d\n",
 		client2->tux->id, client2->tux->x, client2->tux->y,
-		count, getArenaNetName( getChoiceArenaId() ), check_id);
-*/
-	//TODO
+		count, getArenaNetName( getChoiceArena() ), check_id);
 	
 	//proto_send(type, client, msg);
 	protoSendClient(type, client, msg, CHECK_FRONT_TYPE_CHECK, check_id);
@@ -388,10 +385,9 @@ void proto_recv_init_client(char *msg)
 		return;
 	}
 
-	//setWorldArena( getArenaIdFormNetName(arena_name) );
-	//TODO
-	arena = getCurrentArena();
+	setWorldArena( getArenaFileFormNetName(arena_name) );
 
+	arena = getCurrentArena();
 	arena->max_countRound = n;
 
 	tux = newTux();
diff --git a/src/base/textFile.c b/src/base/textFile.c
index b7668ef..48e5044 100755
--- a/src/base/textFile.c
+++ b/src/base/textFile.c
@@ -14,11 +14,8 @@ textFile_t* newTextFile(char *s)
 	textFile_t *new;
 	char path[STR_PATH_SIZE];
 	assert( s != NULL );
-#ifndef __WIN32__
-	if( s[0] == '/' )
-#else
-	if( s[1] == ':' )
-#endif
+
+	if( isFillPath(s) )
 	{
 		strcpy(path, s);
 	}
@@ -28,6 +25,7 @@ textFile_t* newTextFile(char *s)
 		strcat(path, "/");
 		strcat(path, s);
 	}
+
 	new = malloc(sizeof(textFile_t));
 	new->file = strdup(path);
 	new->text = newList();
diff --git a/src/client/image.c b/src/client/image.c
index 86f80af..4c4010c 100755
--- a/src/client/image.c
+++ b/src/client/image.c
@@ -40,13 +40,13 @@ static SDL_Surface *loadImage(const char *filename, int alpha)
 	char str[STR_PATH_SIZE];
 
 
-	if( filename[0] != '/' )
+	if( isFillPath(filename) )
 	{
-		sprintf(str, PATH_IMAGE "%s", filename);
+		strcpy(str, filename);
 	}
 	else
 	{
-		strcpy(str, filename);
+		sprintf(str, PATH_IMAGE "%s", filename);
 	}
 
 	accessExistFile(str);
diff --git a/src/client/saveLoad.c b/src/client/saveLoad.c
index 15ad143..be7933b 100644
--- a/src/client/saveLoad.c
+++ b/src/client/saveLoad.c
@@ -59,13 +59,11 @@ static void action_saveItem(space_t *space, item_t *item, textFile_t *textFile)
 static void saveContextArenaToTextFile(textFile_t *textFile, arena_t *arena)
 {
 	char str[STR_PROTO_SIZE];
-/*
+
 	sprintf(str, "ARENA %s %d %d",
-		getArenaNetName(getChoiceArenaId()),
+		getArenaNetName(getChoiceArena()),
 		arena->countRound,
 		arena->max_countRound);
-*/
-	//TODO
 
 	addList(textFile->text, strdup(str));
 
@@ -107,8 +105,7 @@ static arena_t* loadArenaFromLine(char *line)
 
 	sscanf(line, "%s %s %d %d", cmd, name, &countRound, &max_countRound);
 
-	//setWorldArena( getArenaIdFormNetName(name) );
-	//TODO
+	setWorldArena( getArenaFileFormNetName(name) );
 
 	arena = getCurrentArena();
 	arena->max_countRound = max_countRound;
diff --git a/src/screen/screen_choiceArena.c b/src/screen/screen_choiceArena.c
index ca14c0c..b12b8ec 100644
--- a/src/screen/screen_choiceArena.c
+++ b/src/screen/screen_choiceArena.c
@@ -99,23 +99,20 @@ static void eventWidgetButtonImage(void *p)
 	}
 }
 
-arenaFile_t* getChoiceArenaId()
+arenaFile_t* getChoiceArena()
 {
 	return currentArena;
 }
 
-void setChoiceArenaId(int n)
+void setChoiceArena(arenaFile_t *arenaFile)
 {
 	widget_t *widget_buttonimage;
+	int id;
 
-	if( n < 0 )
-	{
-		return;
-	}
-
-	currentArena = getArenaFile(n);
+	id = getArenaFileID(arenaFile);
+	currentArena = arenaFile;
 
-	widget_buttonimage = (widget_t *)listWidgetButtonimage->list[n];
+	widget_buttonimage = (widget_t *)listWidgetButtonimage->list[id];
 	setWidgetButtonimageActive(widget_buttonimage, TRUE);
 }
 
diff --git a/src/screen/screen_choiceArena.h b/src/screen/screen_choiceArena.h
index 1e38ee8..8ff3a0c 100644
--- a/src/screen/screen_choiceArena.h
+++ b/src/screen/screen_choiceArena.h
@@ -11,8 +11,8 @@
 
 extern void drawScreenChoiceArena();
 extern void eventScreenChoiceArena();
-extern arenaFile_t* getChoiceArenaId();
-extern void setChoiceArenaId(int n);
+extern arenaFile_t* getChoiceArena();
+extern void setChoiceArena(arenaFile_t *arenaFile);
 extern void initScreenChoiceArena();
 extern void quitScreenChoiceArena();
 
diff --git a/src/screen/screen_setting.c b/src/screen/screen_setting.c
index 229d34d..c79acaf 100644
--- a/src/screen/screen_setting.c
+++ b/src/screen/screen_setting.c
@@ -281,8 +281,7 @@ static void initSettingFile()
 #endif
 
 	loadValueFromConfigFile(configFile, "ARENA", val, STR_SIZE, "FAGN");
-	//setChoiceArenaId( getArenaIdFormNetName(val) );
-	//TODO
+	setChoiceArena( getArenaFileFormNetName(val) );
 
 	saveTextFile(configFile);
 }
@@ -321,7 +320,7 @@ static void saveAndDestroyConfigFile()
 	setValueInConfigFile(configFile, "SOUND", getYesOrNo(getWidgetCheckStatus(check_sound)));
 #endif
 
-	//setValueInConfigFile(configFile, "ARENA", getArenaNetName(getChoiceArenaId()));
+	setValueInConfigFile(configFile, "ARENA", getArenaNetName(getChoiceArena()));
 	//TODO
 
 	saveTextFile(configFile);
diff --git a/src/screen/screen_world.c b/src/screen/screen_world.c
index d6febf7..36ccddb 100644
--- a/src/screen/screen_world.c
+++ b/src/screen/screen_world.c
@@ -134,7 +134,7 @@ void prepareArena()
 	switch( getNetTypeGame() )
 	{
 		case NET_GAME_TYPE_NONE :
-			setWorldArena( getChoiceArenaId() );
+			setWorldArena( getChoiceArena() );
 			addNewItem(arena->spaceItem, ID_UNKNOWN);
 			getSettingCountRound(&arena->max_countRound);
 
@@ -165,7 +165,7 @@ void prepareArena()
 		break;
 
 		case NET_GAME_TYPE_SERVER :
-			setWorldArena( getChoiceArenaId() );
+			setWorldArena( getChoiceArena() );
 			addNewItem(arena->spaceItem, ID_UNKNOWN);
 			getSettingCountRound(&arena->max_countRound);
 
diff --git a/src/server/publicServer.c b/src/server/publicServer.c
index 27fcead..8770300 100644
--- a/src/server/publicServer.c
+++ b/src/server/publicServer.c
@@ -39,9 +39,9 @@
 
 #include "dns.h"
 
-static int arenaId;
 static arena_t *arena;
 static bool_t isSignalEnd;
+static arenaFile_t *choice_arenaFile;
 
 extern int errno;
 
@@ -227,6 +227,13 @@ static int initPublicServerNetwork()
 	return ret;
 }
 
+static void loadArena()
+{
+	choice_arenaFile = getArenaFileFormNetName( getSetting("ARENA", "--arena", "FAGN") );
+	arena = getArena(choice_arenaFile);
+	setCurrentArena(arena);
+}
+
 int initPublicServer()
 {
 	int ret;
@@ -250,9 +257,7 @@ int initPublicServer()
 
 	initHeightScore( getSetting("SCORE_FILE", "--score-file", "/tmp/heightscore") );
 
-	arenaId = getArenaIdFormNetName( getSetting("ARENA", "--arena", "FAGN") );
-	arena = getArena(arenaId);
-	setCurrentArena(arena);
+	loadArena();
 
 	for( i = 0 ; i < atoi(getSetting("ITEM", "--item", "10")) ; i++ )
 	{
@@ -279,9 +284,9 @@ int initPublicServer()
 	return 0;
 }
 
-int getChoiceArenaId()
+arenaFile_t* getChoiceArena()
 {
-	return arenaId;
+	return choice_arenaFile;
 }
 
 void eventPublicServer()
diff --git a/src/server/publicServer.h b/src/server/publicServer.h
index c8ab7f4..f6aa29c 100644
--- a/src/server/publicServer.h
+++ b/src/server/publicServer.h
@@ -4,13 +4,14 @@
 #define PUBLIC_SERVER_H
 
 #include "arena.h"
+#include "arenaFile.h"
 
 #define WORLD_COUNT_ROUND_UNLIMITED	-1
 
 extern char *getSetting(char *env, char *param, char *default_val);
 extern void countRoundInc();
 extern int initPublicServer();
-extern int getChoiceArenaId();
+extern arenaFile_t* getChoiceArena();
 extern void eventPublicServer();
 extern void my_handler_quit(int n);
 extern void quitPublicServer();