Explorar o código

* Several updates from Trunk
- Merged the new Auth process to avoid double logins.
- Merged official adoption process.
- Removed @gm command.
- Cleaning of MAX_ACCOUNT_ID and MAX_CHAR_ID
- Update of the online user count (map_getusers)

NOTE: i will do a second check to see if i forget something else.

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

zephyrus %!s(int64=17) %!d(string=hai) anos
pai
achega
7c9411922a
Modificáronse 2 ficheiros con 2 adicións e 2 borrados
  1. 1 1
      src/map/chrif.c
  2. 1 1
      src/map/pc.c

+ 1 - 1
src/map/chrif.c

@@ -37,7 +37,7 @@ static const int packet_len_table[0x3d] = { // U - used, F - free
 	 6,30,-1,-1,86, 7,44,34,	// 2b08-2b0f: U->2b08, U->2b09, F->2b0a, F->2b0b, U->2b0c, U->2b0d, U->2b0e, U->2b0f
 	11,10,10, 6,11,-1,266,10,	// 2b10-2b17: U->2b10, U->2b11, U->2b12, U->2b13, U->2b14, U->2b15, U->2b16, U->2b17
 	 2,10, 2,-1,-1,-1, 2, 7,	// 2b18-2b1f: U->2b18, U->2b19, U->2b1a, U->2b1b, U->2b1c, U->2b1d, U->2b1e, U->2b1f
-	-1,10, 8, 2, 2,14,19,19,	// 2b20-2b27: U->2b20, U->2b21, U->2b22, U->2b23, U->2b24, U->2b25, F->2b26, F->2b27
+	-1,10, 8, 2, 2,14,19,19,	// 2b20-2b27: U->2b20, U->2b21, U->2b22, U->2b23, U->2b24, U->2b25, U->2b26, U->2b27
 };
 
 //Used Packets:

+ 1 - 1
src/map/pc.c

@@ -4915,7 +4915,7 @@ void pc_respawn(struct map_session_data* sd, uint8 clrtype)
 static int pc_respawn_timer(int tid,unsigned int tick,int id,int data)
 {
 	struct map_session_data *sd = map_id2sd(id);
-	if( sd != NULL)
+	if( sd != NULL )
 		pc_respawn(sd,0);
 
 	return 0;