diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-26 15:07:18 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-26 15:07:18 +0000 |
| commit | 5abd5bd1f8f53b73560cecd4496bfd4bc2acc226 (patch) | |
| tree | 1599a2cfc0f4079ce75a649e04542bdc1d8d06d7 /src/common | |
| parent | 391ac7a8a4aedafe818d0559a2011722fa54163c (diff) | |
| download | hercules-5abd5bd1f8f53b73560cecd4496bfd4bc2acc226.tar.gz hercules-5abd5bd1f8f53b73560cecd4496bfd4bc2acc226.tar.bz2 hercules-5abd5bd1f8f53b73560cecd4496bfd4bc2acc226.tar.xz hercules-5abd5bd1f8f53b73560cecd4496bfd4bc2acc226.zip | |
- Cleaned up some more the code so it works for -DTURBO
- Cleaned the pvpoff @ and script commands.
- mob_get_random_id now has two additional flags to specify that the monster to acquire should not be a boss type (4) or that it should give exp (8).
- TK_MISSION will now pick any mob from the DB as long as it is not a boss type and it gives base exp.
- Fixed the double-stone issue when hitting a petrified character.
- Minor cleanups
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9573 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/socket.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/socket.h b/src/common/socket.h index 6b1032eb3..71dc07ea9 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -58,7 +58,7 @@ extern time_t stall_time; #define WFIFOSPACE(fd) (session[fd]->max_wdata-session[fd]->wdata_size) #ifdef TURBO -#define WFIFOHEAD(fd, x) uint8 *wbPtr ## fd = fd?(session[fd]->wdata+session[fd]->wdata_size):0; +#define WFIFOHEAD(fd, x) uint8 *wbPtr ## fd = (fd>0&&session[fd])?(session[fd]->wdata+session[fd]->wdata_size):NULL; #define WFIFOP(fd,pos) (&wbPtr ## fd[pos]) #else #define WFIFOHEAD(fd, size) do{ if((fd) && session[fd]->wdata_size + (size) > session[fd]->max_wdata ) realloc_writefifo(fd, size); }while(0) |