summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/intif.c2
-rw-r--r--src/map/quest.c13
-rw-r--r--src/map/quest.h9
3 files changed, 11 insertions, 13 deletions
diff --git a/src/map/intif.c b/src/map/intif.c
index d077aa881..06f93f52e 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -1348,7 +1348,7 @@ int intif_parse_questlog(int fd)
if(!sd)
return -1;
- sd->avail_quests = sd->num_quests = (RFIFOB(fd, 2)-8)/sizeof(struct quest);
+ sd->avail_quests = sd->num_quests = (RFIFOW(fd, 2)-8)/sizeof(struct quest);
memset(&sd->quest_log, 0, sizeof(sd->quest_log));
diff --git a/src/map/quest.c b/src/map/quest.c
index ccde85a07..f146ca325 100644
--- a/src/map/quest.c
+++ b/src/map/quest.c
@@ -33,7 +33,14 @@
#include <stdarg.h>
#include <time.h>
-#define MAX_QUEST 25
+struct s_quest_db {
+ int id;
+ unsigned int time;
+ int mob[MAX_QUEST_OBJECTIVES];
+ int count[MAX_QUEST_OBJECTIVES];
+ //char name[NAME_LENGTH];
+};
+struct s_quest_db quest_db[MAX_QUEST_DB];
//Send quest info on login
int quest_pc_login(TBL_PC * sd)
@@ -64,9 +71,9 @@ int quest_add(TBL_PC * sd, int quest_id)
return -1;
}
- if( sd->num_quests >= MAX_QUEST_DB || sd->avail_quests >= MAX_QUEST )
+ if( sd->num_quests >= MAX_QUEST_DB )
{
- ShowError("quest_add: your quest log is full.(max quests: %d, max incompleted quests: %d)\n", MAX_QUEST_DB, MAX_QUEST);
+ ShowError("quest_add: your quest log is full.(max quests: %d)\n", MAX_QUEST_DB);
return 1;
}
diff --git a/src/map/quest.h b/src/map/quest.h
index 16870d381..ff351796c 100644
--- a/src/map/quest.h
+++ b/src/map/quest.h
@@ -6,15 +6,6 @@
typedef enum quest_check_type { HAVEQUEST, PLAYTIME, HUNTING } quest_check_type;
-struct s_quest_db {
- int id;
- unsigned int time;
- int mob[MAX_QUEST_OBJECTIVES];
- int count[MAX_QUEST_OBJECTIVES];
- //char name[NAME_LENGTH];
-};
-struct s_quest_db quest_db[MAX_QUEST_DB];
-
int quest_pc_login(TBL_PC * sd);
int quest_add(TBL_PC * sd, int quest_id);