From be2905f66b60173c4ccc3cfb7993c636978e51af Mon Sep 17 00:00:00 2001 From: Rob Pearce Date: Thu, 6 Nov 2008 02:21:49 +0000 Subject: [PATCH] Simplified isplacablesprite() in edit.c Changed background of tile palette in editor --- data/newtiles/blank.bmp | Bin 822 -> 822 bytes edit.c | 70 +++------------------------------------- 2 files changed, 5 insertions(+), 65 deletions(-) diff --git a/data/newtiles/blank.bmp b/data/newtiles/blank.bmp index 25506bae21f3bd74ea0baa79d38a6a5ef27c1d5f..a2970f3a1cde45721ae785e7f3629d57ad2f8f4d 100644 GIT binary patch literal 822 ucmZ?rHDhJ~12Z700mK4O%*Y@C7H0s;AK`;whyVkFy}j=!8V!LF8v+1T^UenV literal 822 scmZ?rHDhJ~12Z700mK4O%*Y@C7H0s;AK`;whyVk_|4}p=0wXvC0D+VO761SM diff --git a/edit.c b/edit.c index 75e7934..900a072 100644 --- a/edit.c +++ b/edit.c @@ -1019,72 +1019,12 @@ int isplacabletile(int tid) { } int isplacablesprite(int sid) { - switch (sid) { - case P_SPEED: - case P_NUMNETS: - case P_BIGNET: - case P_BLACKCLOUD: - case P_PINKCLOUD: - case P_SPIT: - case P_PUFF: - case P_SMASH: - case P_BOXING: - case P_GLOVE: - case P_DIAMOND: - case P_FTODIAMOND: - case P_FTOGEM: - case P_BOMB: - case P_SHIELD: - case P_MACEPOWERUP: - case P_MACE: - case P_GEMRED: - case P_GEMYELLOW: - case P_GEMPURPLE: - case P_SPRAY: - case P_CANNONPOWERUP: - case P_CANNON: - case P_TROPHY: - case P_SNOWMAN: - case P_RINGSILVER: - case P_RINGGOLD: - case P_CLOCK: - case P_BELL: - case P_ARMOUR: - case P_GEMBOOST: - case P_HELMET: - case P_PHONE: - case P_BUBBLE: - case P_HONEY: - case P_STARPOWERUP: - case P_STAR: - case P_UFO: - case P_METEOR: - case P_LIFE: - case P_BIGSPEED: - case P_BIGNUMNETS: - case P_MOVINGCARD: - case P_FIVECARDS: - case P_MASKPOWERUP: - case P_MASK: - case P_TAP: - case P_CLOVER: - case P_SKULL: - case P_WINGLEFT: - case P_WINGRIGHT: - case P_WINGBOOTS: - case P_ACCORDION: - case P_GUN: - case P_ZAPPOWERUP: - return B_FALSE; - } + if (sid == P_HELP) return B_TRUE; + if (sid == P_POWERUPPOS) return B_TRUE; + if (ismonster(sid) && (sid != P_BLACKCLOUD)) return B_TRUE; + if (isfruit(sid) == FT_GEM) return B_TRUE; - if (iseffect(sid) && (sid != P_POWERUPPOS)) { - return B_FALSE; - } - if (iscard(sid)) { - return B_FALSE; - } - return B_TRUE; + return B_FALSE; } // like drawtile but adjusts transparncy based on current layer