Merge pull request #346 from icosahedral-dragon/fix-cursor-and-damage-crashes

Fix cursor and damage crashes

Author: Interrupt

src/GameSrc/citres.c

@@ -75,7 +75,6 @@ errtype master_load_bitmap_from_res(grs_bitmap *bmp, Id id_num, int i, LGRect *a
         return (ERR_FREAD);
     }
 
-    const size_t size = f->bm.w * f->bm.h;
     if (p == NULL) {
 	// Caller wants us to allocate a framebuffer.
         p = malloc(f->bm.w * f->bm.h);
@@ -91,8 +90,13 @@ errtype master_load_bitmap_from_res(grs_bitmap *bmp, Id id_num, int i, LGRect *a
 
     // Copy the bits.
     memcount += f->bm.w * f->bm.h; // FIXME is this needed any more?
-    memcpy(p, f->bm.bits, f->bm.w * f->bm.h);
-
+    if (f->bm.type == BMT_RSD8) {
+	gr_rsd8_convert(&f->bm, bmp);
+	// gr_rsd8_convert uses its own buffer, so copy it back.
+	memcpy(p, bmp->bits, f->bm.w * f->bm.h);
+    } else {
+	memcpy(p, f->bm.bits, f->bm.w * f->bm.h);
+    }
     bmp->bits = p;
 
     return (OK);

src/GameSrc/damage.c

@@ -951,10 +951,15 @@ int compute_damage(ObjID target, int damage_type, int damage_mod, ubyte offense,
                 *effect = effect_matrix[NON_CRITTER_EFFECT][attack_effect_type][0];
         } else if (effect != NULL)
             *effect = 0;
-    } else {
+    } else if (attack_effect_type != SPECIAL_TYPE) {
         // we didn't affect - so do the no effect one!
         if (effect)
             *effect = (!global_fullmap->cyber) ? effect_matrix[NON_CRITTER_EFFECT][attack_effect_type][0] : 0;
+    } else {
+	// Special damage type with no damage = no effect.
+	if (effect) {
+	    *effect = 0;
+	}
     }
 
     return (damage);

src/GameSrc/grenades.c

@@ -59,7 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //  Internal Prototypes
 //----------------
 void convert_grenade_to_explosion(ExplosionData *edata, int triple);
-ubyte grenade_compute_damage(ObjID target, int wpn_triple, int power_level, ubyte *effect);
 ObjID explosion_ray_cast_attack(ObjID gren_id, ObjID target, ObjLoc *gren_loc, fix radius, fix mass, fix speed);
 void do_object_explosion(ObjID id);
 uchar activate_grenade_on_cursor(void);
@@ -102,22 +101,6 @@ void convert_grenade_to_explosion(ExplosionData *edata, int triple) {
     edata->penet = GrenadeProps[ctrip].penetration;
 }
 
-// ----------------------------------------------------------------------
-// grenade_compute_damage()
-//
-
-ubyte grenade_compute_damage(ObjID target, int wpn_triple, int power_level, ubyte *effect) {
-    ubyte effect_class =
-        (objs[target].obclass == CLASS_CRITTER) ? CritterProps[CPNUM(target)].hit_effect : NON_CRITTER_EFFECT;
-
-    *effect = effect_matrix[effect_class][GREN_TYPE][0];
-
-    return (compute_damage(target, GrenadeProps[CPTRIP(wpn_triple)].damage_type,
-                           GrenadeProps[CPTRIP(wpn_triple)].damage_modifier,
-                           GrenadeProps[CPTRIP(wpn_triple)].offense_value, GrenadeProps[CPTRIP(wpn_triple)].penetration,
-                           power_level, NULL, NULL, GREN_TYPE));
-}
-
 extern ObjID terrain_hit_exclusion;
 
 // ----------------------------------------------------------------------