[Add] A few more checks added to weapon.c

This commit is contained in:
Allanis 2014-03-04 02:46:47 +00:00
parent b198d794f0
commit f710c216b5

View File

@ -318,6 +318,8 @@ static void weapons_updateLayer(const double dt, const WeaponLayer layer) {
wlayer = wfrontLayer; wlayer = wfrontLayer;
nlayer = &nwfrontLayer; nlayer = &nwfrontLayer;
break; break;
default:
WARN("Unkown weapon layer!");
} }
i = 0; i = 0;
@ -400,7 +402,10 @@ void weapons_render(const WeaponLayer layer, const double dt) {
wlayer = wfrontLayer; wlayer = wfrontLayer;
nlayer = &nwfrontLayer; nlayer = &nwfrontLayer;
break; break;
default:
WARN("Unkown weapon layer!");
} }
for(i = 0; i < (*nlayer); i++) for(i = 0; i < (*nlayer); i++)
weapon_render(wlayer[i], dt); weapon_render(wlayer[i], dt);
} }
@ -852,8 +857,7 @@ void weapon_add(const Outfit* outfit, const double dir, const Vec2* pos,
mLayer = &mwfrontLayer; mLayer = &mwfrontLayer;
break; break;
default: default:
ERR("Invalid WEAPON_LAYER specified."); WARN("Unkown weapon layer!");
return;
} }
if(*mLayer > *nLayer) /* More memory allocated than what we need. */ if(*mLayer > *nLayer) /* More memory allocated than what we need. */
curLayer[(*nLayer)++] = w; curLayer[(*nLayer)++] = w;
@ -1016,6 +1020,8 @@ static void weapon_destroy(Weapon* w, WeaponLayer layer) {
wlayer = wfrontLayer; wlayer = wfrontLayer;
nlayer = &nwfrontLayer; nlayer = &nwfrontLayer;
break; break;
default:
WARN("Unknown weapon layer!");
} }
for(i = 0; (wlayer[i] != w) && (i < *nlayer); i++); /* Get to the current position. */ for(i = 0; (wlayer[i] != w) && (i < *nlayer); i++); /* Get to the current position. */