Max/kichikuou_system3-sdl2
1
0
Fork 0
mirror of https://github.com/kichikuou/system3-sdl2.git synced 2026-09-22 22:58:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

NACT: Make cmd_{label,page}_{jump,call} methods non-virtual

Browse Source
This commit is contained in:
kichikuou
2024-12-10 08:42:36 +09:00
parent d10ae21ff4
commit ffa3a364ce
5 changed files with 36 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/nact.cpp
+32
View File
@@ -302,6 +302,38 @@ void NACT::execute()
}
}
void NACT::cmd_label_jump()
{
int next_addr = sco.getw();
sco.jump_to(next_addr);
output_console("\n@%x:", next_addr);
}
void NACT::cmd_label_call()
{
int next_addr = sco.getw();
sco.label_call(next_addr);
output_console("\n\\%x:", next_addr);
}
void NACT::cmd_page_jump()
{
int next_page = cali();
sco.page_jump(next_page, 2);
output_console("\n&%d:", next_page);
}
void NACT::cmd_page_call()
{
int next_page = cali();
sco.page_call(next_page);
output_console("\n%%%d:", next_page);
}
void NACT::message(uint8 terminator)
{
char buf[200];
src/sys/nact.h
+4 -16
View File
@@ -130,10 +130,10 @@ protected:
virtual void cmd_calc() = 0;
virtual void cmd_branch() = 0;
virtual void cmd_label_jump() = 0;
virtual void cmd_label_call() = 0;
virtual void cmd_page_jump() = 0;
virtual void cmd_page_call() = 0;
void cmd_label_jump();
void cmd_label_call();
void cmd_page_jump();
void cmd_page_call();
virtual void cmd_set_menu() = 0;
virtual void cmd_open_menu() = 0;
@@ -280,10 +280,6 @@ public:
protected:
void cmd_calc() override;
void cmd_branch() override;
void cmd_label_jump() override;
void cmd_label_call() override;
void cmd_page_jump() override;
void cmd_page_call() override;
void cmd_set_menu() override;
void cmd_open_menu() override;
void cmd_set_verbobj() override;
@@ -331,10 +327,6 @@ public:
protected:
void cmd_calc() override;
void cmd_branch() override;
void cmd_label_jump() override;
void cmd_label_call() override;
void cmd_page_jump() override;
void cmd_page_call() override;
void cmd_set_menu() override;
void cmd_open_menu() override;
void cmd_set_verbobj() override;
@@ -376,10 +368,6 @@ public:
protected:
void cmd_calc() override;
void cmd_branch() override;
void cmd_label_jump() override;
void cmd_label_call() override;
void cmd_page_jump() override;
void cmd_page_call() override;
void cmd_set_menu() override;
void cmd_open_menu() override;
void cmd_set_verbobj() override;
src/sys/nact_sys1.cpp
-32
View File
@@ -232,38 +232,6 @@ void NACT_Sys1::cmd_branch()
output_console("\n{%d:", condition);
}
void NACT_Sys1::cmd_label_jump()
{
int next_addr = sco.getw();
sco.jump_to(next_addr);
output_console("\n@%x:", next_addr);
}
void NACT_Sys1::cmd_label_call()
{
int next_addr = sco.getw();
sco.label_call(next_addr);
output_console("\n\\%x:", next_addr);
}
void NACT_Sys1::cmd_page_jump()
{
int next_page = cali();
sco.page_jump(next_page, 2);
output_console("\n&%d:", next_page);
}
void NACT_Sys1::cmd_page_call()
{
int next_page = cali();
sco.page_call(next_page);
output_console("\n%%%d:", next_page);
}
void NACT_Sys1::cmd_set_menu()
{
if(ags->draw_menu) {
src/sys/nact_sys2.cpp
-32
View File
@@ -270,38 +270,6 @@ void NACT_Sys2::cmd_branch()
output_console("\n{%d:", condition);
}
void NACT_Sys2::cmd_label_jump()
{
int next_addr = sco.getw();
sco.jump_to(next_addr);
output_console("\n@%x:", next_addr);
}
void NACT_Sys2::cmd_label_call()
{
int next_addr = sco.getw();
sco.label_call(next_addr);
output_console("\n\\%x:", next_addr);
}
void NACT_Sys2::cmd_page_jump()
{
int next_page = cali();
sco.page_jump(next_page, 2);
output_console("\n&%d:", next_page);
}
void NACT_Sys2::cmd_page_call()
{
int next_page = cali();
sco.page_call(next_page);
output_console("\n%%%d:", next_page);
}
void NACT_Sys2::cmd_set_menu()
{
if(ags->draw_menu) {
src/sys/nact_sys3.cpp
-32
View File
@@ -45,38 +45,6 @@ void NACT_Sys3::cmd_branch()
output_console("\n{%d: T:%4x, F:%4x", condition, t_addr, f_addr);
}
void NACT_Sys3::cmd_label_jump()
{
int next_addr = sco.getw();
sco.jump_to(next_addr);
output_console("\n@%x:", next_addr);
}
void NACT_Sys3::cmd_label_call()
{
int next_addr = sco.getw();
sco.label_call(next_addr);
output_console("\n\\%x:", next_addr);
}
void NACT_Sys3::cmd_page_jump()
{
int next_page = cali();
sco.page_jump(next_page, 2);
output_console("\n&%d:", next_page);
}
void NACT_Sys3::cmd_page_call()
{
int next_page = cali();
sco.page_call(next_page);
output_console("\n%%%d:", next_page);
}
void NACT_Sys3::cmd_set_menu()
{
if(ags->draw_menu) {