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

hide functions for yaml2sql (#7390)

Browse Source 
yaml2sql uses some headers for constants from map-server.
In order to avoid linker errros, no functions from those headers
must be used.
However, some static functions are the status.hpp which cause
linker errors when creating a debug build.
The define `ONLY_CONSTANTS` hides those funcitons for yaml2sql.

refs #7389

Co-authored-by: Vincent Stumpf <vincents.995@gmail.com>
This commit is contained in:
Dominik Nussbaumer 2023-02-03 08:51:46 +01:00 committed by GitHub
parent a1f9a6c1d1
commit e2ee5cbefb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/map/status.hpp
View File

@ -3246,7 +3246,7 @@ public:
void deleteSCE(enum sc_type type);
void clearSCE(enum sc_type type);
};
#ifndef ONLY_CONSTANTS
int status_damage( struct block_list *src, struct block_list *target, int64 dhp, int64 dsp, int64 dap, t_tick walkdelay, int flag, uint16 skill_id );
static int status_damage( struct block_list *src, struct block_list *target, int64 dhp, int64 dsp, t_tick walkdelay, int flag, uint16 skill_id ){
return status_damage( src, target, dhp, dsp, 0, walkdelay, flag, skill_id );
@ -3462,5 +3462,6 @@ uint16 status_efst_get_bl_type(enum efst_type efst);
void status_readdb( bool reload = false );
void do_init_status(void);
void do_final_status(void);
#endif /* ONLY_CONSTANTS */
#endif /* STATUS_HPP */

1
src/tool/yaml.hpp
View File

@ -37,6 +37,7 @@
#endif
// Only for constants - do not use functions of it or linking will fail
#define ONLY_CONSTANTS
#include "../map/achievement.hpp"
#include "../map/battle.hpp"
#include "../map/battleground.hpp"

1
src/tool/yaml2sql.cpp
View File

@ -34,6 +34,7 @@
#endif
// Only for constants - do not use functions of it or linking will fail
#define ONLY_CONSTANTS
#include "../map/achievement.hpp"
#include "../map/battle.hpp"
#include "../map/battleground.hpp"