cxx updates

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@861 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 20 insertions, 20 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 72d461865..e812e1de1 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -269,7 +269,7 @@ int mmo_char_tostr(char *str, struct mmo_charstatus *p) {
 	  "\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d"
 	  "\t%s,%d,%d\t%s,%d,%d,%d\t",
 	  p->char_id, p->account_id, p->char_num, p->name, //
-	  p->class, p->base_level, p->job_level,
+	  p->class_, p->base_level, p->job_level,
 	  p->base_exp, p->job_exp, p->zeny,
 	  p->hp, p->max_hp, p->sp, p->max_sp,
 	  p->str, p->agi, p->vit, p->int_, p->dex, p->luk,
@@ -397,7 +397,7 @@ int mmo_char_fromstr(char *str, struct mmo_charstatus *p) {
 	p->char_id = tmp_int[0];
 	p->account_id = tmp_int[1];
 	p->char_num = tmp_int[2];
-	p->class = tmp_int[3];
+	p->class_ = tmp_int[3];
 	p->base_level = tmp_int[4];
 	p->job_level = tmp_int[5];
 	p->base_exp = tmp_int[6];
@@ -947,7 +947,7 @@ int make_new_char(int fd, unsigned char *dat) {
 	char_dat[i].account_id = sd->account_id;
 	char_dat[i].char_num = dat[30];
 	strcpy(char_dat[i].name, dat);
-	char_dat[i].class = 0;
+	char_dat[i].class_ = 0;
 	char_dat[i].base_level = 1;
 	char_dat[i].job_level = 1;
 	char_dat[i].base_exp = 0;
@@ -1156,12 +1156,12 @@ void create_online_files(void) {
 						break;
 					case 4: // by job (and job level)
 						for(k = 0; k < players; k++)
-							if (char_dat[j].class < char_dat[id[k]].class ||
+							if (char_dat[j].class_ < char_dat[id[k]].class_ ||
 							   // if same job, we sort by job level.
-							   (char_dat[j].class == char_dat[id[k]].class &&
+							   (char_dat[j].class_ == char_dat[id[k]].class_ &&
 							    char_dat[j].job_level < char_dat[id[k]].job_level) ||
 							   // if same job and job level, we sort by job exp.
-							   (char_dat[j].class == char_dat[id[k]].class &&
+							   (char_dat[j].class_ == char_dat[id[k]].class_ &&
 							    char_dat[j].job_level == char_dat[id[k]].job_level &&
 							    char_dat[j].job_exp < char_dat[id[k]].job_exp)) {
 								for(l = players; l > k; l--)
@@ -1302,7 +1302,7 @@ void create_online_files(void) {
 				}
 				// displaying of the job
 				if (online_display_option & 6) {
-					char * jobname = job_name(char_dat[j].class);
+					char * jobname = job_name(char_dat[j].class_);
 					if ((online_display_option & 6) == 6) {
 						fprintf(fp2, "        <td>%s %d/%d</td>\n", jobname, char_dat[j].base_level, char_dat[j].job_level);
 						fprintf(fp, "%-18s %3d/%3d ", jobname, char_dat[j].base_level, char_dat[j].job_level);
@@ -1436,7 +1436,7 @@ int mmo_char_send006b(int fd, struct char_session_data *sd) {
 		WFIFOW(fd,j+46) = (p->sp > 0x7fff) ? 0x7fff : p->sp;
 		WFIFOW(fd,j+48) = (p->max_sp > 0x7fff) ? 0x7fff : p->max_sp;
 		WFIFOW(fd,j+50) = DEFAULT_WALK_SPEED; // p->speed;
-		WFIFOW(fd,j+52) = p->class;
+		WFIFOW(fd,j+52) = p->class_;
 		WFIFOW(fd,j+54) = p->hair;
 		WFIFOW(fd,j+56) = p->weapon;
 		WFIFOW(fd,j+58) = p->base_level;
@@ -1717,7 +1717,7 @@ int parse_tologin(int fd) {
 			if (acc > 0) {
 				for (i = 0; i < char_num; i++) {
 					if (char_dat[i].account_id == acc) {
-						int jobclass = char_dat[i].class;
+						int jobclass = char_dat[i].class_;
 						char_dat[i].sex = sex;
 						auth_fifo[i].sex = sex;
 						if (jobclass == 19 || jobclass == 20 ||
@@ -1725,11 +1725,11 @@ int parse_tologin(int fd) {
 						    jobclass == 4042 || jobclass == 4043) {
 							// job modification
 							if (jobclass == 19 || jobclass == 20) {
-								char_dat[i].class = (sex) ? 19 : 20;
+								char_dat[i].class_ = (sex) ? 19 : 20;
 							} else if (jobclass == 4020 || jobclass == 4021) {
-								char_dat[i].class = (sex) ? 4020 : 4021;
+								char_dat[i].class_ = (sex) ? 4020 : 4021;
 							} else if (jobclass == 4042 || jobclass == 4043) {
-								char_dat[i].class = (sex) ? 4042 : 4043;
+								char_dat[i].class_ = (sex) ? 4042 : 4043;
 							}
 							// remove specifical skills of classes 19, 4020 and 4042
 							for(j = 315; j <= 322; j++) {
@@ -2730,7 +2730,7 @@ int parse_char(int fd) {
 			WFIFOW(fd,2+46) = (char_dat[i].sp > 0x7fff) ? 0x7fff : char_dat[i].sp;
 			WFIFOW(fd,2+48) = (char_dat[i].max_sp > 0x7fff) ? 0x7fff : char_dat[i].max_sp;
 			WFIFOW(fd,2+50) = DEFAULT_WALK_SPEED; // char_dat[i].speed;
-			WFIFOW(fd,2+52) = char_dat[i].class;
+			WFIFOW(fd,2+52) = char_dat[i].class_;
 			WFIFOW(fd,2+54) = char_dat[i].hair;
 
 			WFIFOW(fd,2+58) = char_dat[i].base_level;
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index 8577b2a66..0ee4476fc 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -45,7 +45,7 @@ int inter_guild_tostr(char *str, struct guild *g) {
 		len += sprintf(str + len, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\t%s\t",
 		               m->account_id, m->char_id,
 		               m->hair, m->hair_color, m->gender,
-		               m->class, m->lv, m->exp, m->exp_payper, m->position,
+		               m->class_, m->lv, m->exp, m->exp_payper, m->position,
 		               ((m->account_id > 0) ? m->name : "-"));
 	}
 	// –ð�E
@@ -138,7 +138,7 @@ int inter_guild_fromstr(char *str, struct guild *g) {
 		m->hair = tmp_int[2];
 		m->hair_color = tmp_int[3];
 		m->gender = tmp_int[4];
-		m->class = tmp_int[5];
+		m->class_ = tmp_int[5];
 		m->lv = tmp_int[6];
 		m->exp = tmp_int[7];
 		m->exp_payper = tmp_int[8];
@@ -767,7 +767,7 @@ int mapif_guild_memberinfoshort(struct guild *g, int idx) {
 	WBUFL(buf,10) = g->member[idx].char_id;
 	WBUFB(buf,14) = g->member[idx].online;
 	WBUFW(buf,15) = g->member[idx].lv;
-	WBUFW(buf,17) = g->member[idx].class;
+	WBUFW(buf,17) = g->member[idx].class_;
 	mapif_sendall(buf, 19);
 	return 0;
 }
@@ -1101,7 +1101,7 @@ int mapif_parse_GuildChangeMemberInfoShort(int fd, int guild_id, int account_id,
 		if (g->member[i].account_id == account_id && g->member[i].char_id == char_id) {
 			g->member[i].online = online;
 			g->member[i].lv = lv;
-			g->member[i].class = class;
+			g->member[i].class_ = class;
 			mapif_guild_memberinfoshort(g, i);
 		}
 		if (g->member[i].account_id > 0) {
diff --git a/src/char/int_pet.c b/src/char/int_pet.c
index cff1e434f..c08c4ccf3 100644
--- a/src/char/int_pet.c
+++ b/src/char/int_pet.c
@@ -30,7 +30,7 @@ int inter_pet_tostr(char *str,struct s_pet *p)
 		p->intimate = 1000;
 
 	len=sprintf(str,"%d,%d,%s\t%d,%d,%d,%d,%d,%d,%d,%d,%d",
-		p->pet_id,p->class,p->name,p->account_id,p->char_id,p->level,p->egg_id,
+		p->pet_id,p->class_,p->name,p->account_id,p->char_id,p->level,p->egg_id,
 		p->equip,p->intimate,p->hungry,p->rename_flag,p->incuvate);
 
 	return 0;
@@ -52,7 +52,7 @@ int inter_pet_fromstr(char *str,struct s_pet *p)
 		return 1;
 	
 	p->pet_id = tmp_int[0];
-	p->class = tmp_int[1];
+	p->class_ = tmp_int[1];
 	memcpy(p->name,tmp_str,24);
 	p->account_id = tmp_int[2];
 	p->char_id = tmp_int[3];
@@ -225,7 +225,7 @@ int mapif_create_pet(int fd,int account_id,int char_id,short pet_class,short pet
 		p->account_id = account_id;
 		p->char_id = char_id;
 	}
-	p->class = pet_class;
+	p->class_ = pet_class;
 	p->level = pet_lv;
 	p->egg_id = pet_egg_id;
 	p->equip = pet_equip;