ソースを参照

- Fixed pet.c not checking log_config.enable_logs setting. [lighta]
- Updated documentation for 'showevent'.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15152 54d463be-8e91-2dee-dedb-b68131a5f0ec

brianluau 13 年 前
コミット
d6d87a6f65
3 ファイル変更9 行追加7 行削除
  1. 4 4
      doc/script_commands.txt
  2. 4 2
      src/map/pet.c
  3. 1 1
      src/map/script.c

+ 4 - 4
doc/script_commands.txt

@@ -7233,10 +7233,10 @@ state can be:
 	Other value may cause client crashes.
 
 color can be:
-	0 = yellow
-	1 = orange
-	2 = green
-	3 = blue
+	0 = yellow "Quest"
+	1 = orange "Job"
+	2 = green "Event"
+	3 = an MVP flag
 	other values show a transparent mark in the mini-map.
 
 ----------------------------------------

+ 4 - 2
src/map/pet.c

@@ -1013,8 +1013,10 @@ int pet_lootitem_drop(struct pet_data *pd,struct map_session_data *sd)
 				memcpy(&ditem->item_data, it, sizeof(struct item));
 				ditem->next = dlist->item;
 				dlist->item = ditem;
-			} else
-    			log_pick_pc(sd, "P", it->nameid, it->amount, it);
+			} else {
+				if (log_config.enable_logs & LOG_PLAYER_ITEMS)
+					log_pick_pc(sd, "P", it->nameid, it->amount, it);
+			}
 		}
 		else {
 			ditem = ers_alloc(item_drop_ers, struct item_drop);

+ 1 - 1
src/map/script.c

@@ -15080,7 +15080,7 @@ BUILDIN_FUNC(showevent)
 	state = script_getnum(st, 2);
 	color = script_getnum(st, 3);
 
-  if( color < 0 || color > 4 )
+	if( color < 0 || color > 3 )
 	color = 0; // set default color
 
 	clif_quest_show_event(sd, &nd->bl, state, color);