diff options
| author | j-tkay <joseph.tk.ea@gmail.com> | 2013-07-04 05:17:17 +0800 |
|---|---|---|
| committer | j-tkay <joseph.tk.ea@gmail.com> | 2013-07-04 05:17:17 +0800 |
| commit | ca0205134beb9ba26e989c9fc3820c086d4d22a7 (patch) | |
| tree | 6790ece04272e548a46ee2255364b026def3fd6e /src/common | |
| parent | 28a9fec0916db3d92629ae6e6cd62b5777b09e73 (diff) | |
| parent | d88be27960c4508c2f61a729fb5e4c89965b7e0b (diff) | |
| download | hercules-ca0205134beb9ba26e989c9fc3820c086d4d22a7.tar.gz hercules-ca0205134beb9ba26e989c9fc3820c086d4d22a7.tar.bz2 hercules-ca0205134beb9ba26e989c9fc3820c086d4d22a7.tar.xz hercules-ca0205134beb9ba26e989c9fc3820c086d4d22a7.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/mmo.h | 3 | ||||
| -rw-r--r-- | src/common/socket.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h index 6e5dae099..17caf917a 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -92,6 +92,9 @@ #define MAX_CART 100 #define MAX_SKILL 1478 #define MAX_SKILL_ID 10015 // [Ind/Hercules] max used skill ID +//Update this max as necessary. 55 is the value needed for Super Baby currently +//Raised to 84 since Expanded Super Novice needs it. +#define MAX_SKILL_TREE 84 #define GLOBAL_REG_NUM 256 // Max permanent character variables per char #define ACCOUNT_REG_NUM 64 // Max permanent local account variables per account #define ACCOUNT_REG2_NUM 16 // Max permanent global account variables per account diff --git a/src/common/socket.h b/src/common/socket.h index b58cbdccf..82f8b84c3 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -50,7 +50,7 @@ } while(0) /* [Ind/Hercules] */ -#define RFIFO2PTR(fd,len) (void*)(session[fd]->rdata + len) +#define RFIFO2PTR(fd) (void*)(session[fd]->rdata + session[fd]->rdata_pos) // buffer I/O macros #define RBUFP(p,pos) (((uint8*)(p)) + (pos)) |