Browse Source

Fixed some compile warnings

Follow up to 09a0c29
Fixes #1748 - thanks to @srhmike
Lemongrass3110 8 years ago
parent
commit
9aaf18eb33
2 changed files with 5 additions and 7 deletions
  1. 3 5
      src/map/skill.c
  2. 2 2
      src/map/status.c

+ 3 - 5
src/map/skill.c

@@ -8922,18 +8922,16 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui
 
 
 	case RK_LUXANIMA:
 	case RK_LUXANIMA:
 		{
 		{
-			enum sc_type runes[] = { SC_MILLENNIUMSHIELD, SC_REFRESH, SC_GIANTGROWTH, SC_STONEHARDSKIN, SC_VITALITYACTIVATION, SC_ABUNDANCE };
+			sc_type runes[] = { SC_MILLENNIUMSHIELD, SC_REFRESH, SC_GIANTGROWTH, SC_STONEHARDSKIN, SC_VITALITYACTIVATION, SC_ABUNDANCE };
 
 
 			if (sd == NULL || sd->status.party_id == 0 || flag&1) {
 			if (sd == NULL || sd->status.party_id == 0 || flag&1) {
-				enum sc_type type = runes[skill_area_temp[5]];
-
 				if (src->id == bl->id) // Don't give it back to the RK
 				if (src->id == bl->id) // Don't give it back to the RK
 					break;
 					break;
 
 
-				sc_start(src, bl, type, 100, skill_lv, skill_get_time(skill_id, skill_lv));
+				sc_start(src, bl, runes[skill_area_temp[5]], 100, skill_lv, skill_get_time(skill_id, skill_lv));
 				status_change_clear_buffs(bl, SCCB_LUXANIMA); // For bonus_script
 				status_change_clear_buffs(bl, SCCB_LUXANIMA); // For bonus_script
 			} else if (sd) { // Find which SC is going to be given
 			} else if (sd) { // Find which SC is going to be given
-				int i = 0, recent = 0, result = -1;
+				int recent = 0, result = -1;
 
 
 				for (i = 0; i < ARRAYLENGTH(runes); i++) {
 				for (i = 0; i < ARRAYLENGTH(runes); i++) {
 					if (sd->sc.data[runes[i]] && ((sd->sc.data[runes[i]]->timer * (runes[i] == SC_REFRESH? 3 : 1)) > recent || recent == 0)) {
 					if (sd->sc.data[runes[i]] && ((sd->sc.data[runes[i]]->timer * (runes[i] == SC_REFRESH? 3 : 1)) > recent || recent == 0)) {

+ 2 - 2
src/map/status.c

@@ -9991,9 +9991,9 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty
 			break;
 			break;
 		case SC_MILLENNIUMSHIELD:
 		case SC_MILLENNIUMSHIELD:
 			{
 			{
-				int8 rate = rnd()%100;
+				int8 chance = rnd()%100;
 
 
-				val2 = ((rate < 20) ? 4 : (rate < 50) ? 3 : 2); // Shield count
+				val2 = ((chance < 20) ? 4 : (chance < 50) ? 3 : 2); // Shield count
 				val3 = 1000; // Shield HP
 				val3 = 1000; // Shield HP
 				clif_millenniumshield(bl, val2);
 				clif_millenniumshield(bl, val2);
 			}
 			}