浏览代码

Removed comment and corrected typo

Atemo 9 年之前
父节点
当前提交
1e80d1b720
共有 2 个文件被更改,包括 6 次插入15 次删除
  1. 0 9
      src/map/pc.c
  2. 6 6
      src/map/script.c

+ 0 - 9
src/map/pc.c

@@ -11745,19 +11745,14 @@ void pc_show_questinfo(struct map_session_data *sd) {
 		if (!qi)
 			continue;
 
-		// printf("Qid %d(%d) @%s(%d,%d) J:%d Q:%d",qi->quest_id,qi->icon,map[qi->nd->bl.m].name,qi->nd->bl.x,qi->nd->bl.y,
-			// qi->jobid_count,qi->req_count);
-
 		if (quest_check(sd, qi->quest_id, HAVEQUEST) != -1) { // Check if quest is not started
 			pc_show_questinfo_sub(sd, &sd->qi_display[i], qi, false);
-			// printf(" -> Hide, has quest %d\n",qi->quest_id);
 			continue;
 		}
 
 		// Level range checks
 		if (sd->status.base_level < qi->min_level || sd->status.base_level > qi->max_level) {
 			pc_show_questinfo_sub(sd, &sd->qi_display[i], qi, false);
-			// printf(" -> Hide, level is %d. Need %d - %d\n",sd->status.base_level,qi->min_level,qi->max_level);
 			continue;
 		}
 
@@ -11772,7 +11767,6 @@ void pc_show_questinfo(struct map_session_data *sd) {
 				mystate = (quest_check(sd, qi->req[j].quest_id, HAVEQUEST) == -1) ? 0 : 1;
 				if (mystate != state) {
 					failed = true;
-					// printf(" -> Hide, need %d state %d. curr %d\n",qi->req[j].quest_id,state,mystate);
 					break;
 				}
 			}
@@ -11789,18 +11783,15 @@ void pc_show_questinfo(struct map_session_data *sd) {
 				if (pc_mapid2jobid(sd->class_,sd->status.sex) == qi->jobid[j]) {
 					pc_show_questinfo_sub(sd, &sd->qi_display[i], qi, true);
 					failed = false;
-					// printf(" -> Show, job match for %d.\n",sd->status.class_,qi->jobid[j]);
 					break;
 				}
 			}
 			if (!failed)
 				continue;
 			pc_show_questinfo_sub(sd, &sd->qi_display[i], qi, false);
-			// printf(" -> Hide, no job match for %d.\n",sd->status.class_);
 		}
 		else {
 			pc_show_questinfo_sub(sd, &sd->qi_display[i], qi, true);
-			// printf(" -> Show, normal\n");
 		}
 	}
 }

+ 6 - 6
src/map/script.c

@@ -21157,7 +21157,7 @@ BUILDIN_FUNC(setquestinfo_level) {
 	struct questinfo *qi = map_has_questinfo(nd->bl.m, nd, quest_id);
 
 	if (!qi) {
-		ShowError("buildin_setquestinfo_level: Quest with '%d' is not defined yet.\n", quest_id);
+		ShowError("buildin_setquestinfo_level: Quest with ID '%d' is not defined yet.\n", quest_id);
 		return SCRIPT_CMD_FAILURE;
 	}
 
@@ -21182,17 +21182,17 @@ BUILDIN_FUNC(setquestinfo_req) {
 	uint8 num = script_lastdata(st)+1;
 
 	if (!qi) {
-		ShowError("buildin_setquestinfo_req: Quest with '%d' is not defined yet.\n", quest_id);
+		ShowError("buildin_setquestinfo_req: Quest with ID '%d' is not defined yet.\n", quest_id);
 		return SCRIPT_CMD_FAILURE;
 	}
 
 	if (quest_search(quest_id) == &quest_dummy) {
-		ShowError("buildin_setquestinfo_req: Quest with '%d' is not found in Quest DB.\n", quest_id);
+		ShowError("buildin_setquestinfo_req: Quest with ID '%d' is not found in Quest DB.\n", quest_id);
 		return SCRIPT_CMD_FAILURE;
 	}
 
 	if ((num+1)%2 != 0) {
-		ShowError("buildin_setquestinfo_req: Unmatched parameters. Num: '%d'\n", num);
+		ShowError("buildin_setquestinfo_req: Odd number of parameters(%d) - pairs of requirements are expected.\n", num);
 		return SCRIPT_CMD_FAILURE;
 	}
 
@@ -21220,14 +21220,14 @@ BUILDIN_FUNC(setquestinfo_job) {
 	uint8 num = script_lastdata(st)+1;
 
 	if (!qi) {
-		ShowError("buildin_setquestinfo_job: Quest with '%d' is not defined yet.\n", quest_id);
+		ShowError("buildin_setquestinfo_job: Quest with ID '%d' is not defined yet.\n", quest_id);
 		return SCRIPT_CMD_FAILURE;
 	}
 
 	for (i = 3; i < num; i++) {
 		job_id = script_getnum(st, i);
 		if (!pcdb_checkid(job_id)) {
-			ShowError("buildin_setquestinfo_job: Invalid job with id '%d'.\n", job_id);
+			ShowError("buildin_setquestinfo_job: Invalid job id '%d' in Quest with ID %d.\n", job_id, quest_id);
 			continue;
 		}
 		buildin_questinfo_setjob(qi, job_id);