summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-20 16:17:24 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-20 16:17:24 +0000
commit634861889132634336748ad9204e80e004b05809 (patch)
tree9b6b881ca1cf49e5c3f943c2b7bb5c8c75a475aa
parentbb1c5108521509282b53460338d9c6f309018d50 (diff)
downloadhercules-634861889132634336748ad9204e80e004b05809.tar.gz
hercules-634861889132634336748ad9204e80e004b05809.tar.bz2
hercules-634861889132634336748ad9204e80e004b05809.tar.xz
hercules-634861889132634336748ad9204e80e004b05809.zip
* 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12621 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/chrif.c2
-rw-r--r--src/map/pc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 2ce7dcf4a..a2604dcf3 100644
--- a/src/map/chrif.c
+++ b/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:
diff --git a/src/map/pc.c b/src/map/pc.c
index 27336c05b..4d64a3182 100644
--- a/src/map/pc.c
+++ b/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;