Implement code changes required to compile Hercules as C++ by hemagx · Pull Request #3487 · HerculesWS/Hercules

hemagx · 2026-09-17T12:05:45Z

Pull Request Prelude

I have followed proper Hercules code styling.
I have read and understood the contribution guidelines before making this PR.
I am aware that this PR may be closed if the above-mentioned criteria are not fulfilled.

Changes Proposed

Implementing bare-minimum changes to compile hercules code as C++, the changes proposed are mostly fixes to warnings produced by C++ rules, type fixes and type casts and replacement of C features/compile features with their C++ counterpart.

Issues addressed:

MrKeiKun

Nicesu @MishimaHaruna @hemagx

cap_value() vs std::clamp() isn't equivalent. The old macro coped with a backwards min/max; std::clamp treats it as undefined behavior.

Signed-off-by: Haru <haru@dotalux.com>

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

Signed-off-by: Haru <haru@dotalux.com> Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

enum look was a leftover from a previous implementation that was outside hercules. The enum represent fake item ids so it has been renamed to avoid the conflict Signed-off-by: Haru <haru@dotalux.com>

Signed-off-by: Haru <haru@dotalux.com>

…d automatically cast to that type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com>

…tically cast to that type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com>

…atically cast to that type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com>

Signed-off-by: Haru <haru@dotalux.com>

…ropriate expected type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com> Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

… functions to the appropriate expected type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com> Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

… of functions to the appropriate expected type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com> Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

…prev}() functions to the appropriate expected type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com> Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

…loc family of functions functions to the appropriate expected type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com> Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

… the appropriate expected type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com> Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

…sion Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

…s for handling script errors Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

* Changed storage class and visibility of several symbols to ensure they are correctly exported and imported, and that they don't cause ODR violations Signed-off-by: Ibrahim Zidan <brahem@aotsw.com> Co-authored by: Haru <haru@dotalux.com> Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

…remove the macros Signed-off-by: Haru <haru@dotalux.com>

… macro Signed-off-by: Haru <haru@dotalux.com>

…ith its c++ expansion Signed-off-by: Haru <haru@dotalux.com>

Signed-off-by: Haru <haru@dotalux.com>

…ntax Signed-off-by: Haru <haru@dotalux.com>

Signed-off-by: Haru <haru@dotalux.com>

…native annotation [[fallthrough]] Signed-off-by: Haru <haru@dotalux.com>

Signed-off-by: Haru <haru@dotalux.com>

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

…ows it Signed-off-by: Haru <haru@dotalux.com>

The standard C++ [[noreturn]] supersedes it Signed-off-by: Haru <haru@dotalux.com>

Signed-off-by: Haru <haru@dotalux.com>

hemagx requested review from MishimaHaruna and guilherme-gm and removed request for guilherme-gm September 17, 2026 12:17

MrKeiKun reviewed Sep 17, 2026

View reviewed changes

Comment thread src/map/script.cpp

Comment thread src/map/status.cpp

Comment thread src/map/status.cpp

Comment thread src/map/skill.c Outdated

Comment thread src/map/skill.cpp

Add the 'ninjac' alias for ninja, providing colorful output

a34af67

Signed-off-by: Haru <haru@dotalux.com>

MishimaHaruna force-pushed the compile_cpp branch from 5293ecb to ecb5171 Compare September 17, 2026 19:34

hemagx added 3 commits September 17, 2026 23:41

Fix HPMHooks data check generator marking API server as unknown type

06e1158

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

HPM Hooks Update

4d6e609

Signed-off-by: Haru <haru@dotalux.com> Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

Fix a call to mob_db() bypassing the mob->db() interface

b0773c1

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

hemagx force-pushed the compile_cpp branch from ecb5171 to a66aa0a Compare September 17, 2026 20:41

MishimaHaruna added 3 commits September 17, 2026 22:43

Fix a conflicting enum name used in test_equippos

fe623b7

enum look was a leftover from a previous implementation that was outside hercules. The enum represent fake item ids so it has been renamed to avoid the conflict Signed-off-by: Haru <haru@dotalux.com>

Remove the use of gcc extensions in test_equippos

780f451

Signed-off-by: Haru <haru@dotalux.com>

Fix missing initializer warnings in test_equippos in gcc

3feba1b

Signed-off-by: Haru <haru@dotalux.com>

MishimaHaruna force-pushed the compile_cpp branch from a66aa0a to 376d1e1 Compare September 17, 2026 20:43

MishimaHaruna added 8 commits September 17, 2026 23:03

Change WFIFO2PTR/WP2PTR macros to take an additional type argument an…

88c8ebb

…d automatically cast to that type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com>

Change RFIFO2PTR/RP2PTR macros to take an additional type argument an…

6b8894b

…d automatically cast to that type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com>

Change the WBUFP macro to take an additional type argument and automa…

53380c8

…tically cast to that type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com>

Change the RBUFP macro to take an additional type argument and automa…

3131867

…tically cast to that type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com>

Change the WFIFOP macro to take an additional type argument and autom…

a8ee10e

…atically cast to that type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com>

Change the RFIFOP macro to take an additional type argument and autom…

d14ab6e

…atically cast to that type This prepares the code to the c++ conversion, removing implicit casts from void* to other pointer types Signed-off-by: Haru <haru@dotalux.com>

Replace WFIFOP() with WP2PTR() where appropriate

50982ef

Signed-off-by: Haru <haru@dotalux.com>

Replace RFIFOP() with RP2PTR() where appropriate

06f153f

Signed-off-by: Haru <haru@dotalux.com>

MishimaHaruna force-pushed the compile_cpp branch 2 times, most recently from 07237c1 to b06831e Compare September 17, 2026 21:38

hemagx added 6 commits September 18, 2026 00:52

hemagx added 4 commits September 19, 2026 18:24

Change GUARD_MAP_LOCK to use class instead of gcc __cleanup__ exten…

b9d3693

…sion Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

Temporary disable C4611 warning on _setjmp until we move to exception…

1af6a2a

…s for handling script errors Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

Apply required changes for tests to compile as C++

3442912

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

hemagx force-pushed the compile_cpp branch from eccc6dd to 30f958c Compare September 19, 2026 15:24

MishimaHaruna added 10 commits September 19, 2026 17:25

Replace HMIN, HMAX, HSWAP, HSWAP_PTR with their STL counterparts and …

cd7ab04

…remove the macros Signed-off-by: Haru <haru@dotalux.com>

Replace the custom cap_value() macro with std::clamp() and remove the…

674b76d

… macro Signed-off-by: Haru <haru@dotalux.com>

Remove the no longer necessary ZERO_INITIALIZED macro, replacing it w…

2f674b2

…ith its c++ expansion Signed-off-by: Haru <haru@dotalux.com>

HPM Hooks Update

4684e69

Signed-off-by: Haru <haru@dotalux.com>

Remove usage of the CXX_ENUM_TYPE macro in favor of the native C++ sy…

33f6e89

…ntax Signed-off-by: Haru <haru@dotalux.com>

Remove the now unnecessary CXX_ENUM_TYPE macro

5977208

Signed-off-by: Haru <haru@dotalux.com>

Replace STATIC_ASSERT() with the C++ syntax, static_assert()

19ed1a9

Signed-off-by: Haru <haru@dotalux.com>

Replace FALLTHROUGH macro calls with an empty statement with the C++ …

bcf2d9e

…native annotation [[fallthrough]] Signed-off-by: Haru <haru@dotalux.com>

Remove several no longer necessary extern C blocks

e3a6725

Signed-off-by: Haru <haru@dotalux.com>

Remove some old C specific code that is no longer in use

2b0dd2e

Signed-off-by: Haru <haru@dotalux.com>

MishimaHaruna force-pushed the compile_cpp branch from 30f958c to 2b0dd2e Compare September 19, 2026 15:25

hemagx force-pushed the compile_cpp branch from 55a13e7 to 1ec7694 Compare September 19, 2026 18:04

hemagx added 2 commits September 19, 2026 21:12

Change script parsing errors from a longjmp to a C++ exception

ba89c56

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

Addition of a .clang-format file with currently recommended coding style

d8cc74e

Signed-off-by: Ibrahim Zidan <brahem@aotsw.com>

hemagx force-pushed the compile_cpp branch from 1ec7694 to d8cc74e Compare September 19, 2026 18:13

MishimaHaruna added 3 commits September 19, 2026 20:43

Mark disp_error_message2() as noreturn and remove dead code that foll…

d7686bf

…ows it Signed-off-by: Haru <haru@dotalux.com>

Remove the now no longer useful analyzer_noreturn attribute

a07fad0

The standard C++ [[noreturn]] supersedes it Signed-off-by: Haru <haru@dotalux.com>

Rename C++ source files to *.cpp

47be818

Signed-off-by: Haru <haru@dotalux.com>

MishimaHaruna force-pushed the compile_cpp branch from 165c564 to 47be818 Compare September 19, 2026 21:21

MishimaHaruna approved these changes Sep 19, 2026

View reviewed changes

guilherme-gm reviewed Sep 20, 2026

View reviewed changes

Comment thread src/map/clif.c

hemagx added this to the Release v2026.09 milestone Sep 20, 2026

guilherme-gm approved these changes Sep 20, 2026

View reviewed changes

hemagx merged commit 9d30487 into master Sep 21, 2026
236 of 237 checks passed

hemagx deleted the compile_cpp branch September 21, 2026 21:49

Navigation Menu

Implement code changes required to compile Hercules as C++ - #3487

Implement code changes required to compile Hercules as C++#3487
hemagx merged 105 commits into
masterfrom
compile_cpp

hemagx commented Sep 17, 2026

Uh oh!

MrKeiKun left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

hemagx commented Sep 17, 2026

Pull Request Prelude

Changes Proposed

Uh oh!

MrKeiKun left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants