4 files changed, 18 insertions, 17 deletions
diff --git a/src/char/Makefile.in b/src/char/Makefile.in
index bc2c0e980..8d9094f18 100644
--- a/src/char/Makefile.in
+++ b/src/char/Makefile.in
@@ -110,13 +110,13 @@ char-server: ../../char-server@EXEEXT@
 ../../char-server@EXEEXT@: $(CHAR_SERVER_SQL_DEPENDS) Makefile
 	@echo "	LD	$(notdir $@)"
 	@$(CC) @STATIC@ @LDFLAGS@ -o ../../char-server@EXEEXT@ $(CHAR_OBJ) $(COMMON_D)/obj_sql/common_sql.a \
-		$(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @PCRE_LIBS@ @MYSQL_LIBS@
+		$(COMMON_D)/obj_all/common.a $(MT19937AR_OBJ) $(LIBCONFIG_OBJ) @LIBS@ @MYSQL_LIBS@
 
 # char object files
 
 obj_sql/%.o: %.c $(CHAR_H) $(COMMON_H) $(CONFIG_H) $(MT19937AR_H) $(LIBCONFIG_H) | obj_sql
 	@echo "	CC	$<"
-	@$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @PCRE_CFLAGS@ @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
+	@$(CC) @CFLAGS@ @DEFS@ $(COMMON_INCLUDE) $(THIRDPARTY_INCLUDE) @MYSQL_CFLAGS@ @CPPFLAGS@ -c $(OUTPUT_OPTION) $<
 
 # missing object files
 $(COMMON_D)/obj_all/common.a:
diff --git a/src/char/char.c b/src/char/char.c
index 09f74034c..d05d13d4b 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -2637,11 +2637,11 @@ int char_parse_fromlogin(int fd) {
 		}
 	}
 
-	while(RFIFOREST(fd) >= 2) {
+	while (RFIFOREST(fd) >= 2) {
 		uint16 command = RFIFOW(fd,0);
 
 		if (VECTOR_LENGTH(HPM->packets[hpParse_FromLogin]) > 0) {
-			int result = HPM->parse_packets(fd,hpParse_FromLogin);
+			int result = HPM->parse_packets(fd,command,hpParse_FromLogin);
 			if (result == 1)
 				continue;
 			if (result == 2)
@@ -3926,16 +3926,17 @@ int char_parse_frommap(int fd)
 		return 0;
 	}
 
-	while(RFIFOREST(fd) >= 2) {
+	while (RFIFOREST(fd) >= 2) {
+		int packet_id = RFIFOW(fd,0);
 		if (VECTOR_LENGTH(HPM->packets[hpParse_FromMap]) > 0) {
-			int result = HPM->parse_packets(fd,hpParse_FromMap);
+			int result = HPM->parse_packets(fd,packet_id,hpParse_FromMap);
 			if (result == 1)
 				continue;
 			if (result == 2)
 				return 0;
 		}
 
-		switch(RFIFOW(fd,0)) {
+		switch (packet_id) {
 			case 0x2b0a:
 				if( RFIFOREST(fd) < RFIFOW(fd, 2) )
 					return 0;
@@ -5106,21 +5107,21 @@ int char_parse_char(int fd)
 		return 0;
 	}
 
-	while( RFIFOREST(fd) >= 2 ) {
-		//For use in packets that depend on an sd being present [Skotlex]
-		#define FIFOSD_CHECK(rest) do { if(RFIFOREST(fd) < (rest)) return 0; if (sd==NULL || !sd->auth) { RFIFOSKIP(fd,(rest)); return 0; } } while (0)
+	while (RFIFOREST(fd) >= 2) {
+		cmd = RFIFOW(fd,0);
+
+//For use in packets that depend on an sd being present [Skotlex]
+#define FIFOSD_CHECK(rest) do { if(RFIFOREST(fd) < (rest)) return 0; if (sd==NULL || !sd->auth) { RFIFOSKIP(fd,(rest)); return 0; } } while (0)
 
 		if (VECTOR_LENGTH(HPM->packets[hpParse_Char]) > 0) {
-			int result = HPM->parse_packets(fd,hpParse_Char);
+			int result = HPM->parse_packets(fd,cmd,hpParse_Char);
 			if (result == 1)
 				continue;
 			if (result == 2)
 				return 0;
 		}
 
-		cmd = RFIFOW(fd,0);
-
-		switch( cmd ) {
+		switch (cmd) {
 			// request to connect
 			// 0065 <account id>.L <login id1>.L <login id2>.L <???>.W <sex>.B
 			case 0x65:
diff --git a/src/char/char.h b/src/char/char.h
index 3d25ec465..ff46e4353 100644
--- a/src/char/char.h
+++ b/src/char/char.h
@@ -317,8 +317,8 @@ extern char char_reg_num_db[32];
 extern int guild_exp_rate;
 extern int log_inter;
 
-void char_load_defaults();
-void char_defaults();
+void char_load_defaults(void);
+void char_defaults(void);
 #endif // HERCULES_CORE
 
 HPShared struct char_interface *chr;
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index 03a1d368d..60efeac94 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -1201,7 +1201,7 @@ int mapif_parse_CreateGuild(int fd,int account_id,char *name,struct guild_member
 	g->member[0].modified = GS_MEMBER_MODIFIED;
 
 	// Set default positions
-	g->position[0].mode = GPERM_BOTH;
+	g->position[0].mode = GPERM_ALL;
 	strcpy(g->position[0].name,"GuildMaster");
 	strcpy(g->position[MAX_GUILDPOSITION-1].name,"Newbie");
 	g->position[0].modified = g->position[MAX_GUILDPOSITION-1].modified = GS_POSITION_MODIFIED;