Sfoglia il codice sorgente

-Follow up r17233 quick fix pc typo.
-Apply hercules be07517 add ers_report. (need to readd console before permanent use).

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

glighta 12 anni fa
parent
commit
ec36cfc036
3 ha cambiato i file con 18 aggiunte e 3 eliminazioni
  1. 10 1
      src/common/ers.c
  2. 7 1
      src/map/pc.c
  3. 1 1
      src/map/status.c

+ 10 - 1
src/common/ers.c

@@ -278,7 +278,16 @@ ERS ers_new(uint32 size, char *name, enum ERSOptions options)
 
 void ers_report(void)
 {
-	// FIXME: Someone use this? Is it really needed?
+	ers_cache_t *cache;
+	int i = 0;
+	for (cache = CacheList; cache; cache = cache->Next) {
+		ShowMessage(CL_BOLD"[Entry manager #%u report]\n"CL_NORMAL, ++i);
+		ShowMessage("\tinstances          : %u\n", cache->ReferenceCount);
+		ShowMessage("\tblock array size   : %u\n", cache->ObjectSize);
+		ShowMessage("\tallocated blocks   : %u\n", cache->Free+cache->Used);
+		ShowMessage("\tentries being used : %u\n", cache->Used);
+		ShowMessage("\tunused entries     : %u\n", cache->Free);
+	}
 }
 
 void ers_force_destroy_all(void)

+ 7 - 1
src/map/pc.c

@@ -1029,7 +1029,7 @@ bool pc_authok(struct map_session_data *sd, int login_id2, time_t expiration_tim
 	for( i = 0; i < 3; i++ )
 		sd->hate_mob[i] = -1;
 
-    //warp player
+	//warp player
 	if ((i=pc_setpos(sd,sd->status.last_point.map, sd->status.last_point.x, sd->status.last_point.y, CLR_OUTSIGHT)) != 0) {
 		ShowError ("Last_point_map %s - id %d not found (error code %d)\n", mapindex_id2name(sd->status.last_point.map), sd->status.last_point.map, i);
 
@@ -5516,6 +5516,12 @@ const char* job_name(int class_)
 	}
 }
 
+/*====================================================
+ * Timered function to make id follow a target.
+ * @id = bl.id (player only atm)
+ * target is define in sd->followtarget (bl.id)
+ * used by pc_follow
+ *----------------------------------------------------*/
 int pc_follow_timer(int tid, unsigned int tick, int id, intptr_t data)
 {
 	struct map_session_data *sd;

+ 1 - 1
src/map/status.c

@@ -2387,7 +2387,7 @@ int status_calc_pc_(struct map_session_data* sd, bool first)
 	memset(&status->max_hp, 0, sizeof(struct status_data)-(sizeof(status->hp)+sizeof(status->sp)));
 
 	//FIXME: Most of these stuff should be calculated once, but how do I fix the memset above to do that? [Skotlex]
-	if (!pc->state.permanent_speed)
+	if (!sd->state.permanent_speed)
 		status->speed = DEFAULT_WALK_SPEED;
 	//Give them all modes except these (useful for clones)
 	status->mode = MD_MASK&~(MD_BOSS|MD_PLANT|MD_DETECTOR|MD_ANGRY|MD_TARGETWEAK);