Browse Source

Follow up to 33729eb

Fixed duplicate export of looks.
Lemongrass3110 9 years ago
parent
commit
00ec41eaac
1 changed files with 11 additions and 23 deletions
  1. 11 23
      src/map/script_constants.h

+ 11 - 23
src/map/script_constants.h

@@ -688,6 +688,17 @@
 	// TODO: check why we didnt have floor and enable it
 	//export_constant(LOOK_FLOOR);
 
+	// For backwards compatability - might be removed in the near future
+	script_set_constant("VAR_HEAD",LOOK_HAIR,false);
+	script_set_constant("VAR_WEAPON",LOOK_WEAPON,false);
+	script_set_constant("VAR_HEAD_TOP",LOOK_HEAD_TOP,false); // This one was actually pointing to LOOK_HEAD_BOTTOM until now, so we might be safe to remove them anyway(since we got no bug report until today)
+	script_set_constant("VAR_HEAD_MID",LOOK_HEAD_MID,false); // This one was actually pointing to LOOK_HEAD_TOP until now, so we might be safe to remove them anyway(since we got no bug report until today)
+	script_set_constant("VAR_HEAD_BOTTOM",LOOK_HEAD_BOTTOM,false);  // This one was actually pointing to LOOK_HEAD_MID until now, so we might be safe to remove them anyway(since we got no bug report until today)
+	script_set_constant("VAR_HEADPALETTE",LOOK_HAIR_COLOR,false);
+	script_set_constant("VAR_BODYPALETTE",LOOK_CLOTHES_COLOR,false);
+	script_set_constant("VAR_SHIELD",LOOK_SHIELD,false);
+	script_set_constant("VAR_SHOES",LOOK_SHOES,false);
+
 	/* status changes */
 	script_set_constant("Eff_Stone",SC_STONE,false);
 	script_set_constant("Eff_Freeze",SC_FREEZE,false);
@@ -2606,29 +2617,6 @@
 	export_constant(FW_EXTRABOLD);
 	export_constant(FW_HEAVY);
 
-	/* look types */
-	export_constant(LOOK_BASE);
-	export_constant(LOOK_HAIR);
-	export_constant(LOOK_WEAPON);
-	export_constant(LOOK_HEAD_BOTTOM);
-	export_constant(LOOK_HEAD_TOP);
-	export_constant(LOOK_HEAD_MID);
-	export_constant(LOOK_HAIR_COLOR);
-	export_constant(LOOK_CLOTHES_COLOR);
-	export_constant(LOOK_SHIELD);
-	export_constant(LOOK_SHOES);
-
-	// For backwards compatability - might be removed in the near future
-	script_set_constant("VAR_HEAD",LOOK_HAIR,false);
-	script_set_constant("VAR_WEAPON",LOOK_WEAPON,false);
-	script_set_constant("VAR_HEAD_TOP",LOOK_HEAD_TOP,false); // This one was actually pointing to LOOK_HEAD_BOTTOM until now, so we might be safe to remove them anyway(since we got no bug report until today)
-	script_set_constant("VAR_HEAD_MID",LOOK_HEAD_MID,false); // This one was actually pointing to LOOK_HEAD_TOP until now, so we might be safe to remove them anyway(since we got no bug report until today)
-	script_set_constant("VAR_HEAD_BOTTOM",LOOK_HEAD_BOTTOM,false);  // This one was actually pointing to LOOK_HEAD_MID until now, so we might be safe to remove them anyway(since we got no bug report until today)
-	script_set_constant("VAR_HEADPALETTE",LOOK_HAIR_COLOR,false);
-	script_set_constant("VAR_BODYPALETTE",LOOK_CLOTHES_COLOR,false);
-	script_set_constant("VAR_SHIELD",LOOK_SHIELD,false);
-	script_set_constant("VAR_SHOES",LOOK_SHOES,false);
-
 	/* add skill types */
 	script_set_constant("SKILL_PERM",ADDSKILL_PERMANENT,false);
 	script_set_constant("SKILL_TEMP",ADDSKILL_TEMP,false);