summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-27 16:29:58 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-27 16:29:58 +0000
commit1c6bd598f44a55c2f9d916cd55d9ee8c6da8ceaa (patch)
treeb9c944c457e3503526faa87961b9510c7a849ce6
parent27f15e3dc28ecacd43cc00ffa2d1abad1d5e0d0e (diff)
downloadhercules-1c6bd598f44a55c2f9d916cd55d9ee8c6da8ceaa.tar.gz
hercules-1c6bd598f44a55c2f9d916cd55d9ee8c6da8ceaa.tar.bz2
hercules-1c6bd598f44a55c2f9d916cd55d9ee8c6da8ceaa.tar.xz
hercules-1c6bd598f44a55c2f9d916cd55d9ee8c6da8ceaa.zip
Fixed a C language restriction preventing compilation
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9729 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/char/inter.c13
-rw-r--r--src/char_sql/inter.c13
3 files changed, 18 insertions, 10 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index d4e36ca40..0cef9ebd2 100644
--- a/Changelog-Trunk.txt
+++ b/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]
diff --git a/src/char/inter.c b/src/char/inter.c
index f1e1cd592..e5e397709 100644
--- a/src/char/inter.c
+++ b/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++)
diff --git a/src/char_sql/inter.c b/src/char_sql/inter.c
index b4bc3ddc0..03ab85773 100644
--- a/src/char_sql/inter.c
+++ b/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++)