[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] rev 2252 - in trunk: data/data data/images data/images/grou
From: |
address@hidden |
Subject: |
[Pingus-CVS] rev 2252 - in trunk: data/data data/images data/images/groundpieces/ground/jungle data/levels/playable src |
Date: |
Sun, 11 Apr 2004 15:55:56 +0200 |
Author: torangan
Date: 2004-04-11 15:55:55 +0200 (Sun, 11 Apr 2004)
New Revision: 2252
Added:
trunk/data/images/groundpieces/ground/jungle/stone1.png
trunk/data/images/groundpieces/ground/jungle/stone2.png
trunk/data/images/groundpieces/ground/jungle/stone3.png
trunk/data/images/groundpieces/ground/jungle/stone4.png
trunk/data/images/groundpieces/ground/jungle/stone5.png
Modified:
trunk/data/data/groundpieces-ground.xml
trunk/data/images/Makefile.am
trunk/data/levels/playable/jungle-13-rz+eriksoe.pingus
trunk/src/pingus_main.cxx
Log:
updates
Modified: trunk/data/data/groundpieces-ground.xml
===================================================================
--- trunk/data/data/groundpieces-ground.xml 2004-04-11 13:51:56 UTC (rev
2251)
+++ trunk/data/data/groundpieces-ground.xml 2004-04-11 13:55:55 UTC (rev
2252)
@@ -370,6 +370,26 @@
<image file="images/groundpieces/ground/jungle/stick5.png"/>
</sprite>
+ <sprite name="stone1">
+ <image file="images/groundpieces/ground/jungle/stone1.png"/>
+ </sprite>
+
+ <sprite name="stone2">
+ <image file="images/groundpieces/ground/jungle/stone2.png"/>
+ </sprite>
+
+ <sprite name="stone3">
+ <image file="images/groundpieces/ground/jungle/stone3.png"/>
+ </sprite>
+
+ <sprite name="stone4">
+ <image file="images/groundpieces/ground/jungle/stone4.png"/>
+ </sprite>
+
+ <sprite name="stone5">
+ <image file="images/groundpieces/ground/jungle/stone5.png"/>
+ </sprite>
+
<sprite name="twist">
<image file="images/groundpieces/ground/jungle/twist.png"/>
</sprite>
Modified: trunk/data/images/Makefile.am
===================================================================
--- trunk/data/images/Makefile.am 2004-04-11 13:51:56 UTC (rev 2251)
+++ trunk/data/images/Makefile.am 2004-04-11 13:55:55 UTC (rev 2252)
@@ -264,6 +264,11 @@
groundpieces/ground/jungle/stick3.png \
groundpieces/ground/jungle/stick4.png \
groundpieces/ground/jungle/stick5.png \
+groundpieces/ground/jungle/stone1.png \
+groundpieces/ground/jungle/stone2.png \
+groundpieces/ground/jungle/stone3.png \
+groundpieces/ground/jungle/stone4.png \
+groundpieces/ground/jungle/stone5.png \
groundpieces/ground/jungle/twist.png \
groundpieces/ground/jungle/twistsmooth.png \
groundpieces/ground/misc/bpiece1.png \
Added: trunk/data/images/groundpieces/ground/jungle/stone1.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/groundpieces/ground/jungle/stone1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/groundpieces/ground/jungle/stone2.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/groundpieces/ground/jungle/stone2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/groundpieces/ground/jungle/stone3.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/groundpieces/ground/jungle/stone3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/groundpieces/ground/jungle/stone4.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/groundpieces/ground/jungle/stone4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/images/groundpieces/ground/jungle/stone5.png
===================================================================
(Binary files differ)
Property changes on: trunk/data/images/groundpieces/ground/jungle/stone5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/levels/playable/jungle-13-rz+eriksoe.pingus
===================================================================
--- trunk/data/levels/playable/jungle-13-rz+eriksoe.pingus 2004-04-11
13:51:56 UTC (rev 2251)
+++ trunk/data/levels/playable/jungle-13-rz+eriksoe.pingus 2004-04-11
13:55:55 UTC (rev 2252)
@@ -9,7 +9,7 @@
<number-of-pingus>3</number-of-pingus>
<number-to-save>3</number-to-save>
<time>4500</time>
- <width>1450</width>
+ <width>1490</width>
<height>760</height>
<difficulty>95</difficulty>
<playable>1</playable>
@@ -26,42 +26,30 @@
<miner count="1"/>
</action-list>
-<background type="surface">
+<worldobj type="groundpiece">
+ <type>ground</type>
<surface><resource type="datafile">
- <resource-datafile>textures</resource-datafile>
- <resource-ident>textures/darkjungle</resource-ident>
+ <resource-datafile>groundpieces-ground</resource-datafile>
+ <resource-ident>jungle/stone2</resource-ident>
<modifier>ROT0</modifier>
</resource></surface>
- <color>
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- <alpha>0.3</alpha>
- </color>
- <scroll-x>0</scroll-x>
- <scroll-y>0</scroll-y>
- <para-x>0.5</para-x>
- <para-y>0.5</para-y>
- <stretch-x>0</stretch-x>
- <stretch-y>0</stretch-y>
- <keep-aspect>0</keep-aspect>
<position>
- <x-pos>32</x-pos>
- <y-pos>0</y-pos>
- <z-pos>-150</z-pos>
+ <x-pos>843</x-pos>
+ <y-pos>200</y-pos>
+ <z-pos>0</z-pos>
</position>
-</background>
+</worldobj>
<worldobj type="groundpiece">
<type>ground</type>
<surface><resource type="datafile">
<resource-datafile>groundpieces-ground</resource-datafile>
- <resource-ident>misc/stoneblock6</resource-ident>
+ <resource-ident>jungle/stone1</resource-ident>
<modifier>ROT0</modifier>
</resource></surface>
<position>
- <x-pos>850</x-pos>
- <y-pos>97</y-pos>
+ <x-pos>843</x-pos>
+ <y-pos>136</y-pos>
<z-pos>0</z-pos>
</position>
</worldobj>
@@ -70,29 +58,41 @@
<type>ground</type>
<surface><resource type="datafile">
<resource-datafile>groundpieces-ground</resource-datafile>
- <resource-ident>misc/stoneblock5</resource-ident>
+ <resource-ident>jungle/stone4</resource-ident>
<modifier>ROT0</modifier>
</resource></surface>
<position>
- <x-pos>850</x-pos>
- <y-pos>161</y-pos>
+ <x-pos>843</x-pos>
+ <y-pos>73</y-pos>
<z-pos>0</z-pos>
</position>
</worldobj>
-<worldobj type="groundpiece">
- <type>ground</type>
+<background type="surface">
<surface><resource type="datafile">
- <resource-datafile>groundpieces-ground</resource-datafile>
- <resource-ident>misc/stoneblock3</resource-ident>
+ <resource-datafile>textures</resource-datafile>
+ <resource-ident>textures/darkjungle</resource-ident>
<modifier>ROT0</modifier>
</resource></surface>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ <alpha>0.3</alpha>
+ </color>
+ <scroll-x>0</scroll-x>
+ <scroll-y>0</scroll-y>
+ <para-x>0.5</para-x>
+ <para-y>0.5</para-y>
+ <stretch-x>0</stretch-x>
+ <stretch-y>0</stretch-y>
+ <keep-aspect>0</keep-aspect>
<position>
- <x-pos>850</x-pos>
- <y-pos>225</y-pos>
- <z-pos>0</z-pos>
+ <x-pos>32</x-pos>
+ <y-pos>0</y-pos>
+ <z-pos>-150</z-pos>
</position>
-</worldobj>
+</background>
<worldobj type="groundpiece">
<type>ground</type>
@@ -116,7 +116,7 @@
<modifier>ROT0</modifier>
</resource></surface>
<position>
- <x-pos>936</x-pos>
+ <x-pos>929</x-pos>
<y-pos>90</y-pos>
<z-pos>0</z-pos>
</position>
@@ -136,6 +136,20 @@
</position>
</worldobj>
+<worldobj type="groundpiece">
+ <type>ground</type>
+ <surface><resource type="datafile">
+ <resource-datafile>groundpieces-ground</resource-datafile>
+ <resource-ident>jungle/stone4</resource-ident>
+ <modifier>ROT0</modifier>
+ </resource></surface>
+ <position>
+ <x-pos>843</x-pos>
+ <y-pos>264</y-pos>
+ <z-pos>0</z-pos>
+ </position>
+</worldobj>
+
<entrance>
<position>
<x-pos>334</x-pos>
@@ -226,8 +240,8 @@
<modifier>ROT0</modifier>
</resource></surface>
<position>
- <x-pos>877</x-pos>
- <y-pos>81</y-pos>
+ <x-pos>862</x-pos>
+ <y-pos>75</y-pos>
<z-pos>0</z-pos>
</position>
</worldobj>
Modified: trunk/src/pingus_main.cxx
===================================================================
--- trunk/src/pingus_main.cxx 2004-04-11 13:51:56 UTC (rev 2251)
+++ trunk/src/pingus_main.cxx 2004-04-11 13:55:55 UTC (rev 2252)
@@ -884,12 +884,12 @@
try
{
+ init_path_finder();
+
quick_check_args(argc, argv);
read_rc_file();
check_args(argc, argv);
- init_path_finder();
-
print_greeting_message();
init_clanlib();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] rev 2252 - in trunk: data/data data/images data/images/groundpieces/ground/jungle data/levels/playable src,
address@hidden <=