Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Checked some preprocessors on mmo.h and core.h

Browse Source 
Signed-off-by: Cydh Ramdh <cydh@pservero.com>
This commit is contained in:
Cydh Ramdh
2015-09-09 21:05:07 +07:00
parent c8ec605656
commit e933db556f
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/mmo.h
View File

@@ -6,6 +6,7 @@
#include "cbasetypes.h"
#include "../common/db.h"
#include "../config/core.h"
#include <time.h>
// server->client protocol version
@@ -31,14 +32,14 @@
#define HOTKEY_SAVING
#if PACKETVER < 20090603
// (27 = 9 skills x 3 bars) (0x02b9,191)
#define MAX_HOTKEYS 27
// (27 = 9 skills x 3 bars) (0x02b9,191)
#define MAX_HOTKEYS 27
#elif PACKETVER < 20090617
// (36 = 9 skills x 4 bars) (0x07d9,254)
#define MAX_HOTKEYS 36
// (36 = 9 skills x 4 bars) (0x07d9,254)
#define MAX_HOTKEYS 36
#else
// (38 = 9 skills x 4 bars & 2 Quickslots)(0x07d9,268)
#define MAX_HOTKEYS 38
// (38 = 9 skills x 4 bars & 2 Quickslots)(0x07d9,268)
#define MAX_HOTKEYS 38
#endif
#define MAX_MAP_PER_SERVER 1500 /// Increased to allow creation of Instance Maps
@@ -812,11 +813,18 @@ enum e_pc_reg_loading {
PRL_ALL = 0xFF,
};
// sanity checks...
// Sanity checks...
#if MAX_ZENY > INT_MAX
#error MAX_ZENY is too big
#endif
#ifndef VIP_ENABLE
#define MIN_STORAGE MAX_STORAGE // If the VIP system is disabled the min = max.
#define MIN_CHARS MAX_CHARS // Default number of characters per account.
#define MAX_CHAR_BILLING 0
#define MAX_CHAR_VIP 0
#endif
#if (MIN_CHARS + MAX_CHAR_VIP + MAX_CHAR_BILLING) > MAX_CHARS
#error Config of MAX_CHARS is invalid
#endif

5
src/config/core.h
View File

@@ -78,11 +78,6 @@
#define MIN_CHARS 3 // Default number of characters per account.
#define MAX_CHAR_VIP 6 // This must be less than MAX_CHARS
#define MAX_CHAR_BILLING 0 // This must be less than MAX_CHARS
#else
#define MIN_STORAGE MAX_STORAGE // If the VIP system is disabled the min = max.
#define MIN_CHARS MAX_CHARS // Default number of characters per account.
#define MAX_CHAR_BILLING 0
#define MAX_CHAR_VIP 0
#endif
/// Comment to disable the official packet obfuscation support.