Skip to content

Y
ygopro-core
Commit 1f6e9845 authored by 神楽坂玲奈's avatar 神楽坂玲奈
Browse files
Options

remove ptr

parent eca92fe7
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 54 deletions
common.h
View file @ 1f6e9845
...@@ -8,13 +8,11 @@ ...@@ -8,13 +8,11 @@
#ifndef COMMON_H_ #ifndef COMMON_H_
#define COMMON_H_ #define COMMON_H_
typedef void* uptr;
typedef unsigned long long uint64; typedef unsigned long long uint64;
typedef unsigned int uint32; typedef unsigned int uint32;
typedef unsigned short uint16; typedef unsigned short uint16;
typedef unsigned char uint8; typedef unsigned char uint8;
typedef unsigned char byte; typedef unsigned char byte;
typedef void* ptr;
typedef long long int64; typedef long long int64;
typedef int int32; typedef int int32;
typedef short int16; typedef short int16;
......
effect.cpp
View file @ 1f6e9845
...@@ -401,7 +401,7 @@ int32 effect::is_activate_ready(effect* reason_effect, uint8 playerid, const tev ...@@ -401,7 +401,7 @@ int32 effect::is_activate_ready(effect* reason_effect, uint8 playerid, const tev
pduel->lua->add_param(e.reason_effect, PARAM_TYPE_EFFECT); pduel->lua->add_param(e.reason_effect, PARAM_TYPE_EFFECT);
pduel->lua->add_param(e.reason, PARAM_TYPE_INT); pduel->lua->add_param(e.reason, PARAM_TYPE_INT);
pduel->lua->add_param(e.reason_player, PARAM_TYPE_INT); pduel->lua->add_param(e.reason_player, PARAM_TYPE_INT);
pduel->lua->add_param((ptr)0, PARAM_TYPE_INT); pduel->lua->add_param(0, PARAM_TYPE_INT);
if(!pduel->lua->check_condition(cost, 9)) { if(!pduel->lua->check_condition(cost, 9)) {
return FALSE; return FALSE;
} }
...@@ -415,7 +415,7 @@ int32 effect::is_activate_ready(effect* reason_effect, uint8 playerid, const tev ...@@ -415,7 +415,7 @@ int32 effect::is_activate_ready(effect* reason_effect, uint8 playerid, const tev
pduel->lua->add_param(e.reason_effect, PARAM_TYPE_EFFECT); pduel->lua->add_param(e.reason_effect, PARAM_TYPE_EFFECT);
pduel->lua->add_param(e.reason, PARAM_TYPE_INT); pduel->lua->add_param(e.reason, PARAM_TYPE_INT);
pduel->lua->add_param(e.reason_player, PARAM_TYPE_INT); pduel->lua->add_param(e.reason_player, PARAM_TYPE_INT);
pduel->lua->add_param((ptr)0, PARAM_TYPE_INT); pduel->lua->add_param(0, PARAM_TYPE_INT);
if(!pduel->lua->check_condition(target, 9)) { if(!pduel->lua->check_condition(target, 9)) {
return FALSE; return FALSE;
} }
......
field.cpp
View file @ 1f6e9845
...@@ -3320,7 +3320,7 @@ int32 field::check_chain_target(uint8 chaincount, card * pcard) { ...@@ -3320,7 +3320,7 @@ int32 field::check_chain_target(uint8 chaincount, card * pcard) {
pduel->lua->add_param(pchain->evt.reason_effect , PARAM_TYPE_EFFECT); pduel->lua->add_param(pchain->evt.reason_effect , PARAM_TYPE_EFFECT);
pduel->lua->add_param(pchain->evt.reason, PARAM_TYPE_INT); pduel->lua->add_param(pchain->evt.reason, PARAM_TYPE_INT);
pduel->lua->add_param(pchain->evt.reason_player, PARAM_TYPE_INT); pduel->lua->add_param(pchain->evt.reason_player, PARAM_TYPE_INT);
pduel->lua->add_param((ptr)0, PARAM_TYPE_INT); pduel->lua->add_param(0, PARAM_TYPE_INT);
pduel->lua->add_param(pcard, PARAM_TYPE_CARD); pduel->lua->add_param(pcard, PARAM_TYPE_CARD);
return pduel->lua->check_condition(peffect->target, 10); return pduel->lua->check_condition(peffect->target, 10);
} }
......
ocgapi.cpp
View file @ 1f6e9845
...@@ -57,14 +57,13 @@ uint32 default_card_reader(uint32 code, card_data* data) { ...@@ -57,14 +57,13 @@ uint32 default_card_reader(uint32 code, card_data* data) {
uint32 default_message_handler(void* pduel, uint32 message_type) { uint32 default_message_handler(void* pduel, uint32 message_type) {
return 0; return 0;
} }
extern "C" DECL_DLLEXPORT ptr create_duel(uint32 seed) { extern "C" DECL_DLLEXPORT duel* create_duel(uint32 seed) {
duel* pduel = new duel(); duel* pduel = new duel();
duel_set.insert(pduel); duel_set.insert(pduel);
pduel->random.reset(seed); pduel->random.reset(seed);
return (ptr)pduel; return pduel;
} }
extern "C" DECL_DLLEXPORT void start_duel(ptr pduel, int32 options) { extern "C" DECL_DLLEXPORT void start_duel(duel* pd, int32 options) {
duel* pd = (duel*)pduel;
pd->game_field->core.duel_options |= options & 0xffff; pd->game_field->core.duel_options |= options & 0xffff;
int32 duel_rule = options >> 16; int32 duel_rule = options >> 16;
if(duel_rule) if(duel_rule)
...@@ -103,15 +102,13 @@ extern "C" DECL_DLLEXPORT void start_duel(ptr pduel, int32 options) { ...@@ -103,15 +102,13 @@ extern "C" DECL_DLLEXPORT void start_duel(ptr pduel, int32 options) {
} }
pd->game_field->add_process(PROCESSOR_TURN, 0, 0, 0, 0, 0); pd->game_field->add_process(PROCESSOR_TURN, 0, 0, 0, 0, 0);
} }
extern "C" DECL_DLLEXPORT void end_duel(ptr pduel) { extern "C" DECL_DLLEXPORT void end_duel(duel* pd) {
duel* pd = (duel*)pduel;
if(duel_set.count(pd)) { if(duel_set.count(pd)) {
duel_set.erase(pd); duel_set.erase(pd);
delete pd; delete pd;
} }
} }
extern "C" DECL_DLLEXPORT void set_player_info(ptr pduel, int32 playerid, int32 lp, int32 startcount, int32 drawcount) { extern "C" DECL_DLLEXPORT void set_player_info(duel* pd, int32 playerid, int32 lp, int32 startcount, int32 drawcount) {
duel* pd = (duel*)pduel;
if(lp > 0) if(lp > 0)
pd->game_field->player[playerid].lp = lp; pd->game_field->player[playerid].lp = lp;
if(startcount >= 0) if(startcount >= 0)
...@@ -119,23 +116,21 @@ extern "C" DECL_DLLEXPORT void set_player_info(ptr pduel, int32 playerid, int32 ...@@ -119,23 +116,21 @@ extern "C" DECL_DLLEXPORT void set_player_info(ptr pduel, int32 playerid, int32
if(drawcount >= 0) if(drawcount >= 0)
pd->game_field->player[playerid].draw_count = drawcount; pd->game_field->player[playerid].draw_count = drawcount;
} }
extern "C" DECL_DLLEXPORT void get_log_message(ptr pduel, byte* buf) { extern "C" DECL_DLLEXPORT void get_log_message(duel* pduel, byte* buf) {
strcpy((char*)buf, ((duel*)pduel)->strbuffer); strcpy((char*)buf, pduel->strbuffer);
} }
extern "C" DECL_DLLEXPORT int32 get_message(ptr pduel, byte* buf) { extern "C" DECL_DLLEXPORT int32 get_message(duel* pduel, byte* buf) {
int32 len = ((duel*)pduel)->read_buffer(buf); int32 len = pduel->read_buffer(buf);
((duel*)pduel)->clear_buffer(); pduel->clear_buffer();
return len; return len;
} }
extern "C" DECL_DLLEXPORT int32 process(ptr pduel) { extern "C" DECL_DLLEXPORT int32 process(duel* pd) {
duel* pd = (duel*)pduel;
int result = pd->game_field->process(); int result = pd->game_field->process();
while((result & 0xffff) == 0 && (result & 0xf0000) == 0) while((result & 0xffff) == 0 && (result & 0xf0000) == 0)
result = pd->game_field->process(); result = pd->game_field->process();
return result; return result;
} }
extern "C" DECL_DLLEXPORT void new_card(ptr pduel, uint32 code, uint8 owner, uint8 playerid, uint8 location, uint8 sequence, uint8 position) { extern "C" DECL_DLLEXPORT void new_card(duel* ptduel, uint32 code, uint8 owner, uint8 playerid, uint8 location, uint8 sequence, uint8 position) {
duel* ptduel = (duel*)pduel;
if(ptduel->game_field->is_location_useable(playerid, location, sequence)) { if(ptduel->game_field->is_location_useable(playerid, location, sequence)) {
card* pcard = ptduel->new_card(code); card* pcard = ptduel->new_card(code);
pcard->owner = owner; pcard->owner = owner;
...@@ -151,8 +146,7 @@ extern "C" DECL_DLLEXPORT void new_card(ptr pduel, uint32 code, uint8 owner, uin ...@@ -151,8 +146,7 @@ extern "C" DECL_DLLEXPORT void new_card(ptr pduel, uint32 code, uint8 owner, uin
} }
} }
} }
extern "C" DECL_DLLEXPORT void new_tag_card(ptr pduel, uint32 code, uint8 owner, uint8 location) { extern "C" DECL_DLLEXPORT void new_tag_card(duel* ptduel, uint32 code, uint8 owner, uint8 location) {
duel* ptduel = (duel*)pduel;
if(owner > 1 || !(location & (LOCATION_DECK | LOCATION_EXTRA))) if(owner > 1 || !(location & (LOCATION_DECK | LOCATION_EXTRA)))
return; return;
card* pcard = ptduel->new_card(code); card* pcard = ptduel->new_card(code);
...@@ -175,10 +169,9 @@ extern "C" DECL_DLLEXPORT void new_tag_card(ptr pduel, uint32 code, uint8 owner, ...@@ -175,10 +169,9 @@ extern "C" DECL_DLLEXPORT void new_tag_card(ptr pduel, uint32 code, uint8 owner,
break; break;
} }
} }
extern "C" DECL_DLLEXPORT int32 query_card(ptr pduel, uint8 playerid, uint8 location, uint8 sequence, int32 query_flag, byte* buf, int32 use_cache) { extern "C" DECL_DLLEXPORT int32 query_card(duel* ptduel, uint8 playerid, uint8 location, uint8 sequence, int32 query_flag, byte* buf, int32 use_cache) {
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
duel* ptduel = (duel*)pduel;
card* pcard = 0; card* pcard = 0;
location &= 0x7f; location &= 0x7f;
if(location & LOCATION_ONFIELD) if(location & LOCATION_ONFIELD)
...@@ -208,8 +201,7 @@ extern "C" DECL_DLLEXPORT int32 query_card(ptr pduel, uint8 playerid, uint8 loca ...@@ -208,8 +201,7 @@ extern "C" DECL_DLLEXPORT int32 query_card(ptr pduel, uint8 playerid, uint8 loca
return 4; return 4;
} }
} }
extern "C" DECL_DLLEXPORT int32 query_field_count(ptr pduel, uint8 playerid, uint8 location) { extern "C" DECL_DLLEXPORT int32 query_field_count(duel* ptduel, uint8 playerid, uint8 location) {
duel* ptduel = (duel*)pduel;
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
auto& player = ptduel->game_field->player[playerid]; auto& player = ptduel->game_field->player[playerid];
...@@ -237,10 +229,9 @@ extern "C" DECL_DLLEXPORT int32 query_field_count(ptr pduel, uint8 playerid, uin ...@@ -237,10 +229,9 @@ extern "C" DECL_DLLEXPORT int32 query_field_count(ptr pduel, uint8 playerid, uin
} }
return 0; return 0;
} }
extern "C" DECL_DLLEXPORT int32 query_field_card(ptr pduel, uint8 playerid, uint8 location, int32 query_flag, byte* buf, int32 use_cache) { extern "C" DECL_DLLEXPORT int32 query_field_card(duel* ptduel, uint8 playerid, uint8 location, int32 query_flag, byte* buf, int32 use_cache) {
if(playerid != 0 && playerid != 1) if(playerid != 0 && playerid != 1)
return 0; return 0;
duel* ptduel = (duel*)pduel;
auto& player = ptduel->game_field->player[playerid]; auto& player = ptduel->game_field->player[playerid];
byte* p = buf; byte* p = buf;
if(location == LOCATION_MZONE) { if(location == LOCATION_MZONE) {
...@@ -284,8 +275,7 @@ extern "C" DECL_DLLEXPORT int32 query_field_card(ptr pduel, uint8 playerid, uint ...@@ -284,8 +275,7 @@ extern "C" DECL_DLLEXPORT int32 query_field_card(ptr pduel, uint8 playerid, uint
} }
return (int32)(p - buf); return (int32)(p - buf);
} }
extern "C" DECL_DLLEXPORT int32 query_field_info(ptr pduel, byte* buf) { extern "C" DECL_DLLEXPORT int32 query_field_info(duel* ptduel, byte* buf) {
duel* ptduel = (duel*)pduel;
byte* p = buf; byte* p = buf;
*p++ = MSG_RELOAD_FIELD; *p++ = MSG_RELOAD_FIELD;
*p++ = ptduel->game_field->core.duel_rule; *p++ = ptduel->game_field->core.duel_rule;
...@@ -332,12 +322,12 @@ extern "C" DECL_DLLEXPORT int32 query_field_info(ptr pduel, byte* buf) { ...@@ -332,12 +322,12 @@ extern "C" DECL_DLLEXPORT int32 query_field_info(ptr pduel, byte* buf) {
} }
return (int32)(p - buf); return (int32)(p - buf);
} }
extern "C" DECL_DLLEXPORT void set_responsei(ptr pduel, int32 value) { extern "C" DECL_DLLEXPORT void set_responsei(duel* pduel, int32 value) {
((duel*)pduel)->set_responsei(value); pduel->set_responsei(value);
} }
extern "C" DECL_DLLEXPORT void set_responseb(ptr pduel, byte* buf) { extern "C" DECL_DLLEXPORT void set_responseb(duel* pduel, byte* buf) {
((duel*)pduel)->set_responseb(buf); pduel->set_responseb(buf);
} }
extern "C" DECL_DLLEXPORT int32 preload_script(ptr pduel, const char* script, int32 len) { extern "C" DECL_DLLEXPORT int32 preload_script(duel* pduel, const char* script, int32 len) {
return ((duel*)pduel)->lua->load_script(script); return pduel->lua->load_script(script);
} }
ocgapi.h
View file @ 1f6e9845
...@@ -21,6 +21,7 @@ struct card_info; ...@@ -21,6 +21,7 @@ struct card_info;
class group; class group;
class effect; class effect;
class interpreter; class interpreter;
class duel;
typedef byte* (*script_reader)(const char*, int*); typedef byte* (*script_reader)(const char*, int*);
typedef uint32 (*card_reader)(uint32, card_data*); typedef uint32 (*card_reader)(uint32, card_data*);
...@@ -34,22 +35,22 @@ byte* read_script(const char* script_name, int* len); ...@@ -34,22 +35,22 @@ byte* read_script(const char* script_name, int* len);
uint32 read_card(uint32 code, card_data* data); uint32 read_card(uint32 code, card_data* data);
uint32 handle_message(void* pduel, uint32 message_type); uint32 handle_message(void* pduel, uint32 message_type);
extern "C" DECL_DLLEXPORT ptr create_duel(uint32 seed); extern "C" DECL_DLLEXPORT duel* create_duel(uint32 seed);
extern "C" DECL_DLLEXPORT void start_duel(ptr pduel, int32 options); extern "C" DECL_DLLEXPORT void start_duel(duel* pduel, int32 options);
extern "C" DECL_DLLEXPORT void end_duel(ptr pduel); extern "C" DECL_DLLEXPORT void end_duel(duel* pduel);
extern "C" DECL_DLLEXPORT void set_player_info(ptr pduel, int32 playerid, int32 lp, int32 startcount, int32 drawcount); extern "C" DECL_DLLEXPORT void set_player_info(duel* pduel, int32 playerid, int32 lp, int32 startcount, int32 drawcount);
extern "C" DECL_DLLEXPORT void get_log_message(ptr pduel, byte* buf); extern "C" DECL_DLLEXPORT void get_log_message(duel* pduel, byte* buf);
extern "C" DECL_DLLEXPORT int32 get_message(ptr pduel, byte* buf); extern "C" DECL_DLLEXPORT int32 get_message(duel* pduel, byte* buf);
extern "C" DECL_DLLEXPORT int32 process(ptr pduel); extern "C" DECL_DLLEXPORT int32 process(duel* pduel);
extern "C" DECL_DLLEXPORT void new_card(ptr pduel, uint32 code, uint8 owner, uint8 playerid, uint8 location, uint8 sequence, uint8 position); extern "C" DECL_DLLEXPORT void new_card(duel* pduel, uint32 code, uint8 owner, uint8 playerid, uint8 location, uint8 sequence, uint8 position);
extern "C" DECL_DLLEXPORT void new_tag_card(ptr pduel, uint32 code, uint8 owner, uint8 location); extern "C" DECL_DLLEXPORT void new_tag_card(duel* pduel, uint32 code, uint8 owner, uint8 location);
extern "C" DECL_DLLEXPORT int32 query_card(ptr pduel, uint8 playerid, uint8 location, uint8 sequence, int32 query_flag, byte* buf, int32 use_cache); extern "C" DECL_DLLEXPORT int32 query_card(duel* pduel, uint8 playerid, uint8 location, uint8 sequence, int32 query_flag, byte* buf, int32 use_cache);
extern "C" DECL_DLLEXPORT int32 query_field_count(ptr pduel, uint8 playerid, uint8 location); extern "C" DECL_DLLEXPORT int32 query_field_count(duel* pduel, uint8 playerid, uint8 location);
extern "C" DECL_DLLEXPORT int32 query_field_card(ptr pduel, uint8 playerid, uint8 location, int32 query_flag, byte* buf, int32 use_cache); extern "C" DECL_DLLEXPORT int32 query_field_card(duel* pduel, uint8 playerid, uint8 location, int32 query_flag, byte* buf, int32 use_cache);
extern "C" DECL_DLLEXPORT int32 query_field_info(ptr pduel, byte* buf); extern "C" DECL_DLLEXPORT int32 query_field_info(duel* pduel, byte* buf);
extern "C" DECL_DLLEXPORT void set_responsei(ptr pduel, int32 value); extern "C" DECL_DLLEXPORT void set_responsei(duel* pduel, int32 value);
extern "C" DECL_DLLEXPORT void set_responseb(ptr pduel, byte* buf); extern "C" DECL_DLLEXPORT void set_responseb(duel* pduel, byte* buf);
extern "C" DECL_DLLEXPORT int32 preload_script(ptr pduel, const char* script, int32 len); extern "C" DECL_DLLEXPORT int32 preload_script(duel* pduel, const char* script, int32 len);
byte* default_script_reader(const char* script_name, int* len); byte* default_script_reader(const char* script_name, int* len);
uint32 default_card_reader(uint32 code, card_data* data); uint32 default_card_reader(uint32 code, card_data* data);
uint32 default_message_handler(void* pduel, uint32 msg_type); uint32 default_message_handler(void* pduel, uint32 msg_type);
......
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