slight map generation bugs
parent
3fe377be4e
commit
a5c62045ed
|
@ -45,6 +45,11 @@ cp -r data/tree_top.png $PACKAGEPATH/data/
|
||||||
cp -r data/mud_with_grass.png $PACKAGEPATH/data/
|
cp -r data/mud_with_grass.png $PACKAGEPATH/data/
|
||||||
cp -r data/coalstone.png $PACKAGEPATH/data/
|
cp -r data/coalstone.png $PACKAGEPATH/data/
|
||||||
cp -r data/crack.png $PACKAGEPATH/data/
|
cp -r data/crack.png $PACKAGEPATH/data/
|
||||||
|
cp -r data/wood.png $PACKAGEPATH/data/
|
||||||
|
cp -r data/stick.png $PACKAGEPATH/data/
|
||||||
|
cp -r data/tool_wpick.png $PACKAGEPATH/data/
|
||||||
|
cp -r data/tool_stpick.png $PACKAGEPATH/data/
|
||||||
|
cp -r data/tool_mesepick.png $PACKAGEPATH/data/
|
||||||
|
|
||||||
#cp -r data/pauseMenu.gui $PACKAGEPATH/data/
|
#cp -r data/pauseMenu.gui $PACKAGEPATH/data/
|
||||||
|
|
||||||
|
|
|
@ -2353,7 +2353,7 @@ int main(int argc, char *argv[])
|
||||||
i != chat_lines.end(); i++)
|
i != chat_lines.end(); i++)
|
||||||
{
|
{
|
||||||
(*i).age += dtime;
|
(*i).age += dtime;
|
||||||
if((*i).age > 30.0)
|
if((*i).age > 60.0)
|
||||||
{
|
{
|
||||||
to_be_removed_count++;
|
to_be_removed_count++;
|
||||||
continue;
|
continue;
|
||||||
|
|
|
@ -155,12 +155,16 @@ inline bool content_buildable_to(u8 m)
|
||||||
*/
|
*/
|
||||||
inline bool is_ground_content(u8 m)
|
inline bool is_ground_content(u8 m)
|
||||||
{
|
{
|
||||||
return (m != CONTENT_WATER
|
return (
|
||||||
|
m != CONTENT_IGNORE
|
||||||
|
&& m != CONTENT_AIR
|
||||||
|
&& m != CONTENT_WATER
|
||||||
&& m != CONTENT_TORCH
|
&& m != CONTENT_TORCH
|
||||||
&& m != CONTENT_TREE
|
&& m != CONTENT_TREE
|
||||||
&& m != CONTENT_LEAVES
|
&& m != CONTENT_LEAVES
|
||||||
&& m != CONTENT_OCEAN
|
&& m != CONTENT_OCEAN
|
||||||
&& m != CONTENT_CLOUD);
|
&& m != CONTENT_CLOUD
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline bool is_mineral(u8 c)
|
inline bool is_mineral(u8 c)
|
||||||
|
|
Loading…
Reference in New Issue