From 0c4624f0d3e7e7263608545f50add7dbea83d794 Mon Sep 17 00:00:00 2001
From: amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Thu, 30 Dec 2004 04:11:20 +0000
Subject: update

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@868 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/intif.c | 6 ++++++
 src/map/pc.c    | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'src')

diff --git a/src/map/intif.c b/src/map/intif.c
index 8e0267781..9ba9b1ebb 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -196,6 +196,9 @@ int intif_saveaccountreg(struct map_session_data *sd) {
 
 	nullpo_retr(0, sd);
 
+	if (sd->status.account_reg_num == -1)
+		return 0;
+
 	WFIFOW(inter_fd,0) = 0x3004;
 	WFIFOL(inter_fd,4) = sd->bl.id;
 	for(j=0,p=8;j<sd->status.account_reg_num;j++,p+=36){
@@ -216,6 +219,9 @@ int intif_request_accountreg(struct map_session_data *sd)
 	WFIFOW(inter_fd,0) = 0x3005;
 	WFIFOL(inter_fd,2) = sd->bl.id;
 	WFIFOSET(inter_fd,6);
+
+	sd->status.account_reg_num = -1;
+
 	return 0;
 }
 
diff --git a/src/map/pc.c b/src/map/pc.c
index 3288dd1bc..8f2ce5654 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6583,6 +6583,12 @@ int pc_setaccountreg(struct map_session_data *sd,char *reg,int val)
 
 	nullpo_retr(0, sd);
 
+	if (sd->status.account_reg_num == -1) {
+		if(battle_config.error_log)
+			printf("pc_setaccountreg : refusing to set until vars are received\n");
+		return 1;
+	}
+
 	if(val==0){
 		for(i=0;i<sd->status.account_reg_num;i++){
 			if(strcmp(sd->status.account_reg[i].str,reg)==0){
-- 
cgit v1.2.3-70-g09d2