Merge branch 'master' of [email protected]:Wohlhabend-Networks/PlatGEnWo…

…hl.git
WohlSoft · Oct 4, 2014 · 2881f6d · 2881f6d
2 parents 3439b19 + 1ff7188
commit 2881f6d
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 5 deletions.
diff --git a/Content/configs/SMBX/lvl_npc.ini b/Content/configs/SMBX/lvl_npc.ini
@@ -10499,6 +10499,7 @@ frame-style=0
 frames=1
 frame-speed=128
 foreground=0
+background=1
 custom-animation=0
 speed=0
 container=0
@@ -13824,6 +13825,7 @@ frame-style=1
 frames=2
 frame-speed=128
 foreground=0
+background=1
 custom-animation=1
 custom-animation-alg=0
 custom-animation-fl=0

diff --git a/Content/help/screenshots/Customizing/level_items_layers.png b/Content/help/screenshots/Customizing/level_items_layers.png
diff --git a/Content/help/tools/console_tools_gifs2png.html b/Content/help/tools/console_tools_gifs2png.html
@@ -87,7 +87,7 @@ <h3 style="text-align: left">
 <h3 style="text-align: left"><strong>
 <a name="Usage_of_GIFs2PNG_converter_with_GUI">Usage of GIFs2PNG converter with GUI</a></strong></h3>
 <p style="text-align: left">The Editor have a GUI shell for set properties to 
-the lazyFix tool.</p>
+the GIFs2PNG.</p>
 <p style="text-align: left">For open them, try the menu item: "<span style="text-decoration: underline">Tools</span> 
 -&gt; <span style="text-decoration: underline">External tools</span> -&gt;
 <span style="text-decoration: underline">Convert GIF with mask to PNG (GIFs2PNG)</span>"</p>

diff --git a/Content/help/tools/console_tools_png2gifs.html b/Content/help/tools/console_tools_png2gifs.html
@@ -84,7 +84,7 @@ <h3 style="text-align: left">
 <h3 style="text-align: left"><strong>
 <a name="Usage_of_PNG2GIFs_converter_with_GUI">Usage of PNG2GIFs converter with GUI</a></strong></h3>
 <p style="text-align: left">The Editor have a GUI shell for set properties to 
-the lazyFix tool.</p>
+the PNG2GIFs.</p>
 <p style="text-align: left">For open them, try the menu item: "<span style="text-decoration: underline">Tools</span> 
 -&gt; <span style="text-decoration: underline">External tools</span> -&gt;
 <span style="text-decoration: underline">Convert PNG into the masked GIFs (PNG2GIFs)</span>"</p>

diff --git a/Editor/level_scene/lvlscene.cpp b/Editor/level_scene/lvlscene.cpp
@@ -84,8 +84,8 @@ LvlScene::LvlScene(dataconfigs &configs, LevelData &FileData, QObject *parent) :
     //Background-1
     Z_BGOBack1 = -100; // backround BGO
 
+    Z_npcBack = -10; // background NPC
     Z_Block = 1; // standart block
-    Z_npcBack = 20; // background NPC
     Z_npcStd = 30; // standart NPC
     Z_Player = 35; //player Point
 

diff --git a/Editor/level_scene/lvlscene.h b/Editor/level_scene/lvlscene.h
@@ -197,8 +197,8 @@ class LvlScene : public QGraphicsScene
     int Z_BGOBack2; // backround BGO
     int Z_blockSizable; // sizeble block
     int Z_BGOBack1; // backround BGO
-    int Z_Block; // standart block
     int Z_npcBack; // background NPC (vines)
+    int Z_Block; // standart block
     int Z_npcStd; // standart NPC
     int Z_Player; //playerPointZ
     int Z_BGOFore1; // foreground BGO

diff --git a/Editor/world_scene/wld_usergfx.cpp b/Editor/world_scene/wld_usergfx.cpp
@@ -287,7 +287,7 @@ void WldScene::loadUserData(QProgressDialog &progress)
             QString CustomImg = uWLD.getCustomFile(pConfigs->main_wpaths[i].image_n);
             if( !CustomImg.isEmpty() )
             {
-                QString CustomMask = uWLD.getCustomFile(pConfigs->main_wpaths[i].image_n);
+                QString CustomMask = uWLD.getCustomFile(pConfigs->main_wpaths[i].mask_n);
                 if(!CustomMask.isEmpty())
                     uPath.mask = GraphicsHelps::loadPixmap( CustomMask );
                 else

diff --git a/_Misc/source_images/Help/customizing/level_items_layers.pdn b/_Misc/source_images/Help/customizing/level_items_layers.pdn