mirror of
https://github.com/scummvm/scummvm.git
synced 2026-06-20 05:45:29 +00:00
Walter Agazzi
8d96ff3966
The implementation of Overlay_SetText() was rewritten in aaf6144 , with a purpose of replacing only the internal image of overlay, but not going all the way of removing/creating a new overlay into the same slot. In addition to the initial reasons, it became even more essential after the overlay storage optimization (see merge commit 77b8264), as overlay system now records free ids on overlay removal. As recreating overlay with exact same id would now require extra hacks into overlay logic. Unfortunately, an old SetTextOverlay() function was forgotten about, and it still doing this remove/create way of resetting a text. This results in engine wrongly considering certain ids to be free, while they are already taken. This commit fixes this by making SetTextOverlay delegate to the new Overlay_SetText() algorithm instead. From upstream 4caf0765ef36b4ebc2fb609f99a36a56d0736255
82 lines
2.6 KiB
C++
82 lines
2.6 KiB
C++
/* ScummVM - Graphic Adventure Engine
|
|
*
|
|
* ScummVM is the legal property of its developers, whose names
|
|
* are too numerous to list here. Please refer to the COPYRIGHT
|
|
* file distributed with this source distribution.
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#include "ags/engine/ac/global_overlay.h"
|
|
#include "ags/shared/ac/common.h"
|
|
#include "ags/engine/ac/draw.h"
|
|
#include "ags/engine/ac/overlay.h"
|
|
#include "ags/engine/ac/runtime_defines.h"
|
|
#include "ags/globals.h"
|
|
|
|
namespace AGS3 {
|
|
|
|
using namespace Shared;
|
|
using namespace Engine;
|
|
|
|
void RemoveOverlay(int ovrid) {
|
|
if (!get_overlay(ovrid))
|
|
quit("!RemoveOverlay: invalid overlay id passed");
|
|
remove_screen_overlay(ovrid);
|
|
}
|
|
|
|
int CreateGraphicOverlay(int x, int y, int slott, int trans) {
|
|
auto *over = Overlay_CreateGraphicCore(false, x, y, slott, trans != 0, true); // always clone
|
|
return over ? over->type : 0;
|
|
}
|
|
|
|
int CreateTextOverlay(int xx, int yy, int wii, int fontid, int text_color, const char *text, int disp_type) {
|
|
int allowShrink = 0;
|
|
|
|
if (xx != OVR_AUTOPLACE) {
|
|
data_to_game_coords(&xx, &yy);
|
|
// NOTE: this is ugly, but OVR_AUTOPLACE here suggests that width is already in game coords
|
|
wii = data_to_game_coord(wii);
|
|
} else // allow DisplaySpeechBackground to be shrunk
|
|
allowShrink = 1;
|
|
|
|
auto *over = Overlay_CreateTextCore(false, xx, yy, wii, fontid, text_color, text, disp_type, allowShrink);
|
|
assert((disp_type < OVER_FIRSTFREE) || (disp_type == over->type));
|
|
return over ? over->type : 0;
|
|
}
|
|
|
|
void SetTextOverlay(int ovrid, int xx, int yy, int wii, int fontid, int text_color, const char *text) {
|
|
auto *over = get_overlay(ovrid);
|
|
if (!over)
|
|
quit("!SetTextOverlay: invalid overlay ID specified");
|
|
Overlay_SetText(*over, xx, yy, wii, fontid, text_color, text);
|
|
}
|
|
|
|
void MoveOverlay(int ovrid, int newx, int newy) {
|
|
data_to_game_coords(&newx, &newy);
|
|
|
|
auto *over = get_overlay(ovrid);
|
|
if (!over)
|
|
quit("!MoveOverlay: invalid overlay ID specified");
|
|
over->x = newx;
|
|
over->y = newy;
|
|
}
|
|
|
|
int IsOverlayValid(int ovrid) {
|
|
return (get_overlay(ovrid) != nullptr) ? 1 : 0;
|
|
}
|
|
|
|
} // namespace AGS3
|