Clarify some Job Class vs MapID confusion (1/2)

This commit ensures that `sd->status.class` and related variables only
contain Job Classes (i.e. the client-compatible values, where High
Novice 4001) and are never checked against the bitmask-based MapID
values.

As a rule of thumb, from now on, when a variable is named `class`, it
is intended to contain a Job Class ID and not a MapID. The type of such
variable shall be a signed `int16` or `int`.

To ensure that related third party code is also verified when this
commit is merged, the variable `struct mmo_charstatus::class_ (i.e.
`sd->status.class_`) is renamed to `class`.

Some issues in related lines are also fixed, including:

- A wrong check in the char server would prevent the correct detection
  of babies in code related to the family exp sharing.

- Baby Arch Bishops would not be affected by Eucharistica.

- A wrong check would cause the `questinfo()` script command not to
  display its information for most classes (except 1-1 classes).

- Map IDs and Job Classes were mixed up in `itemdb_jobid2mapid()` and
  `itemdb_jobmask2mapid()` for 1-1 classes (causing currently no harm,
  since they just happen to coincide).

- The Baby Sura class would not cause parties to be marked as
  containing a monk type character (for SLS Team Up purposes).

- Baby Geneticists would bypass the cart check when trying to equip
  ammunitions.

- Baby Mechanics would bypass the Mado Gear check when trying to equip
  ammunitions.

- Transcendent Shadow Chasers would lose the Stalkers' ability to clone
  transcendent skills.

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 5d9802b57..f29a1357e 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1220,7 +1220,7 @@ void clif_spawn_unit(struct block_list* bl, enum send_target target) {
 #endif
 	if (clif->isdisguised(bl)) {
 		nullpo_retv(sd);
-		if( sd->status.class_ != sd->disguise )
+		if (sd->status.class != sd->disguise)
 			clif->send(&p,sizeof(p),bl,target);
 #if PACKETVER >= 20091103
 		p.objecttype = pc->db_checkid(status->get_viewdata(bl)->class_) ? 0x0 : 0x5; //PC_TYPE : NPC_MOB_TYPE
@@ -4799,7 +4799,7 @@ void clif_skillinfoblock(struct map_session_data *sd)
 			}
 			safestrncpy(WFIFOP(fd,len+12), skill->get_name(id), NAME_LENGTH);
 			if(sd->status.skill[i].flag == SKILL_FLAG_PERMANENT)
-				WFIFOB(fd,len+36) = (sd->status.skill[i].lv < skill->tree_get_max(id, sd->status.class_))? 1:0;
+				WFIFOB(fd,len+36) = (sd->status.skill[i].lv < skill->tree_get_max(id, sd->status.class))? 1:0;
 			else
 				WFIFOB(fd,len+36) = 0;
 			len += 37;
@@ -4850,7 +4850,7 @@ void clif_addskill(struct map_session_data *sd, int id)
 	}
 	safestrncpy(WFIFOP(fd,14), skill->get_name(id), NAME_LENGTH);
 	if (sd->status.skill[idx].flag == SKILL_FLAG_PERMANENT)
-		WFIFOB(fd,38) = (skill_lv < skill->tree_get_max(id, sd->status.class_))? 1:0;
+		WFIFOB(fd,38) = (skill_lv < skill->tree_get_max(id, sd->status.class))? 1:0;
 	else
 		WFIFOB(fd,38) = 0;
 	WFIFOSET(fd,packet_len(0x111));
@@ -4895,7 +4895,7 @@ void clif_skillup(struct map_session_data *sd, uint16 skill_id, int skill_lv, in
 	WFIFOW(fd, 6) = skill->get_sp(skill_id, skill_lv);
 	WFIFOW(fd, 8) = (flag)?skill->get_range2(&sd->bl, skill_id, skill_lv) : skill->get_range(skill_id, skill_lv);
 	if( flag )
-		WFIFOB(fd,10) = (skill_lv < skill->tree_get_max(skill_id, sd->status.class_)) ? 1 : 0;
+		WFIFOB(fd,10) = (skill_lv < skill->tree_get_max(skill_id, sd->status.class)) ? 1 : 0;
 	else
 		WFIFOB(fd,10) = 1;
 
@@ -4928,7 +4928,7 @@ void clif_skillinfo(struct map_session_data *sd,int skill_id, int inf)
 		WFIFOW(fd,12) = 0;
 	}
 	if (sd->status.skill[idx].flag == SKILL_FLAG_PERMANENT)
-		WFIFOB(fd,14) = (skill_lv < skill->tree_get_max(skill_id, sd->status.class_))? 1:0;
+		WFIFOB(fd,14) = (skill_lv < skill->tree_get_max(skill_id, sd->status.class))? 1:0;
 	else
 		WFIFOB(fd,14) = 0;
 	WFIFOSET(fd,packet_len(0x7e1));
@@ -7482,7 +7482,7 @@ void clif_guild_memberlist(struct map_session_data *sd)
 		WFIFOW(fd,c*104+12)=m->hair;
 		WFIFOW(fd,c*104+14)=m->hair_color;
 		WFIFOW(fd,c*104+16)=m->gender;
-		WFIFOW(fd,c*104+18)=m->class_;
+		WFIFOW(fd,c*104+18)=m->class;
 		WFIFOW(fd,c*104+20)=m->lv;
 		WFIFOL(fd,c*104+22)=(int)cap_value(m->exp,0,INT32_MAX);
 		WFIFOL(fd,c*104+26)=m->online;
@@ -8913,7 +8913,7 @@ void clif_viewequip_ack(struct map_session_data* sd, struct map_session_data* ts
 
 	safestrncpy(viewequip_list.characterName, tsd->status.name, NAME_LENGTH);
 
-	viewequip_list.job         = tsd->status.class_;
+	viewequip_list.job         = tsd->status.class;
 	viewequip_list.head        = tsd->vd.hair_style;
 	viewequip_list.accessory   = tsd->vd.head_bottom;
 	viewequip_list.accessory2  = tsd->vd.head_mid;
@@ -9628,7 +9628,7 @@ void clif_parse_LoadEndAck(int fd, struct map_session_data *sd) {
 			struct questinfo *qi = &map->list[sd->bl.m].qi_data[i];
 			if( quest->check(sd, qi->quest_id, HAVEQUEST) == -1 ) {// Check if quest is not started
 				if( qi->hasJob ) { // Check if quest is job-specific, check is user is said job class.
-					if( sd->class_ == qi->job )
+					if (sd->status.class == qi->job)
 						clif->quest_show_event(sd, &qi->nd->bl, qi->icon, qi->color);
 				} else {
 					clif->quest_show_event(sd, &qi->nd->bl, qi->icon, qi->color);
@@ -9870,7 +9870,7 @@ int clif_undisguise_timer(int tid, int64 tick, int id, intptr_t data) {
 	struct map_session_data * sd;
 	if( (sd = map->id2sd(id)) ) {
 		sd->fontcolor_tid = INVALID_TIMER;
-		if( sd->fontcolor && sd->disguise == sd->status.class_ )
+		if (sd->fontcolor && sd->disguise == sd->status.class)
 			pc->disguise(sd,-1);
 	}
 	return 0;
@@ -9921,12 +9921,12 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data *sd)
 
 		if (sd->disguise == -1) {
 			sd->fontcolor_tid = timer->add(timer->gettick()+5000, clif->undisguise_timer, sd->bl.id, 0);
-			pc->disguise(sd,sd->status.class_);
+			pc->disguise(sd,sd->status.class);
 			if (pc_isdead(sd))
 				clif->clearunit_single(-sd->bl.id, CLR_DEAD, sd->fd);
 			if (unit->is_walking(&sd->bl))
 				clif->move(&sd->ud);
-		} else if (sd->disguise == sd->status.class_ && sd->fontcolor_tid != INVALID_TIMER) {
+		} else if (sd->disguise == sd->status.class && sd->fontcolor_tid != INVALID_TIMER) {
 			const struct TimerData *td;
 			if ((td = timer->get(sd->fontcolor_tid)) != NULL)
 				timer->settick(sd->fontcolor_tid, td->tick+5000);
@@ -12568,7 +12568,7 @@ void clif_PartyBookingVolunteerInfo(int index, struct map_session_data *sd)
 	nullpo_retv(sd);
 	WBUFW(buf, 0) = 0x8f2;
 	WBUFL(buf, 2) = sd->status.account_id;
-	WBUFL(buf, 6) = sd->status.class_;
+	WBUFL(buf, 6) = sd->status.class;
 	WBUFW(buf, 10) = sd->status.base_level;
 	memcpy(WBUFP(buf, 12), sd->status.name, NAME_LENGTH);
 
@@ -16251,7 +16251,7 @@ void clif_bg_xy(struct map_session_data *sd)
 	WBUFW(buf,0)=0x2df;
 	WBUFL(buf,2)=sd->status.account_id;
 	memcpy(WBUFP(buf,6), sd->status.name, NAME_LENGTH);
-	WBUFW(buf,30)=sd->status.class_;
+	WBUFW(buf,30)=sd->status.class;
 	WBUFW(buf,32)=sd->bl.x;
 	WBUFW(buf,34)=sd->bl.y;