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

Refactor text / menu window code

Browse Source
This commit is contained in:
kichikuou
2025-01-18 15:37:13 +09:00
parent 32a510d543
commit fad34f7bb9
6 changed files with 279 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/ags_window.cpp
+228 -98
View File
@@ -7,38 +7,132 @@
#include "ags.h"
#include <string.h>
void AGS::Window::clear_saved()
{
if (screen) {
SDL_FreeSurface(screen);
screen = nullptr;
}
if (window) {
SDL_FreeSurface(window);
window = nullptr;
}
}
void AGS::init_windows()
{
for (int i = 0; i < 10; i++) {
// ウィンドウの初期位置はシステムによって異なる
switch (game_id.game) {
case GameId::BUNKASAI:
text_w[i] = {24, 304, 616, 384, false};
menu_w[i] = {440, 18, 620, 178, true};
break;
case GameId::CRESCENT:
text_w[i] = {24, 288, 616, 378, false};
// 本来は横メニュー
menu_w[i] = {464, 50, 623, 240, true};
break;
case GameId::RANCE2:
case GameId::RANCE2_HINT:
text_w[i] = {8, 285, 502, 396, false};
menu_w[i] = {431, 19, 624, 181, false};
break;
case GameId::DPS:
case GameId::DPS_SG_FAHREN:
case GameId::DPS_SG_KATEI:
case GameId::DPS_SG_NOBUNAGA:
case GameId::DPS_SG2_ANTIQUE:
case GameId::DPS_SG2_IKENAI:
case GameId::DPS_SG2_AKAI:
case GameId::DPS_SG3_RABBIT:
case GameId::DPS_SG3_SHINKON:
case GameId::DPS_SG3_SOTSUGYOU:
text_w[i] = {48, 288, 594, 393, false};
//menu_w[i] = {48, 288, 584, 393, false};
menu_w[i] = {48, 288, 594, 393, false};
break;
case GameId::FUKEI:
text_w[i] = {44, 282, 593, 396, false};
menu_w[i] = {460, 14, 635, 214, false};
break;
case GameId::INTRUDER:
text_w[i] = {8, 280, 629, 393, false};
menu_w[i] = {448, 136, 623, 340, true};
break;
case GameId::TENGU:
text_w[i] = {44, 282, 593, 396, false};
menu_w[i] = {452, 14, 627, 214, false};
break;
case GameId::TOUSHIN_HINT:
text_w[i] = {8, 311, 623, 391, false};
menu_w[i] = {452, 14, 627, 214, true};
break;
case GameId::LITTLE_VAMPIRE:
text_w[i] = {8, 255, 615, 383, false};
menu_w[i] = {448, 11, 615, game_id.language == ENGLISH ? 234 : 224, false};
break;
case GameId::YAKATA:
text_w[i] = {48, 288, 594, 393, false};
menu_w[i] = {452, 14, 627, 214, false};
break;
case GameId::DALK_HINT:
text_w[i] = {24, 308, 376, 386, false};
menu_w[i] = {404, 28, 604, 244, true};
break;
case GameId::RANCE3_HINT:
text_w[i] = {104, 304, 615, 383, false};
menu_w[i] = {464, 24, 623, 200, true};
break;
case GameId::YAKATA2:
text_w[i] = {104, 304, 620, 382, false};
menu_w[i] = {420, 28, 620, 244, true};
break;
case GameId::GAKUEN:
text_w[i] = {8, 260, 505, 384, false};
if (i == 1) {
menu_w[i] = {128, 32, 337, 178, true};
} else {
menu_w[i] = {288, 30, 433, 210, true};
}
break;
default:
text_w[i] = {8, 311, 623, 391, true};
menu_w[i] = {464, 80, 623, 240, true};
break;
}
text_w[i].save = false;
menu_w[i].save = true;
}
}
void AGS::clear_text_window(int index, bool erase)
{
int sx = text_w[index - 1].sx;
int sy = text_w[index - 1].sy;
int ex = text_w[index - 1].ex;
int ey = text_w[index - 1].ey;
Window& w = text_w[index - 1];
if(erase) {
if(text_w[index - 1].frame && fade_level) {
draw_window(sx - 8, sy - 8, ex + 8, ey + 8, true, text_frame_color, text_back_color);
if (w.frame && fade_level) {
draw_window(w.sx - 8, w.sy - 8, w.ex + 8, w.ey + 8, true, text_frame_color, text_back_color);
} else {
box_fill(0, sx, sy, ex, ey, text_back_color);
box_fill(0, w.sx, w.sy, w.ex, w.ey, text_back_color);
}
}
text_dest_x = sx;
text_dest_y = sy + 2;//text_space;
text_dest_x = w.sx;
text_dest_y = w.sy + 2;//text_space;
text_font_maxsize = 0;
}
bool AGS::return_text_line(int index)
{
int sx = text_w[index - 1].sx;
int ey = text_w[index - 1].ey;
text_dest_x = sx;
Window& w = text_w[index - 1];
text_dest_x = w.sx;
text_dest_y += (text_font_maxsize > text_font_size) ? text_font_maxsize : text_font_size;
text_dest_y += text_space;
text_font_maxsize = 0;
// 次の行が表示しきれるか？
return (text_dest_y + text_font_size) > ey ? true : false;
return (text_dest_y + text_font_size) > w.ey ? true : false;
}
void AGS::draw_push(int index)
@@ -49,8 +143,9 @@ void AGS::draw_push(int index)
0x9000, 0x9974, 0xe944, 0x8977, 0x8915, 0x8775, 0x0000, 0xffff
};
int x = text_w[index - 1].ex - 16;
int y = text_w[index - 1].ey - 16;
Window& w = text_w[index - 1];
int x = w.ex - 16;
int y = w.ey - 16;
for(int i = 0; i < 16; i++) {
if(pattern[i] & 0x8000) vram[0][y + i][x + 0] = text_font_color;
@@ -75,97 +170,115 @@ void AGS::draw_push(int index)
void AGS::open_text_window(int index, bool erase)
{
int sx = text_w[index - 1].sx - (text_w[index - 1].frame ? 8 : 0);
int sy = text_w[index - 1].sy - (text_w[index - 1].frame ? 8 : 0);
int ex = text_w[index - 1].ex + (text_w[index - 1].frame ? 8 : 0);
int ey = text_w[index - 1].ey + (text_w[index - 1].frame ? 8 : 0);
Window& w = text_w[index - 1];
int sx = w.sx - (w.frame ? 8 : 0);
int sy = w.sy - (w.frame ? 8 : 0);
int ex = w.ex + (w.frame ? 8 : 0);
int ey = w.ey + (w.frame ? 8 : 0);
int width = ex - sx + 1;
int height = ey - sy + 1;
if (game_id.is(GameId::PROG_CD) && !erase) {
// prostudent G オープニング画面化け対策
w.clear_saved();
}
// 画面退避
if(text_w[index - 1].push) {
if(text_w[index - 1].screen) {
SDL_FreeSurface(text_w[index - 1].screen);
if (w.save) {
if (w.screen) {
SDL_FreeSurface(w.screen);
}
text_w[index - 1].screen = SDL_CreateRGBSurfaceWithFormat(0, width, height, 8, SDL_PIXELFORMAT_INDEX8);
text_w[index - 1].screen_x = sx;
text_w[index - 1].screen_y = sy;
SDL_SetPaletteColors(text_w[index - 1].screen->format->palette, screen_palette->colors, 0, 256);
w.screen = SDL_CreateRGBSurfaceWithFormat(0, width, height, 8, SDL_PIXELFORMAT_INDEX8);
w.screen_x = sx;
w.screen_y = sy;
SDL_SetPaletteColors(w.screen->format->palette, screen_palette->colors, 0, 256);
SDL_Rect rect = {sx, sy, width, height};
SDL_BlitSurface(hBmpScreen[0], &rect, text_w[index - 1].screen, NULL);
SDL_BlitSurface(hBmpScreen[0], &rect, w.screen, NULL);
}
if(erase) {
// 窓初期化
draw_window(sx, sy, ex, ey, text_w[index - 1].frame, text_frame_color, text_back_color);
} else if(text_w[index - 1].push && text_w[index - 1].window) {
draw_window(sx, sy, ex, ey, w.frame, text_frame_color, text_back_color);
} else if (w.save && w.window) {
// 窓復帰
sx = text_w[index - 1].window_x;
sy = text_w[index - 1].window_y;
width = text_w[index - 1].window->w;
height = text_w[index - 1].window->h;
sx = w.window_x;
sy = w.window_y;
width = w.window->w;
height = w.window->h;
SDL_SetSurfacePalette(hBmpScreen[0], text_w[index - 1].window->format->palette);
SDL_SetSurfacePalette(hBmpScreen[0], w.window->format->palette);
SDL_Rect rect = {sx, sy, width, height};
SDL_BlitSurface(text_w[index - 1].window, NULL, hBmpScreen[0], &rect);
SDL_BlitSurface(w.window, NULL, hBmpScreen[0], &rect);
draw_screen(sx, sy, width, height);
SDL_SetSurfacePalette(hBmpScreen[0], screen_palette);
}
// テキスト描画位置更新
text_dest_x = text_w[index - 1].sx;
text_dest_y = text_w[index - 1].sy + text_space;;
text_dest_x = w.sx;
text_dest_y = w.sy + text_space;;
text_font_maxsize = 0;
}
void AGS::close_text_window(int index, bool update)
{
int sx = text_w[index - 1].sx - (text_w[index - 1].frame ? 8 : 0);
int sy = text_w[index - 1].sy - (text_w[index - 1].frame ? 8 : 0);
int ex = text_w[index - 1].ex + (text_w[index - 1].frame ? 8 : 0);
int ey = text_w[index - 1].ey + (text_w[index - 1].frame ? 8 : 0);
Window& w = text_w[index - 1];
int sx = w.sx - (w.frame ? 8 : 0);
int sy = w.sy - (w.frame ? 8 : 0);
int ex = w.ex + (w.frame ? 8 : 0);
int ey = w.ey + (w.frame ? 8 : 0);
int width = ex - sx + 1;
int height = ey - sy + 1;
// 窓退避
if(text_w[index - 1].push) {
if(text_w[index - 1].window) {
SDL_FreeSurface(text_w[index - 1].window);
if (w.save) {
if (w.window) {
SDL_FreeSurface(w.window);
}
text_w[index - 1].window = SDL_CreateRGBSurfaceWithFormat(0, width, height, 8, SDL_PIXELFORMAT_INDEX8);
text_w[index - 1].window_x = sx;
text_w[index - 1].window_y = sy;
SDL_SetPaletteColors(text_w[index - 1].window->format->palette, screen_palette->colors, 0, 256);
w.window = SDL_CreateRGBSurfaceWithFormat(0, width, height, 8, SDL_PIXELFORMAT_INDEX8);
w.window_x = sx;
w.window_y = sy;
SDL_SetPaletteColors(w.window->format->palette, screen_palette->colors, 0, 256);
SDL_Rect rect = {sx, sy, width, height};
SDL_BlitSurface(hBmpScreen[0], &rect, text_w[index - 1].window, NULL);
SDL_BlitSurface(hBmpScreen[0], &rect, w.window, NULL);
}
// 画面復帰
if(text_w[index - 1].push && text_w[index - 1].screen) {
sx = text_w[index - 1].screen_x;
sy = text_w[index - 1].screen_y;
width = text_w[index - 1].screen->w;
height = text_w[index - 1].screen->h;
if (w.save && w.screen) {
sx = w.screen_x;
sy = w.screen_y;
width = w.screen->w;
height = w.screen->h;
SDL_SetSurfacePalette(hBmpScreen[0], text_w[index - 1].screen->format->palette);
SDL_SetSurfacePalette(hBmpScreen[0], w.screen->format->palette);
SDL_Rect rect = {sx, sy, width, height};
SDL_BlitSurface(text_w[index - 1].screen, NULL, hBmpScreen[0], &rect);
SDL_BlitSurface(w.screen, NULL, hBmpScreen[0], &rect);
draw_screen(sx, sy, width, height);
SDL_SetSurfacePalette(hBmpScreen[0], screen_palette);
}
// テキスト描画位置更新
if(update) {
text_dest_x = text_w[index - 1].sx;
text_dest_y = text_w[index - 1].sy + text_space;;
text_dest_x = w.sx;
text_dest_y = w.sy + text_space;;
text_font_maxsize = 0;
}
}
void AGS::set_text_window(int index, int sx, int sy, int ex, int ey, bool save)
{
Window& w = text_w[index - 1];
w.clear_saved();
w.sx = sx;
w.sy = sy;
w.ex = ex;
w.ey = ey;
w.save = save;
}
void AGS::clear_menu_window()
{
SDL_Rect rect = {0, 0, 640, 480};
@@ -174,36 +287,37 @@ void AGS::clear_menu_window()
void AGS::open_menu_window(int index)
{
int sx = menu_w[index - 1].sx;
int sy = menu_w[index - 1].sy;
int ex = menu_w[index - 1].ex;
int ey = menu_fix ? menu_w[index - 1].ey : sy + menu_dest_y - 1;
Window &w = menu_w[index - 1];
int sx = w.sx;
int sy = w.sy;
int ex = w.ex;
int ey = menu_fix ? w.ey : sy + menu_dest_y - 1;
int width = ex - sx + 1;
int height = ey - sy + 1;
int wsx = sx - (menu_w[index - 1].frame ? 8 : 0);
int wsy = sy - (menu_w[index - 1].frame ? 8 : 0);
int wex = ex + (menu_w[index - 1].frame ? 8 : 0);
int wey = ey + (menu_w[index - 1].frame ? 8 : 0);
int wsx = sx - (w.frame ? 8 : 0);
int wsy = sy - (w.frame ? 8 : 0);
int wex = ex + (w.frame ? 8 : 0);
int wey = ey + (w.frame ? 8 : 0);
int wwidth = wex - wsx + 1;
int wheight = wey - wsy + 1;
// 画面退避
if(menu_w[index - 1].push) {
if(menu_w[index - 1].screen) {
SDL_FreeSurface(menu_w[index - 1].screen);
if (w.save) {
if (w.screen) {
SDL_FreeSurface(w.screen);
}
menu_w[index - 1].screen = SDL_CreateRGBSurfaceWithFormat(0, wwidth, wheight, 8, SDL_PIXELFORMAT_INDEX8);
menu_w[index - 1].screen_x = wsx;
menu_w[index - 1].screen_y = wsy;
SDL_SetPaletteColors(menu_w[index - 1].screen->format->palette, screen_palette->colors, 0, 256);
w.screen = SDL_CreateRGBSurfaceWithFormat(0, wwidth, wheight, 8, SDL_PIXELFORMAT_INDEX8);
w.screen_x = wsx;
w.screen_y = wsy;
SDL_SetPaletteColors(w.screen->format->palette, screen_palette->colors, 0, 256);
SDL_Rect rect = {wsx, wsy, wwidth, wheight};
SDL_BlitSurface(hBmpScreen[0], &rect, menu_w[index - 1].screen, NULL);
SDL_BlitSurface(hBmpScreen[0], &rect, w.screen, NULL);
}
// メニュー表示
draw_window(wsx, wsy, wex, wey, menu_w[index - 1].frame, menu_frame_color, menu_back_color);
draw_window(wsx, wsy, wex, wey, w.frame, menu_frame_color, menu_back_color);
SDL_Rect src_rect = {0, 0, width, height};
SDL_Rect dst_rect = {sx, sy, width, height};
SDL_BlitSurface(hBmpScreen[2], &src_rect, hBmpScreen[0], &dst_rect);
@@ -213,10 +327,11 @@ void AGS::open_menu_window(int index)
void AGS::redraw_menu_window(int index, int selected)
{
int sx = menu_w[index - 1].sx;
int sy = menu_w[index - 1].sy;
int ex = menu_w[index - 1].ex;
int ey = menu_fix ? menu_w[index - 1].ey : sy + menu_dest_y - 1;
Window &w = menu_w[index - 1];
int sx = w.sx;
int sy = w.sy;
int ex = w.ex;
int ey = menu_fix ? w.ey : sy + menu_dest_y - 1;
int width = ex - sx + 1;
int height = ey - sy + 1;
@@ -229,35 +344,50 @@ void AGS::redraw_menu_window(int index, int selected)
void AGS::close_menu_window(int index)
{
Window &w = menu_w[index - 1];
// 画面復帰
if(menu_w[index - 1].push && menu_w[index - 1].screen) {
int sx = menu_w[index - 1].screen_x;
int sy = menu_w[index - 1].screen_y;
int width = menu_w[index - 1].screen->w;
int height = menu_w[index - 1].screen->h;
SDL_SetSurfacePalette(hBmpScreen[0], menu_w[index - 1].screen->format->palette);
SDL_Rect rect = {sx, sy, width, height};
SDL_BlitSurface(menu_w[index - 1].screen, NULL, hBmpScreen[0], &rect);
draw_screen(sx, sy, width, height);
if (w.save && w.screen) {
SDL_SetSurfacePalette(hBmpScreen[0], w.screen->format->palette);
SDL_Rect rect = {w.screen_x, w.screen_y, w.screen->w, w.screen->h};
SDL_BlitSurface(w.screen, NULL, hBmpScreen[0], &rect);
draw_screen(w.screen_x, w.screen_y, w.screen->w, w.screen->h);
SDL_SetSurfacePalette(hBmpScreen[0], screen_palette);
}
}
void AGS::get_menu_window_rect(int index, int* sx, int* sy, int* ex, int* ey)
{
Window &w = menu_w[index - 1];
if (sx) *sx = w.sx;
if (sy) *sy = w.sy;
if (ex) *ex = w.ex;
if (ey) *ey = w.ey;
}
void AGS::set_menu_window(int index, int sx, int sy, int ex, int ey, bool save)
{
Window &w = menu_w[index - 1];
w.clear_saved();
w.sx = sx;
w.sy = sy;
w.ex = ex;
w.ey = ey;
w.save = save;
}
void AGS::draw_window(int sx, int sy, int ex, int ey, bool frame, uint8 frame_color, uint8 back_color)
{
SDL_Rect rect = {sx, sy, ex - sx + 1, ey - sy + 1};
SDL_FillRect(hBmpScreen[0], &rect, back_color);
if(frame) {
SDL_Rect top = {sx + 1, sy + 1, ex - sx - 1, 2};
SDL_Rect bottom = {sx + 1, ey - 2, ex - sx - 1, 2};
SDL_Rect left = {sx + 1, sy + 1, 2, ey - sy - 1};
SDL_Rect right = {ex - 2, sy + 1, 2, ey - sy - 1};
SDL_FillRect(hBmpScreen[0], &top, frame_color);
SDL_FillRect(hBmpScreen[0], &bottom, frame_color);
SDL_FillRect(hBmpScreen[0], &left, frame_color);
SDL_FillRect(hBmpScreen[0], &right, frame_color);
SDL_Rect rects[] = {
{sx + 1, sy + 1, ex - sx - 1, 2},
{sx + 1, ey - 2, ex - sx - 1, 2},
{sx + 1, sy + 1, 2, ey - sy - 1},
{ex - 2, sy + 1, 2, ey - sy - 1},
};
SDL_FillRects(hBmpScreen[0], rects, 4, frame_color);
box_line(0, sx + 4, sy + 4, ex - 4, ey - 4, frame_color);
}
draw_screen(sx, sy, ex - sx + 1, ey - sy + 1);