summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Hercules.xcodeproj/project.pbxproj100
-rw-r--r--src/char/char.c2
-rw-r--r--src/char/int_clan.c14
-rw-r--r--src/common/mmo.h3
-rw-r--r--src/common/socket.c4
-rw-r--r--src/login/lclif.p.h2
-rw-r--r--src/map/atcommand.c16
-rw-r--r--src/map/battle.c4
-rw-r--r--src/map/battle.h2
-rw-r--r--src/map/clan.c86
-rw-r--r--src/map/clif.c12
-rw-r--r--src/map/clif.h2
-rw-r--r--src/map/intif.c14
-rw-r--r--src/map/pc.c2
-rw-r--r--src/map/rodex.c14
-rw-r--r--src/map/script.c20
-rw-r--r--src/map/skill.h2
-rw-r--r--src/map/status.c4
-rw-r--r--src/map/status.h4
-rw-r--r--src/map/unit.c2
20 files changed, 164 insertions, 145 deletions
diff --git a/Hercules.xcodeproj/project.pbxproj b/Hercules.xcodeproj/project.pbxproj
index 2b1363e10..7bafbc338 100644
--- a/Hercules.xcodeproj/project.pbxproj
+++ b/Hercules.xcodeproj/project.pbxproj
@@ -10,6 +10,9 @@
755495841FEE5A0000CE4B7D /* int_rodex.c in Sources */ = {isa = PBXBuildFile; fileRef = 755495831FEE5A0000CE4B7D /* int_rodex.c */; };
755495871FEE5A1F00CE4B7D /* rodex.c in Sources */ = {isa = PBXBuildFile; fileRef = 755495851FEE5A1F00CE4B7D /* rodex.c */; };
A5296FCD1CAC40CF001ABCAC /* lclif.c in Sources */ = {isa = PBXBuildFile; fileRef = A5296FCA1CAC40CF001ABCAC /* lclif.c */; };
+ A530267B202D78CE0060E394 /* clan.c in Sources */ = {isa = PBXBuildFile; fileRef = A5302673202D78B00060E394 /* clan.c */; };
+ A530267F202D793C0060E394 /* int_clan.c in Sources */ = {isa = PBXBuildFile; fileRef = A530267D202D792F0060E394 /* int_clan.c */; };
+ A5302683202D7A1F0060E394 /* HPMHooking.Defs.inc in Sources */ = {isa = PBXBuildFile; fileRef = A5302682202D7A1F0060E394 /* HPMHooking.Defs.inc */; };
A5380CD71856CE3C0090CBC4 /* mapcache.c in Sources */ = {isa = PBXBuildFile; fileRef = A5380CD61856CE3C0090CBC4 /* mapcache.c */; };
A5380CD81856CE8A0090CBC4 /* console.c in Sources */ = {isa = PBXBuildFile; fileRef = A56CC692185643BB009EB79C /* console.c */; };
A5380CD91856CF4A0090CBC4 /* core.c in Sources */ = {isa = PBXBuildFile; fileRef = A56CC694185643BB009EB79C /* core.c */; };
@@ -228,6 +231,19 @@
A5296FCA1CAC40CF001ABCAC /* lclif.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lclif.c; path = src/login/lclif.c; sourceTree = SOURCE_ROOT; };
A5296FCB1CAC40CF001ABCAC /* lclif.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lclif.h; path = src/login/lclif.h; sourceTree = SOURCE_ROOT; };
A5296FCC1CAC40CF001ABCAC /* lclif.p.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lclif.p.h; path = src/login/lclif.p.h; sourceTree = SOURCE_ROOT; };
+ A5302672202D78B00060E394 /* packets_keys_main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = packets_keys_main.h; path = src/map/packets_keys_main.h; sourceTree = SOURCE_ROOT; };
+ A5302673202D78B00060E394 /* clan.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = clan.c; path = src/map/clan.c; sourceTree = SOURCE_ROOT; };
+ A5302674202D78B00060E394 /* constants.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = constants.inc; path = src/map/constants.inc; sourceTree = SOURCE_ROOT; };
+ A5302675202D78B10060E394 /* packets_shuffle_main.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = packets_shuffle_main.h; path = src/map/packets_shuffle_main.h; sourceTree = SOURCE_ROOT; };
+ A5302676202D78B10060E394 /* clan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = clan.h; path = src/map/clan.h; sourceTree = SOURCE_ROOT; };
+ A5302677202D78B10060E394 /* packets_keys_zero.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = packets_keys_zero.h; path = src/map/packets_keys_zero.h; sourceTree = SOURCE_ROOT; };
+ A5302678202D78B10060E394 /* packets_shuffle_zero.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = packets_shuffle_zero.h; path = src/map/packets_shuffle_zero.h; sourceTree = SOURCE_ROOT; };
+ A530267C202D792F0060E394 /* int_clan.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = int_clan.h; path = src/char/int_clan.h; sourceTree = SOURCE_ROOT; };
+ A530267D202D792F0060E394 /* int_clan.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = int_clan.c; path = src/char/int_clan.c; sourceTree = SOURCE_ROOT; };
+ A5302680202D79940060E394 /* HPMSymbols.inc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HPMSymbols.inc.h; path = src/common/HPMSymbols.inc.h; sourceTree = "<group>"; };
+ A5302681202D79940060E394 /* hercules.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hercules.h; path = src/common/hercules.h; sourceTree = "<group>"; };
+ A5302682202D7A1F0060E394 /* HPMHooking.Defs.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = HPMHooking.Defs.inc; path = src/plugins/HPMHooking/HPMHooking.Defs.inc; sourceTree = "<group>"; };
+ A5302684202D7A2F0060E394 /* HPMHooking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HPMHooking.h; path = src/plugins/HPMHooking.h; sourceTree = "<group>"; };
A5380CCD1856CE180090CBC4 /* mapcache */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mapcache; sourceTree = BUILT_PRODUCTS_DIR; };
A5380CD61856CE3C0090CBC4 /* mapcache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mapcache.c; path = src/tool/mapcache.c; sourceTree = "<group>"; };
A5467AD11A16FCB4008AFAA6 /* loginif.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loginif.c; path = src/char/loginif.c; sourceTree = SOURCE_ROOT; };
@@ -433,25 +449,22 @@
A5B894AC1A03CDFA005AD22E /* HPMchar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HPMchar.h; path = src/char/HPMchar.h; sourceTree = SOURCE_ROOT; };
A5B894B61A03CE25005AD22E /* HPMHooking_char.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = HPMHooking_char.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
A5B894BF1A03CE5D005AD22E /* HPMHooking_login.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = HPMHooking_login.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
- A5B894C01A03CEE1005AD22E /* HPMHooking_char.GetSymbol.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_char.GetSymbol.inc; path = src/plugins/HPMHooking/HPMHooking_char.GetSymbol.inc; sourceTree = "<group>"; };
- A5B894C11A03CEE1005AD22E /* HPMHooking_char.HookingPoints.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_char.HookingPoints.inc; path = src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc; sourceTree = "<group>"; };
- A5B894C21A03CEE1005AD22E /* HPMHooking_char.Hooks.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_char.Hooks.inc; path = src/plugins/HPMHooking/HPMHooking_char.Hooks.inc; sourceTree = "<group>"; };
- A5B894C31A03CEE1005AD22E /* HPMHooking_char.HPMHooksCore.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_char.HPMHooksCore.inc; path = src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc; sourceTree = "<group>"; };
- A5B894C41A03CEE1005AD22E /* HPMHooking_char.sources.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_char.sources.inc; path = src/plugins/HPMHooking/HPMHooking_char.sources.inc; sourceTree = "<group>"; };
- A5B894C51A03CEE1005AD22E /* HPMHooking_login.GetSymbol.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_login.GetSymbol.inc; path = src/plugins/HPMHooking/HPMHooking_login.GetSymbol.inc; sourceTree = "<group>"; };
- A5B894C61A03CEE1005AD22E /* HPMHooking_login.HookingPoints.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_login.HookingPoints.inc; path = src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc; sourceTree = "<group>"; };
- A5B894C71A03CEE1005AD22E /* HPMHooking_login.Hooks.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_login.Hooks.inc; path = src/plugins/HPMHooking/HPMHooking_login.Hooks.inc; sourceTree = "<group>"; };
- A5B894C81A03CEE1005AD22E /* HPMHooking_login.HPMHooksCore.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_login.HPMHooksCore.inc; path = src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc; sourceTree = "<group>"; };
- A5B894C91A03CEE1005AD22E /* HPMHooking_login.sources.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_login.sources.inc; path = src/plugins/HPMHooking/HPMHooking_login.sources.inc; sourceTree = "<group>"; };
- A5B894CA1A03CEE1005AD22E /* HPMHooking_map.GetSymbol.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_map.GetSymbol.inc; path = src/plugins/HPMHooking/HPMHooking_map.GetSymbol.inc; sourceTree = "<group>"; };
- A5B894CB1A03CEE1005AD22E /* HPMHooking_map.HookingPoints.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_map.HookingPoints.inc; path = src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc; sourceTree = "<group>"; };
- A5B894CC1A03CEE1005AD22E /* HPMHooking_map.Hooks.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_map.Hooks.inc; path = src/plugins/HPMHooking/HPMHooking_map.Hooks.inc; sourceTree = "<group>"; };
- A5B894CD1A03CEE1005AD22E /* HPMHooking_map.HPMHooksCore.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_map.HPMHooksCore.inc; path = src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc; sourceTree = "<group>"; };
- A5B894CE1A03CEE1005AD22E /* HPMHooking_map.sources.inc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.pascal; name = HPMHooking_map.sources.inc; path = src/plugins/HPMHooking/HPMHooking_map.sources.inc; sourceTree = "<group>"; };
+ A5B894C11A03CEE1005AD22E /* HPMHooking_char.HookingPoints.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; name = HPMHooking_char.HookingPoints.inc; path = src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc; sourceTree = "<group>"; };
+ A5B894C21A03CEE1005AD22E /* HPMHooking_char.Hooks.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; name = HPMHooking_char.Hooks.inc; path = src/plugins/HPMHooking/HPMHooking_char.Hooks.inc; sourceTree = "<group>"; };
+ A5B894C31A03CEE1005AD22E /* HPMHooking_char.HPMHooksCore.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; name = HPMHooking_char.HPMHooksCore.inc; path = src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc; sourceTree = "<group>"; };
+ A5B894C41A03CEE1005AD22E /* HPMHooking_char.sources.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; name = HPMHooking_char.sources.inc; path = src/plugins/HPMHooking/HPMHooking_char.sources.inc; sourceTree = "<group>"; };
+ A5B894C61A03CEE1005AD22E /* HPMHooking_login.HookingPoints.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; name = HPMHooking_login.HookingPoints.inc; path = src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc; sourceTree = "<group>"; };
+ A5B894C71A03CEE1005AD22E /* HPMHooking_login.Hooks.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; name = HPMHooking_login.Hooks.inc; path = src/plugins/HPMHooking/HPMHooking_login.Hooks.inc; sourceTree = "<group>"; };
+ A5B894C81A03CEE1005AD22E /* HPMHooking_login.HPMHooksCore.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; name = HPMHooking_login.HPMHooksCore.inc; path = src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc; sourceTree = "<group>"; };
+ A5B894C91A03CEE1005AD22E /* HPMHooking_login.sources.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; name = HPMHooking_login.sources.inc; path = src/plugins/HPMHooking/HPMHooking_login.sources.inc; sourceTree = "<group>"; };
+ A5B894CB1A03CEE1005AD22E /* HPMHooking_map.HookingPoints.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; name = HPMHooking_map.HookingPoints.inc; path = src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc; sourceTree = "<group>"; };
+ A5B894CC1A03CEE1005AD22E /* HPMHooking_map.Hooks.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; name = HPMHooking_map.Hooks.inc; path = src/plugins/HPMHooking/HPMHooking_map.Hooks.inc; sourceTree = "<group>"; };
+ A5B894CD1A03CEE1005AD22E /* HPMHooking_map.HPMHooksCore.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; name = HPMHooking_map.HPMHooksCore.inc; path = src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc; sourceTree = "<group>"; };
+ A5B894CE1A03CEE1005AD22E /* HPMHooking_map.sources.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; name = HPMHooking_map.sources.inc; path = src/plugins/HPMHooking/HPMHooking_map.sources.inc; sourceTree = "<group>"; };
A5F79468191CA34E002293AB /* HPMDataCheck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HPMDataCheck.h; path = src/common/HPMDataCheck.h; sourceTree = "<group>"; };
A5F79469191CA34E002293AB /* sysinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sysinfo.c; path = src/common/sysinfo.c; sourceTree = "<group>"; };
A5F7946A191CA34E002293AB /* sysinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sysinfo.h; path = src/common/sysinfo.h; sourceTree = "<group>"; };
- A5F7946B191CA34E002293AB /* sysinfo.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = sysinfo.inc; path = src/common/sysinfo.inc; sourceTree = "<group>"; };
+ A5F7946B191CA34E002293AB /* sysinfo.inc */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; name = sysinfo.inc; path = src/common/sysinfo.inc; sourceTree = "<group>"; };
A5F79476191CA3F4002293AB /* sysinfogen.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = sysinfogen.sh; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -560,15 +573,15 @@
A56CC66B18564315009EB79C /* login-server */ = {
isa = PBXGroup;
children = (
- A5296FCA1CAC40CF001ABCAC /* lclif.c */,
- A5296FCB1CAC40CF001ABCAC /* lclif.h */,
- A5296FCC1CAC40CF001ABCAC /* lclif.p.h */,
- A5B894A81A03CDD4005AD22E /* HPMlogin.c */,
- A5B894A91A03CDD4005AD22E /* HPMlogin.h */,
A56CC68118564387009EB79C /* account.c */,
A56CC68218564387009EB79C /* account.h */,
+ A5B894A81A03CDD4005AD22E /* HPMlogin.c */,
+ A5B894A91A03CDD4005AD22E /* HPMlogin.h */,
A56CC68318564387009EB79C /* ipban.c */,
A56CC68418564387009EB79C /* ipban.h */,
+ A5296FCA1CAC40CF001ABCAC /* lclif.c */,
+ A5296FCB1CAC40CF001ABCAC /* lclif.h */,
+ A5296FCC1CAC40CF001ABCAC /* lclif.p.h */,
A56CC68518564387009EB79C /* login.c */,
A56CC68618564387009EB79C /* login.h */,
A56CC68718564387009EB79C /* loginlog.c */,
@@ -580,18 +593,16 @@
A56CC6741856434D009EB79C /* char-server */ = {
isa = PBXGroup;
children = (
+ A56CC743185657D9009EB79C /* char.c */,
+ A56CC744185657D9009EB79C /* char.h */,
A5467AD71A16FD08008AFAA6 /* geoip.c */,
A5467AD81A16FD08008AFAA6 /* geoip.h */,
- A5467AD41A16FCDC008AFAA6 /* mapif.c */,
- A5467AD51A16FCDC008AFAA6 /* mapif.h */,
- A5467AD11A16FCB4008AFAA6 /* loginif.c */,
- A5467AD21A16FCB4008AFAA6 /* loginif.h */,
A5B894AB1A03CDFA005AD22E /* HPMchar.c */,
A5B894AC1A03CDFA005AD22E /* HPMchar.h */,
- A56CC743185657D9009EB79C /* char.c */,
- A56CC744185657D9009EB79C /* char.h */,
A56CC745185657D9009EB79C /* int_auction.c */,
A56CC746185657D9009EB79C /* int_auction.h */,
+ A530267D202D792F0060E394 /* int_clan.c */,
+ A530267C202D792F0060E394 /* int_clan.h */,
A56CC747185657D9009EB79C /* int_elemental.c */,
A56CC748185657D9009EB79C /* int_elemental.h */,
A56CC749185657D9009EB79C /* int_guild.c */,
@@ -614,6 +625,10 @@
A56CC758185657D9009EB79C /* int_storage.h */,
A56CC759185657D9009EB79C /* inter.c */,
A56CC75A185657D9009EB79C /* inter.h */,
+ A5467AD11A16FCB4008AFAA6 /* loginif.c */,
+ A5467AD21A16FCB4008AFAA6 /* loginif.h */,
+ A5467AD41A16FCDC008AFAA6 /* mapif.c */,
+ A5467AD51A16FCDC008AFAA6 /* mapif.h */,
A56CC75B185657D9009EB79C /* pincode.c */,
A56CC75C185657D9009EB79C /* pincode.h */,
);
@@ -637,8 +652,11 @@
A56CC77318565812009EB79C /* chat.h */,
A56CC77418565812009EB79C /* chrif.c */,
A56CC77518565812009EB79C /* chrif.h */,
+ A5302673202D78B00060E394 /* clan.c */,
+ A5302676202D78B10060E394 /* clan.h */,
A56CC77618565812009EB79C /* clif.c */,
A56CC77718565812009EB79C /* clif.h */,
+ A5302674202D78B00060E394 /* constants.inc */,
A56CC77818565812009EB79C /* date.c */,
A56CC77918565812009EB79C /* date.h */,
A56CC77A18565812009EB79C /* duel.c */,
@@ -674,6 +692,10 @@
A56CC79818565812009EB79C /* npc_chat.c */,
A56CC79918565812009EB79C /* npc.c */,
A56CC79A18565812009EB79C /* npc.h */,
+ A5302672202D78B00060E394 /* packets_keys_main.h */,
+ A5302677202D78B10060E394 /* packets_keys_zero.h */,
+ A5302675202D78B10060E394 /* packets_shuffle_main.h */,
+ A5302678202D78B10060E394 /* packets_shuffle_zero.h */,
A56CC79B18565812009EB79C /* packets_struct.h */,
A56CC79C18565812009EB79C /* packets.h */,
A56CC79D18565812009EB79C /* party.c */,
@@ -713,10 +735,6 @@
A56CC68D1856439A009EB79C /* common */ = {
isa = PBXGroup;
children = (
- A5F79468191CA34E002293AB /* HPMDataCheck.h */,
- A5F79469191CA34E002293AB /* sysinfo.c */,
- A5F7946A191CA34E002293AB /* sysinfo.h */,
- A5F7946B191CA34E002293AB /* sysinfo.inc */,
A56CC68E185643BB009EB79C /* atomic.h */,
A56CC68F185643BB009EB79C /* cbasetypes.h */,
A56CC690185643BB009EB79C /* conf.c */,
@@ -733,15 +751,18 @@
A56CC69B185643BB009EB79C /* ers.h */,
A56CC69E185643BB009EB79C /* grfio.c */,
A56CC69F185643BB009EB79C /* grfio.h */,
+ A5302681202D79940060E394 /* hercules.h */,
A56CC6A0185643BB009EB79C /* HPM.c */,
A56CC6A1185643BB009EB79C /* HPM.h */,
+ A5F79468191CA34E002293AB /* HPMDataCheck.h */,
A56CC6A2185643BB009EB79C /* HPMi.h */,
- A56CC6A3185643BB009EB79C /* memmgr.c */,
- A56CC6A4185643BB009EB79C /* memmgr.h */,
+ A5302680202D79940060E394 /* HPMSymbols.inc.h */,
A56CC6A5185643BB009EB79C /* mapindex.c */,
A56CC6A6185643BB009EB79C /* mapindex.h */,
A56CC6A7185643BB009EB79C /* md5calc.c */,
A56CC6A8185643BB009EB79C /* md5calc.h */,
+ A56CC6A3185643BB009EB79C /* memmgr.c */,
+ A56CC6A4185643BB009EB79C /* memmgr.h */,
A56CC6AB185643BB009EB79C /* mmo.h */,
A56CC6AC185643BB009EB79C /* mutex.c */,
A56CC6AD185643BB009EB79C /* mutex.h */,
@@ -758,6 +779,9 @@
A56CC6BE185643BB009EB79C /* sql.h */,
A56CC6BF185643BB009EB79C /* strlib.c */,
A56CC6C0185643BB009EB79C /* strlib.h */,
+ A5F79469191CA34E002293AB /* sysinfo.c */,
+ A5F7946A191CA34E002293AB /* sysinfo.h */,
+ A5F7946B191CA34E002293AB /* sysinfo.inc */,
A56CC6C2185643BB009EB79C /* thread.c */,
A56CC6C3185643BB009EB79C /* thread.h */,
A56CC6C4185643BB009EB79C /* timer.c */,
@@ -772,9 +796,9 @@
A56CC71A18564AC7009EB79C /* config */ = {
isa = PBXGroup;
children = (
- A56CC71F18564B00009EB79C /* general.h */,
A56CC71B18564AF7009EB79C /* const.h */,
A56CC71C18564AF7009EB79C /* core.h */,
+ A56CC71F18564B00009EB79C /* general.h */,
A56CC71D18564AF7009EB79C /* renewal.h */,
A56CC71E18564AF7009EB79C /* secure.h */,
);
@@ -835,22 +859,21 @@
A58A5A291858026F0099683E /* HPMHooking */ = {
isa = PBXGroup;
children = (
- A5B894C01A03CEE1005AD22E /* HPMHooking_char.GetSymbol.inc */,
A5B894C11A03CEE1005AD22E /* HPMHooking_char.HookingPoints.inc */,
A5B894C21A03CEE1005AD22E /* HPMHooking_char.Hooks.inc */,
A5B894C31A03CEE1005AD22E /* HPMHooking_char.HPMHooksCore.inc */,
A5B894C41A03CEE1005AD22E /* HPMHooking_char.sources.inc */,
- A5B894C51A03CEE1005AD22E /* HPMHooking_login.GetSymbol.inc */,
A5B894C61A03CEE1005AD22E /* HPMHooking_login.HookingPoints.inc */,
A5B894C71A03CEE1005AD22E /* HPMHooking_login.Hooks.inc */,
A5B894C81A03CEE1005AD22E /* HPMHooking_login.HPMHooksCore.inc */,
A5B894C91A03CEE1005AD22E /* HPMHooking_login.sources.inc */,
- A5B894CA1A03CEE1005AD22E /* HPMHooking_map.GetSymbol.inc */,
A5B894CB1A03CEE1005AD22E /* HPMHooking_map.HookingPoints.inc */,
A5B894CC1A03CEE1005AD22E /* HPMHooking_map.Hooks.inc */,
A5B894CD1A03CEE1005AD22E /* HPMHooking_map.HPMHooksCore.inc */,
A5B894CE1A03CEE1005AD22E /* HPMHooking_map.sources.inc */,
A58A5A271858025D0099683E /* HPMHooking.c */,
+ A5302682202D7A1F0060E394 /* HPMHooking.Defs.inc */,
+ A5302684202D7A2F0060E394 /* HPMHooking.h */,
);
name = HPMHooking;
sourceTree = "<group>";
@@ -1217,6 +1240,7 @@
A56CC6D5185643BB009EB79C /* des.c in Sources */,
A56CC6E7185643BB009EB79C /* mapindex.c in Sources */,
A56CC73A18564C05009EB79C /* strbuf.c in Sources */,
+ A5302683202D7A1F0060E394 /* HPMHooking.Defs.inc in Sources */,
A56CC6F0185643BB009EB79C /* mutex.c in Sources */,
A56CC6D2185643BB009EB79C /* db.c in Sources */,
A56CC711185643BB009EB79C /* thread.c in Sources */,
@@ -1266,6 +1290,7 @@
A56CC769185657D9009EB79C /* pincode.c in Sources */,
A56CC6F1185643BB009EB79C /* mutex.c in Sources */,
A56CC762185657D9009EB79C /* int_mail.c in Sources */,
+ A530267F202D793C0060E394 /* int_clan.c in Sources */,
A56CC706185643BB009EB79C /* socket.c in Sources */,
A56CC6D6185643BB009EB79C /* des.c in Sources */,
A56CC764185657D9009EB79C /* int_party.c in Sources */,
@@ -1347,6 +1372,7 @@
A56CC6E9185643BB009EB79C /* mapindex.c in Sources */,
A56CC7D918565812009EB79C /* searchstore.c in Sources */,
A56CC73318564C05009EB79C /* libconfig.c in Sources */,
+ A530267B202D78CE0060E394 /* clan.c in Sources */,
A56CC74218564C23009EB79C /* mt19937ar.c in Sources */,
A56CC7BD18565812009EB79C /* chat.c in Sources */,
755495871FEE5A1F00CE4B7D /* rodex.c in Sources */,
diff --git a/src/char/char.c b/src/char/char.c
index 2532ca154..aef35f216 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -1616,7 +1616,7 @@ int char_make_new_char_sql(struct char_session_data *sd, const char *name_, int
case JOB_NOVICE:
break;
default:
- return -2; // Char Creation Denied
+ return -2; // Char Creation Denied
}
//check other inputs
diff --git a/src/char/int_clan.c b/src/char/int_clan.c
index 76a9639c5..e68f6a655 100644
--- a/src/char/int_clan.c
+++ b/src/char/int_clan.c
@@ -43,10 +43,10 @@ struct inter_clan_interface *inter_clan;
/**
* Kick offline members of a clan
- *
+ *
* Perform the update on the DB to reset clan id to 0
* of the members that are inactive for too long
- *
+ *
* @param clan_id Id of the clan
* @param kick_interval Time needed to consider a player inactive and kick it
* @return 0 on failure, 1 on success
@@ -55,11 +55,11 @@ int inter_clan_kick_inactive_members(int clan_id, int kick_interval)
{
if (clan_id <= 0) {
ShowError("inter_clan_kick_inactive_members: Invalid clan id received '%d'\n", clan_id);
- Assert_retr(0, 0);
+ Assert_report(clan_id > 0);
return 0;
} else if (kick_interval <= 0) {
ShowError("inter_clan_kick_inactive_members: Invalid kick_interval received '%d'", kick_interval);
- Assert_retr(0, 0);
+ Assert_report(kick_interval > 0);
return 0;
}
@@ -77,7 +77,7 @@ int inter_clan_kick_inactive_members(int clan_id, int kick_interval)
/**
* Count members of a clan
- *
+ *
* @param clan_id Id of the clan
* @param kick_interval Time needed to consider a player inactive and ignore it on the count
*/
@@ -88,11 +88,11 @@ int inter_clan_count_members(int clan_id, int kick_interval)
if (clan_id <= 0) {
ShowError("inter_clan_count_members: Invalid clan id received '%d'\n", clan_id);
- Assert_retr(0, 0);
+ Assert_report(clan_id > 0);
return 0;
} else if (kick_interval <= 0) {
ShowError("inter_clan_count_member: Invalid kick_interval received '%d'", kick_interval);
- Assert_retr(0, 0);
+ Assert_report(kick_interval > 0);
return 0;
}
diff --git a/src/common/mmo.h b/src/common/mmo.h
index d7d0820b3..04daedca0 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -360,7 +360,7 @@ struct item {
char favorite;
unsigned char bound;
uint64 unique_id;
-
+
struct {
int16 index;
int16 value;
@@ -899,7 +899,6 @@ struct rodex_message {
struct {
struct item item;
int idx;
-
} items[RODEX_MAX_ITEM];
int64 zeny;
uint8 type;
diff --git a/src/common/socket.c b/src/common/socket.c
index d4b8bb43f..c74cd4661 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -1537,7 +1537,7 @@ void socket_close(int fd)
// Epoll based Event Dispatcher
epevent.data.fd = fd;
epevent.events = EPOLLIN;
- epoll_ctl(epfd, EPOLL_CTL_DEL, fd, &epevent); // removing the socket from epoll when it's being closed is not required but recommended
+ epoll_ctl(epfd, EPOLL_CTL_DEL, fd, &epevent); // removing the socket from epoll when it's being closed is not required but recommended
#endif // SOCKET_EPOLL
sShutdown(fd, SHUT_RDWR); // Disallow further reads/writes
@@ -1694,7 +1694,7 @@ void socket_init(void)
#else // SOCKET_EPOLL
// Epoll based Event Dispatcher:
- epfd = epoll_create(FD_SETSIZE); // 2.6.8 or newer ignores the expected socket amount argument
+ epfd = epoll_create(FD_SETSIZE); // 2.6.8 or newer ignores the expected socket amount argument
if(epfd == SOCKET_ERROR){
ShowError("Failed to Create Epoll Event Dispatcher: %s\n", error_msg());
exit(EXIT_FAILURE);
diff --git a/src/login/lclif.p.h b/src/login/lclif.p.h
index 024280b37..5c5c062d3 100644
--- a/src/login/lclif.p.h
+++ b/src/login/lclif.p.h
@@ -122,7 +122,7 @@ struct packet_CA_LOGIN4 {
*/
struct packet_CA_LOGIN_PCBANG {
int16 packet_id; ///< Packet ID (#PACKET_ID_CA_LOGIN_PCBANG)
- uint32 version; ///< Client Version
+ uint32 version; ///< Client Version
char id[24]; ///< Username
char password[24]; ///< Password
uint8 clienttype; ///< Client Type
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 29e8bf4f8..cb6428f1f 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -7596,7 +7596,7 @@ ACMD(mapflag) {
CHECKFLAG(noexppenalty); CHECKFLAG(pvp); CHECKFLAG(pvp_noparty); CHECKFLAG(pvp_noguild);
CHECKFLAG(pvp_nightmaredrop); CHECKFLAG(pvp_nocalcrank); CHECKFLAG(gvg_castle); CHECKFLAG(gvg);
CHECKFLAG(gvg_dungeon); CHECKFLAG(gvg_noparty); CHECKFLAG(battleground); CHECKFLAG(cvc);
- CHECKFLAG(nozenypenalty); CHECKFLAG(notrade); CHECKFLAG(noskill); CHECKFLAG(nowarp);
+ CHECKFLAG(nozenypenalty); CHECKFLAG(notrade); CHECKFLAG(noskill); CHECKFLAG(nowarp);
CHECKFLAG(nowarpto); CHECKFLAG(noicewall); CHECKFLAG(snow); CHECKFLAG(clouds);
CHECKFLAG(clouds2); CHECKFLAG(fog); CHECKFLAG(fireworks); CHECKFLAG(sakura);
CHECKFLAG(leaves); CHECKFLAG(nobaseexp);
@@ -8473,7 +8473,7 @@ void atcommand_commands_sub(struct map_session_data* sd, const int fd, AtCommand
}
}
if (count_bind > 0)
- clif->message(fd, line_buff); // Last Line
+ clif->message(fd, line_buff); // Last Line
count += count_bind;
}
@@ -9506,7 +9506,7 @@ ACMD(claninfo)
struct DBIterator *iter = db_iterator(clan->db);
struct clan *c;
int i, count;
-
+
for (c = dbi_first(iter); dbi_exists(iter); c = dbi_next(iter)) {
safesnprintf(atcmd_output, sizeof(atcmd_output), "Clan #%d:", c->clan_id);
clif->messagecolor_self(fd, COLOR_DEFAULT, atcmd_output);
@@ -9545,9 +9545,6 @@ ACMD(claninfo)
for (i = 0; i < VECTOR_LENGTH(c->allies); i++) {
struct clan_relationship *ally = &VECTOR_INDEX(c->allies, i);
- if (ally == NULL)
- continue;
-
safesnprintf(atcmd_output, sizeof(atcmd_output), "- - Ally #%d (Id: %d): %s", i + 1, ally->clan_id, ally->constant);
clif->messagecolor_self(fd, COLOR_DEFAULT, atcmd_output);
count++;
@@ -9559,14 +9556,11 @@ ACMD(claninfo)
safesnprintf(atcmd_output, sizeof(atcmd_output), "- Antagonists: %d", VECTOR_LENGTH(c->antagonists));
clif->messagecolor_self(fd, COLOR_DEFAULT, atcmd_output);
-
+
count = 0;
for (i = 0; i < VECTOR_LENGTH(c->antagonists); i++) {
struct clan_relationship *antagonist = &VECTOR_INDEX(c->antagonists, i);
- if (antagonist == NULL)
- continue;
-
safesnprintf(atcmd_output, sizeof(atcmd_output), "- - Antagonist #%d (Id: %d): %s", i + 1, antagonist->clan_id, antagonist->constant);
clif->messagecolor_self(fd, COLOR_DEFAULT, atcmd_output);
count++;
@@ -9575,7 +9569,7 @@ ACMD(claninfo)
if (count == 0) {
clif->messagecolor_self(fd, COLOR_DEFAULT, "- - No Antagonists Found!");
}
-
+
clif->messagecolor_self(fd, COLOR_DEFAULT, "============================");
}
dbi_destroy(iter);
diff --git a/src/map/battle.c b/src/map/battle.c
index d52d20f24..bd7e31d05 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -6799,7 +6799,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
} else if (!(map->list[m].flag.pvp && map->list[m].flag.pvp_noparty)
&& (!map->list[m].flag.battleground || sbg_id == tbg_id)) {
state |= BCT_PARTY;
- } else if (!map->list[m].flag.cvc || s_clan == t_clan) {
+ } else if (!map->list[m].flag.cvc || s_clan == t_clan) {
state |= BCT_PARTY;
} else {
state |= BCT_ENEMY;
@@ -7309,7 +7309,7 @@ static const struct battle_data {
{ "max_body_style", &battle_config.max_body_style, 4, 0, SHRT_MAX, },
{ "save_body_style", &battle_config.save_body_style, 0, 0, 1, },
{ "player_warp_keep_direction", &battle_config.player_warp_keep_direction, 0, 0, 1, },
- { "atcommand_levelup_events", &battle_config.atcommand_levelup_events, 0, 0, 1, },
+ { "atcommand_levelup_events", &battle_config.atcommand_levelup_events, 0, 0, 1, },
{ "bow_unequip_arrow", &battle_config.bow_unequip_arrow, 1, 0, 1, },
{ "max_summoner_parameter", &battle_config.max_summoner_parameter, 120, 10, 10000, },
{ "mvp_exp_reward_message", &battle_config.mvp_exp_reward_message, 0, 0, 1, },
diff --git a/src/map/battle.h b/src/map/battle.h
index 429249dca..8b7fea29f 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -546,7 +546,7 @@ struct Battle_Config {
// Warp Face Direction
int player_warp_keep_direction;
- int atcommand_levelup_events; // Enable atcommands trigger level up events for NPCs
+ int atcommand_levelup_events; // Enable atcommands trigger level up events for NPCs
int bow_unequip_arrow;
diff --git a/src/map/clan.c b/src/map/clan.c
index 6855e449d..865f5a4cd 100644
--- a/src/map/clan.c
+++ b/src/map/clan.c
@@ -94,7 +94,7 @@ struct clan *clan_searchname(const char *name)
/**
* Returns the first online character of clan
- *
+ *
* @param (struct clan *) c clan structure
* @return (struct map_session_data *)
*/
@@ -150,7 +150,7 @@ void clan_buff_end(struct map_session_data *sd, struct clan *c)
{
nullpo_retv(sd);
nullpo_retv(c);
-
+
if (c->buff.icon <= 0) {
return;
}
@@ -171,7 +171,7 @@ bool clan_join(struct map_session_data *sd, int clan_id)
struct clan_member m;
nullpo_ret(sd);
-
+
// Already joined a guild or clan
if (sd->status.guild_id > 0 || sd->guild != NULL) {
ShowError("clan_join: Player already joined in a guild. char_id: %d\n", sd->status.char_id);
@@ -200,24 +200,24 @@ bool clan_join(struct map_session_data *sd, int clan_id)
ShowError("clan_join: Clan '%s' already reached its max capacity!\n", c->name);
return false;
}
-
+
VECTOR_ENSURE(c->members, 1, 1);
-
+
m.sd = sd;
m.char_id = sd->status.char_id;
m.online = 1;
m.last_login = sd->status.last_login;
VECTOR_PUSH(c->members, m);
-
+
c->connect_member++;
c->member_count++;
-
+
sd->status.clan_id = c->clan_id;
sd->clan = c;
-
+
sc_start2(NULL, &sd->bl, SC_CLAN_INFO, 10000, 0, c->clan_id, INFINITE_DURATION);
status_calc_pc(sd, SCO_FORCE);
-
+
chrif->save(sd, 0);
clif->clan_basicinfo(sd);
clif->clan_onlinecount(c);
@@ -256,11 +256,11 @@ void clan_member_online(struct map_session_data *sd, bool first)
clif->clan_leave(sd);
return;
}
-
+
if (!c->received) {
return;
}
-
+
if (c->max_member <= c->member_count || VECTOR_LENGTH(c->members) >= c->max_member) {
ShowError("Clan System: More members than the maximum allowed in clan #%d\n", c->clan_id);
return;
@@ -270,7 +270,7 @@ void clan_member_online(struct map_session_data *sd, bool first)
inactivity = (int)(time(NULL) - sd->status.last_login);
if (i == INDEX_NOT_FOUND) {
struct clan_member m;
-
+
if (c->kick_time > 0 && inactivity > c->kick_time) {
sd->status.clan_id = 0;
sd->clan = NULL;
@@ -290,7 +290,7 @@ void clan_member_online(struct map_session_data *sd, bool first)
} else {
struct clan_member *m = &VECTOR_INDEX(c->members, i);
-
+
if (c->kick_time > 0 && inactivity > c->kick_time) {
if (m->online == 1) {
m->online = 0;
@@ -311,7 +311,7 @@ void clan_member_online(struct map_session_data *sd, bool first)
m->online = 1;
m->last_login = sd->status.last_login;
}
-
+
sd->clan = c;
c->connect_member++;
@@ -385,7 +385,7 @@ bool clan_leave(struct map_session_data *sd, bool first)
/**
* Sets a player offline
- *
+ *
* @param (struct map_session_data *) sd Player Data
*/
void clan_member_offline(struct map_session_data *sd)
@@ -394,9 +394,9 @@ void clan_member_offline(struct map_session_data *sd)
int i;
nullpo_retv(sd);
-
+
c = sd->clan;
-
+
if (c == NULL) {
return;
}
@@ -523,7 +523,7 @@ int clan_inactivity_kick(int tid, int64 tick, int id, intptr_t data)
if ((c = clan->search(id)) != NULL) {
if (!c->kick_time || c->tid != tid || tid == INVALID_TIMER || c->tid == INVALID_TIMER) {
ShowError("Timer Mismatch (Time: %d seconds) %d != %d", c->kick_time, c->tid, tid);
- Assert_retr(0, 0);
+ Assert_report(0);
return 0;
}
for (i = 0; i < VECTOR_LENGTH(c->members); i++) {
@@ -650,11 +650,11 @@ void clan_read_buffs(struct clan *c, struct config_setting_t *buff, const char *
int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool reload)
{
int total, s, valid = 0;
-
+
nullpo_retr(false, settings);
-
+
total = libconfig->setting_length(settings);
-
+
for (s = 0; s < total; s++) {
struct clan *c;
struct config_setting_t *cl, *buff, *allies, *antagonists;
@@ -668,7 +668,7 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool
ShowError("clan_read_db: Invalid Clan Id %d, skipping...\n", id);
return false;
}
-
+
if (clan->search(id) != NULL) {
ShowError("clan_read_db: Duplicate entry for Clan Id %d, skipping...\n", id);
return false;
@@ -677,18 +677,18 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool
ShowError("clan_read_db: failed to find 'Id' for clan #%d\n", s);
return false;
}
-
+
if (libconfig->setting_lookup_string(cl, "Const", &aConst)) {
if (!*aConst) {
ShowError("clan_read_db: Invalid Clan Const '%s', skipping...\n", aConst);
return false;
}
-
+
if (strlen(aConst) > NAME_LENGTH) {
ShowError("clan_read_db: Clan Name '%s' is longer than %d characters, skipping...\n", aConst, NAME_LENGTH);
return false;
}
-
+
if (clan->searchname(aConst) != NULL) {
ShowError("clan_read_db: Duplicate entry for Clan Const '%s', skipping...\n", aConst);
return false;
@@ -697,18 +697,18 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool
ShowError("clan_read_db: failed to find 'Const' for clan #%d\n", s);
return false;
}
-
+
if (libconfig->setting_lookup_string(cl, "Name", &aName)) {
if (!*aName) {
ShowError("clan_read_db: Invalid Clan Name '%s', skipping...\n", aName);
return false;
}
-
+
if (strlen(aName) > NAME_LENGTH) {
ShowError("clan_read_db: Clan Name '%s' is longer than %d characters, skipping...\n", aName, NAME_LENGTH);
return false;
}
-
+
if (clan->searchname(aName) != NULL) {
ShowError("clan_read_db: Duplicate entry for Clan Name '%s', skipping...\n", aName);
return false;
@@ -717,19 +717,19 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool
ShowError("clan_read_db: failed to find 'Name' for clan #%d\n", s);
return false;
}
-
+
if (!libconfig->setting_lookup_string(cl, "Leader", &aLeader)) {
ShowError("clan_read_db: failed to find 'Leader' for clan #%d\n", s);
return false;
}
-
+
if (!libconfig->setting_lookup_string(cl, "Map", &aMap)) {
ShowError("clan_read_db: failed to find 'Map' for clan #%d\n", s);
return false;
}
CREATE(c, struct clan, 1);
-
+
c->clan_id = id;
safestrncpy(c->constant, aConst, NAME_LENGTH);
safestrncpy(c->name, aName, NAME_LENGTH);
@@ -770,19 +770,19 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool
}
allies = libconfig->setting_get_member(cl, "Allies");
-
+
if (allies != NULL) {
int a = libconfig->setting_length(allies);
-
+
VECTOR_INIT(c->allies);
if (a > 0 && clan->max_relations > 0) {
const char *allyConst;
-
+
if (a > clan->max_relations) {
ShowWarning("clan_read_db: Clan %d has more allies(%d) than allowed(%d), reading only the first %d...\n", c->clan_id, a, clan->max_relations, clan->max_relations);
a = clan->max_relations;
}
-
+
VECTOR_ENSURE(c->allies, a, 1);
for (i = 0; i < a; i++) {
struct clan_relationship r;
@@ -810,12 +810,12 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool
VECTOR_INIT(c->antagonists);
if (a > 0 && clan->max_relations > 0) {
const char *antagonistConst;
-
+
if (a > clan->max_relations) {
ShowWarning("clan_read_db: Clan %d has more antagonists(%d) than allowed(%d), reading only the first %d...\n", c->clan_id, a, clan->max_relations, clan->max_relations);
a = clan->max_relations;
}
-
+
VECTOR_ENSURE(c->antagonists, a, 1);
for (i = 0; i < a; i++) {
struct clan_relationship r;
@@ -834,7 +834,7 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool
}
}
}
-
+
clan->read_db_additional_fields(c, cl, s, source);
if (c->kick_time > 0) {
c->tid = timer->add(timer->gettick() + c->check_time, clan->inactivity_kick, c->clan_id, 0);
@@ -846,13 +846,13 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool
VECTOR_INIT(c->members);
valid++;
}
-
+
// Validating Relations
if (valid > 0) {
struct DBIterator *iter = db_iterator(clan->db);
struct clan *c_ok, *c;
int i;
-
+
for (c_ok = dbi_first(iter); dbi_exists(iter); c_ok = dbi_next(iter)) {
i = VECTOR_LENGTH(c_ok->allies);
while ( i > 0) {
@@ -871,7 +871,7 @@ int clan_read_db_sub(struct config_setting_t *settings, const char *source, bool
i = VECTOR_LENGTH(c_ok->antagonists);
while ( i > 0) {
struct clan_relationship *r;
-
+
i--;
r = &VECTOR_INDEX(c_ok->antagonists, i);
if ((c = clan->searchname(r->constant)) == NULL) {
@@ -903,7 +903,7 @@ void clan_read_db(struct config_setting_t *settings, const char *source, bool re
if ((clans = libconfig->setting_get_member(settings, "clans")) != NULL) {
int read;
-
+
read = clan->read_db_sub(clans, source, reload);
if (read > 0) {
clan->set_constants();
@@ -988,7 +988,7 @@ void clan_config_read_additional_settings(struct config_setting_t *settings, con
* Reloads Clan DB
*/
void clan_reload(void)
-{
+{
clan->config_read(true);
}
diff --git a/src/map/clif.c b/src/map/clif.c
index ea239ba21..0000c7aba 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7409,7 +7409,7 @@ void clif_mvp_item(struct map_session_data *sd,int nameid)
/// 010b <exp>.L
void clif_mvp_exp(struct map_session_data *sd, unsigned int exp)
{
-#if PACKETVER >= 20131223 // Kro removed this packet [Napster]
+#if PACKETVER >= 20131223 // Kro removed this packet [Napster]
if (battle_config.mvp_exp_reward_message) {
char e_msg[CHAT_SIZE_MAX];
sprintf(e_msg, msg_txt(855), exp);
@@ -11889,8 +11889,8 @@ void clif_parse_ItemIdentify(int fd,struct map_session_data *sd)
clif_menuskill_clear(sd);
}
-/// Identifying item with right-click (CZ_REQ_ONECLICK_ITEMIDENTIFY).
-/// 0A35 <index>.W
+/// Identifying item with right-click (CZ_REQ_ONECLICK_ITEMIDENTIFY).
+/// 0A35 <index>.W
void clif_parse_OneClick_ItemIdentify(int fd, struct map_session_data *sd)
{
int cmd = RFIFOW(fd,0);
@@ -19358,10 +19358,10 @@ void clif_clan_basicinfo(struct map_session_data *sd)
len += NAME_LENGTH;
}
}
-
+
for (i = 0; i < VECTOR_LENGTH(c->antagonists); i++) {
struct clan_relationship *an = &VECTOR_INDEX(c->antagonists, i);
-
+
if ((antagonist = clan->search(an->clan_id)) != NULL) {
safestrncpy(WFIFOP(fd, len), antagonist->name, NAME_LENGTH);
len += NAME_LENGTH;
@@ -19384,7 +19384,7 @@ void clif_clan_onlinecount(struct clan *c)
struct PACKET_ZC_NOTIFY_CLAN_CONNECTINFO p;
nullpo_retv(c);
-
+
p.PacketType = clanOnlineCount;
p.NumConnect = c->connect_member;
p.NumTotal = c->max_member;
diff --git a/src/map/clif.h b/src/map/clif.h
index c393c4f64..0711546df 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -110,7 +110,7 @@ typedef enum send_target {
BG_AREA_WOS,
BG_QUEUE,
-
+
CLAN, // Clan System
} send_target;
diff --git a/src/map/intif.c b/src/map/intif.c
index c933ceb15..0e5cd3db2 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -751,7 +751,7 @@ int intif_party_leaderchange(int party_id,int account_id,int char_id)
/**
* Request clan member count
- *
+ *
* @param clan_id Id of the clan to have members counted
* @param kick_interval Interval of the inactivity kick
*/
@@ -759,7 +759,7 @@ int intif_clan_membercount(int clan_id, int kick_interval)
{
if (intif->CheckForCharServer() || clan_id == 0 || kick_interval <= 0)
return 0;
-
+
WFIFOHEAD(inter_fd, 10);
WFIFOW(inter_fd, 0) = 0x3044;
WFIFOL(inter_fd, 2) = clan_id;
@@ -791,7 +791,7 @@ void intif_parse_RecvClanMemberAction(int fd)
ShowError("intif_parse_RecvClanMemberAction: Received invalid clan_id '%d'\n", clan_id);
return;
}
-
+
if (count < 0) {
ShowError("intif_parse_RecvClanMemberAction: Received invalid member count value '%d'\n", count);
return;
@@ -2599,10 +2599,10 @@ void intif_parse_RodexNotifications(int fd)
/// Updates a mail
/// flag:
-/// 0 - user Read
-/// 1 - user got Zeny
-/// 2 - user got Items
-/// 3 - delete
+/// 0 - user Read
+/// 1 - user got Zeny
+/// 2 - user got Items
+/// 3 - delete
int intif_rodex_updatemail(int64 mail_id, int8 flag)
{
if (intif->CheckForCharServer())
diff --git a/src/map/pc.c b/src/map/pc.c
index c18fdee9e..0b30b1221 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1524,7 +1524,7 @@ int pc_reg_received(struct map_session_data *sd)
status_calc_pc(sd,SCO_FIRST|SCO_FORCE);
chrif->scdata_request(sd->status.account_id, sd->status.char_id);
-
+
if (sd->status.clan_id)
clan->member_online(sd, true);
diff --git a/src/map/rodex.c b/src/map/rodex.c
index dcecb6b8f..d5a6064cf 100644
--- a/src/map/rodex.c
+++ b/src/map/rodex.c
@@ -216,11 +216,11 @@ void rodex_check_player(struct map_session_data *sd, const char *name, int *base
/// @param title : Mail Title
/// @param zeny : Amount of zeny attached
/// Returns result code:
-/// RODEX_SEND_MAIL_SUCCESS = 0,
-/// RODEX_SEND_MAIL_FATAL_ERROR = 1,
-/// RODEX_SEND_MAIL_COUNT_ERROR = 2,
-/// RODEX_SEND_MAIL_ITEM_ERROR = 3,
-/// RODEX_SEND_MAIL_RECEIVER_ERROR = 4
+/// RODEX_SEND_MAIL_SUCCESS = 0,
+/// RODEX_SEND_MAIL_FATAL_ERROR = 1,
+/// RODEX_SEND_MAIL_COUNT_ERROR = 2,
+/// RODEX_SEND_MAIL_ITEM_ERROR = 3,
+/// RODEX_SEND_MAIL_RECEIVER_ERROR = 4
int rodex_send_mail(struct map_session_data *sd, const char *receiver_name, const char *body, const char *title, int64 zeny)
{
int i;
@@ -532,8 +532,8 @@ void rodex_get_items(struct map_session_data *sd, int8 opentype, int64 mail_id)
/// - should be called everytime we're going to stop using rodex in this character
/// @param sd : Target to clean
/// @param flag :
-/// 0 - clear everything
-/// 1 - clear tmp only
+/// 0 - clear everything
+/// 1 - clear tmp only
void rodex_clean(struct map_session_data *sd, int8 flag)
{
nullpo_retv(sd);
diff --git a/src/map/script.c b/src/map/script.c
index 36f37abb9..26de803d7 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -8284,7 +8284,7 @@ BUILDIN(makeitem2)
map->search_freecell(NULL, m, &x, &y, -1, -1, 1);
} else {
range = (script_hasdata(st, 14) ? cap_value(script_getnum(st, 14), 1, battle_config.area_size) : 3);
- map->search_freecell(&sd->bl, sd->bl.m, &x, &y, range, range, 0); // Locate spot next to player.
+ map->search_freecell(&sd->bl, sd->bl.m, &x, &y, range, range, 0); // Locate spot next to player.
}
}
@@ -8635,7 +8635,7 @@ BUILDIN(readparam) {
BUILDIN(getcharid) {
int num = script_getnum(st, 2);
struct map_session_data *sd;
-
+
if (script_hasdata(st, 3))
sd = map->nick2sd(script_getstr(st, 3));
else
@@ -8647,22 +8647,22 @@ BUILDIN(getcharid) {
}
switch (num) {
- case 0:
+ case 0:
script_pushint(st, sd->status.char_id);
break;
- case 1:
+ case 1:
script_pushint(st, sd->status.party_id);
break;
- case 2:
+ case 2:
script_pushint(st, sd->status.guild_id);
break;
- case 3:
+ case 3:
script_pushint(st, sd->status.account_id);
break;
- case 4:
+ case 4:
script_pushint(st, sd->bg_id);
break;
- case 5:
+ case 5:
script_pushint(st, sd->status.clan_id);
break;
default:
@@ -23943,7 +23943,7 @@ BUILDIN(clan_master)
{
struct npc_data *nd = map->id2nd(st->oid);
int clan_id = script_getnum(st, 2);
-
+
if (nd == NULL) {
script_pushint(st, false);
return false;
@@ -24664,7 +24664,7 @@ void script_parse_builtin(void) {
BUILDIN_DEF(clan_join,"i?"),
BUILDIN_DEF(clan_leave,"?"),
BUILDIN_DEF(clan_master,"i"),
-
+
BUILDIN_DEF(channelmes, "ss"),
BUILDIN_DEF(addchannelhandler, "ss"),
BUILDIN_DEF(removechannelhandler, "ss"),
diff --git a/src/map/skill.h b/src/map/skill.h
index bd4d82df2..d7590921a 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -1371,7 +1371,7 @@ enum e_skill {
GM_FORCE_TRANSFER,
GM_WIDE_RESURRECTION,
ALL_NIFLHEIM_RECALL,
- ALL_PRONTERA_RECALL,
+ ALL_PRONTERA_RECALL,
ALL_GLASTHEIM_RECALL,
ALL_THANATOS_RECALL,
diff --git a/src/map/status.c b/src/map/status.c
index 3bb511970..3e4b4a45c 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -9763,8 +9763,8 @@ int status_get_val_flag(enum sc_type type)
{
int val_flag = 0;
switch (type) {
- case SC_CLAN_INFO:
- val_flag |= 1 | 2;
+ case SC_CLAN_INFO:
+ val_flag |= 1 | 2;
break;
case SC_FIGHTINGSPIRIT:
val_flag |= 1 | 2;
diff --git a/src/map/status.h b/src/map/status.h
index 66e773720..5a031fa48 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -838,9 +838,9 @@ typedef enum sc_type {
SC_BITESCAR,
SC_ARCLOUSEDASH,
SC_TUNAPARTY,
- SC_SHRIMP, // 650
+ SC_SHRIMP, // 650
SC_FRESHSHRIMP,
-
+
SC_DRESS_UP,
// Rodex
diff --git a/src/map/unit.c b/src/map/unit.c
index 6e98fc093..938b587f3 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -2058,7 +2058,7 @@ bool unit_can_reach_bl(struct block_list *bl,struct block_list *tbl, int range,
#ifdef OFFICIAL_WALKPATH
if( !path->search_long(NULL, bl, bl->m, bl->x, bl->y, tbl->x-dx, tbl->y-dy, CELL_CHKNOPASS) // Check if there is an obstacle between
- && wpd.path_len > 14 // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett]
+ && wpd.path_len > 14 // Official number of walkable cells is 14 if and only if there is an obstacle between. [malufett]
&& (bl->type != BL_NPC) ) // If type is a NPC, please disregard.
return false;
#endif
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-12 17:42:47 +0000