Merge remote-tracking branch 'upstream/master' into develop

.github/workflows/build.yml

@@ -24,10 +24,10 @@ jobs:
 
     - name: Premake
       run: |
-        7z x temp/premake-5.0.0-beta2-windows.zip -opremake-5
-        move premake/lua.lua lua/premake5.lua
-        move premake/dll.lua dll.lua
-        ./premake-5/premake5.exe vs2022 --file=dll.lua
+        7z x temp\premake-5.0.0-beta2-windows.zip -opremake-5
+        copy premake\lua.lua lua\premake5.lua
+        copy premake\dll.lua dll.lua
+        .\premake-5\premake5.exe vs2022 --file=dll.lua
 
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v2

field.cpp

@@ -2294,9 +2294,9 @@ int32_t field::check_spsummon_counter(uint8_t playerid, uint8_t ct) {
 bool field::is_select_hide_deck_sequence(uint8_t playerid) {
 	return !core.select_deck_sequence_revealed && !(core.duel_options & DUEL_REVEAL_DECK_SEQ) && playerid == core.selecting_player;
 }
-int32_t field::check_lp_cost(uint8_t playerid, uint32_t lp, uint32_t must_pay) {
+int32_t field::check_lp_cost(uint8_t playerid, int32_t cost, uint32_t must_pay) {
 	effect_set eset;
-	int32_t val = lp;
+	int32_t val = cost;
 	filter_player_effect(playerid, EFFECT_LPCOST_CHANGE, &eset);
 	for(int32_t i = 0; i < eset.size(); ++i) {
 		pduel->lua->add_param(core.reason_effect, PARAM_TYPE_EFFECT);
@@ -2313,7 +2313,7 @@ int32_t field::check_lp_cost(uint8_t playerid, uint32_t lp, uint32_t must_pay) {
 		tevent e;
 		e.event_cards = 0;
 		e.event_player = playerid;
-		e.event_value = lp;
+		e.event_value = cost;
 		e.reason = 0;
 		e.reason_effect = core.reason_effect;
 		e.reason_player = playerid;

field.h

@@ -455,7 +455,7 @@ public:
 	int32_t check_spsummon_counter(uint8_t playerid, uint8_t ct = 1);
 	bool is_select_hide_deck_sequence(uint8_t playerid);
 
-	int32_t check_lp_cost(uint8_t playerid, uint32_t cost, uint32_t must_pay);
+	int32_t check_lp_cost(uint8_t playerid, int32_t cost, uint32_t must_pay);
 	void save_lp_cost() {}
 	void restore_lp_cost() {}
 	int32_t pay_lp_cost(uint32_t step, uint8_t playerid, uint32_t cost, uint32_t must_pay);

ocgapi.cpp

@@ -41,8 +41,8 @@ uint32_t read_card(uint32_t code, card_data* data) {
 	}
 	return creader(code, data);
 }
-uint32_t handle_message(void* pduel, uint32_t msg_type) {
-	return mhandler((intptr_t)pduel, msg_type);
+uint32_t handle_message(void* pduel, uint32_t message_type) {
+	return mhandler((intptr_t)pduel, message_type);
 }
 byte* default_script_reader(const char* script_name, int* slen) {
 	FILE *fp;