Pārlūkot izejas kodu

Fixed a C language restriction preventing compilation

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9729 54d463be-8e91-2dee-dedb-b68131a5f0ec
ultramage 18 gadi atpakaļ
vecāks
revīzija
37ecb00ca5
3 mainītis faili ar 18 papildinājumiem un 10 dzēšanām
  1. 2 0
      Changelog-Trunk.txt
  2. 8 5
      src/char/inter.c
  3. 8 5
      src/char_sql/inter.c

+ 2 - 0
Changelog-Trunk.txt

@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2007/01/27
+	* Fixed a C language restriction preventing compilation [ultramage]
 2007/01/26
 	* Removed all those useless read-from-GRF features noone would ever use,
 	  also removed cutincard script command as a consequence [DracoRPG]

+ 8 - 5
src/char/inter.c

@@ -641,13 +641,16 @@ static void mapif_namechange_ack(int fd, int account_id, int char_id, int type,
 
 int mapif_parse_NameChangeRequest(int fd)
 {
-	RFIFOHEAD(fd);
-	int account_id = RFIFOL(fd, 2);
-	int char_id = RFIFOL(fd, 6);
-	int type = RFIFOB(fd, 10);
-	char *name =RFIFOP(fd, 11);
+	int account_id, char_id, type;
+	char* name;
 	int i;
 
+	RFIFOHEAD(fd);
+	account_id = RFIFOL(fd, 2);
+	char_id = RFIFOL(fd, 6);
+	type = RFIFOB(fd, 10);
+	name = RFIFOP(fd, 11);
+
 	// Check Authorised letters/symbols in the name
 	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
 		for (i = 0; i < NAME_LENGTH && name[i]; i++)

+ 8 - 5
src/char_sql/inter.c

@@ -773,13 +773,16 @@ static void mapif_namechange_ack(int fd, int account_id, int char_id, int type,
 
 int mapif_parse_NameChangeRequest(int fd)
 {
-	RFIFOHEAD(fd);
-	int account_id = RFIFOL(fd, 2);
-	int char_id = RFIFOL(fd, 6);
-	int type = RFIFOB(fd, 10);
-	char *name =RFIFOP(fd, 11);
+	int account_id, char_id, type;
+	char* name;
 	int i;
 
+	RFIFOHEAD(fd);
+	account_id = RFIFOL(fd, 2);
+	char_id = RFIFOL(fd, 6);
+	type = RFIFOB(fd, 10);
+	name = RFIFOP(fd, 11);
+
 	// Check Authorised letters/symbols in the name
 	if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
 		for (i = 0; i < NAME_LENGTH && name[i]; i++)