Commit 68712749 authored by Chen Bill's avatar Chen Bill Committed by GitHub

remove NULL (#687)

parent 9da90b8d
...@@ -39,10 +39,6 @@ typedef signed char int8; ...@@ -39,10 +39,6 @@ typedef signed char int8;
#define PROCESSOR_WAITING 0x10000000 #define PROCESSOR_WAITING 0x10000000
#define PROCESSOR_END 0x20000000 #define PROCESSOR_END 0x20000000
#ifndef NULL
#define NULL 0
#endif
#define MASTER_RULE3 3 //Master Rule 3 (2014) #define MASTER_RULE3 3 //Master Rule 3 (2014)
#define NEW_MASTER_RULE 4 //New Master Rule (2017) #define NEW_MASTER_RULE 4 //New Master Rule (2017)
#define MASTER_RULE_2020 5 //Master Rule 2020 #define MASTER_RULE_2020 5 //Master Rule 2020
......
...@@ -2371,7 +2371,7 @@ int32 scriptlib::card_is_can_be_placed_on_field(lua_State *L) { ...@@ -2371,7 +2371,7 @@ int32 scriptlib::card_is_can_be_placed_on_field(lua_State *L) {
if(lua_gettop(L) >= 3) if(lua_gettop(L) >= 3)
tolocation = (uint32)lua_tointeger(L, 3); tolocation = (uint32)lua_tointeger(L, 3);
if(pcard->is_status(STATUS_FORBIDDEN) if(pcard->is_status(STATUS_FORBIDDEN)
|| pcard->pduel->game_field->check_unique_onfield(pcard, toplayer, tolocation, NULL)) || pcard->pduel->game_field->check_unique_onfield(pcard, toplayer, tolocation, nullptr))
lua_pushboolean(L, 0); lua_pushboolean(L, 0);
else else
lua_pushboolean(L, 1); lua_pushboolean(L, 1);
...@@ -3696,7 +3696,7 @@ static const struct luaL_Reg cardlib[] = { ...@@ -3696,7 +3696,7 @@ static const struct luaL_Reg cardlib[] = {
{ "ResetNegateEffect", scriptlib::card_reset_negate_effect }, { "ResetNegateEffect", scriptlib::card_reset_negate_effect },
{ "AssumeProperty", scriptlib::card_assume_prop }, { "AssumeProperty", scriptlib::card_assume_prop },
{ "SetSPSummonOnce", scriptlib::card_set_spsummon_once }, { "SetSPSummonOnce", scriptlib::card_set_spsummon_once },
{ NULL, NULL } { nullptr, nullptr }
}; };
void scriptlib::open_cardlib(lua_State *L) { void scriptlib::open_cardlib(lua_State *L) {
luaL_newlib(L, cardlib); luaL_newlib(L, cardlib);
......
...@@ -204,7 +204,7 @@ static const struct luaL_Reg debuglib[] = { ...@@ -204,7 +204,7 @@ static const struct luaL_Reg debuglib[] = {
{ "ReloadFieldEnd", scriptlib::debug_reload_field_end }, { "ReloadFieldEnd", scriptlib::debug_reload_field_end },
{ "SetAIName", scriptlib::debug_set_ai_name }, { "SetAIName", scriptlib::debug_set_ai_name },
{ "ShowHint", scriptlib::debug_show_hint }, { "ShowHint", scriptlib::debug_show_hint },
{ NULL, NULL } { nullptr, nullptr }
}; };
void scriptlib::open_debuglib(lua_State *L) { void scriptlib::open_debuglib(lua_State *L) {
luaL_newlib(L, debuglib); luaL_newlib(L, debuglib);
......
...@@ -5030,7 +5030,7 @@ static const struct luaL_Reg duellib[] = { ...@@ -5030,7 +5030,7 @@ static const struct luaL_Reg duellib[] = {
{ "IsAbleToEnterBP", scriptlib::duel_is_able_to_enter_bp }, { "IsAbleToEnterBP", scriptlib::duel_is_able_to_enter_bp },
{ "SwapDeckAndGrave", scriptlib::duel_swap_deck_and_grave }, { "SwapDeckAndGrave", scriptlib::duel_swap_deck_and_grave },
{ "MajesticCopy", scriptlib::duel_majestic_copy }, { "MajesticCopy", scriptlib::duel_majestic_copy },
{ NULL, NULL } { nullptr, nullptr }
}; };
void scriptlib::open_duellib(lua_State *L) { void scriptlib::open_duellib(lua_State *L) {
luaL_newlib(L, duellib); luaL_newlib(L, duellib);
......
...@@ -659,7 +659,7 @@ static const struct luaL_Reg effectlib[] = { ...@@ -659,7 +659,7 @@ static const struct luaL_Reg effectlib[] = {
{ "GetActivateSequence", scriptlib::effect_get_activate_sequence }, { "GetActivateSequence", scriptlib::effect_get_activate_sequence },
{ "CheckCountLimit", scriptlib::effect_check_count_limit }, { "CheckCountLimit", scriptlib::effect_check_count_limit },
{ "UseCountLimit", scriptlib::effect_use_count_limit }, { "UseCountLimit", scriptlib::effect_use_count_limit },
{ NULL, NULL } { nullptr, nullptr }
}; };
void scriptlib::open_effectlib(lua_State *L) { void scriptlib::open_effectlib(lua_State *L) {
luaL_newlib(L, effectlib); luaL_newlib(L, effectlib);
......
...@@ -936,7 +936,7 @@ static const struct luaL_Reg grouplib[] = { ...@@ -936,7 +936,7 @@ static const struct luaL_Reg grouplib[] = {
{ "__sub", scriptlib::group_meta_sub }, { "__sub", scriptlib::group_meta_sub },
{ "__band", scriptlib::group_meta_band }, { "__band", scriptlib::group_meta_band },
{ "__bxor", scriptlib::group_meta_bxor }, { "__bxor", scriptlib::group_meta_bxor },
{ NULL, NULL } { nullptr, nullptr }
}; };
void scriptlib::open_grouplib(lua_State *L) { void scriptlib::open_grouplib(lua_State *L) {
luaL_newlib(L, grouplib); luaL_newlib(L, grouplib);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment