thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix text rendering and saving

Browse source
This commit is contained in:
Joel Teichroeb 2015-02-01 08:37:42 -08:00
parent 1e5f5d6947
commit 178b31822a
3 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/grim/gfx_opengl.cpp
View file

@ -1473,8 +1473,9 @@ void GfxOpenGL::drawTextObject(const TextObject *text) {
if (g_grim->getGameType() == GType_GRIM)
w += font->getBaseOffsetY();
float z = x + font->getCharStartingCol(character);
z *= _scaleW;
w *= _scaleH;
// TODO: We can't scale in the remastered version
//z *= _scaleW;
//w *= _scaleH;
glBindTexture(GL_TEXTURE_2D, texture);
float width = 1 / 16.f;
float cx = ((character - 1) % 16) / 16.0f;

18
engines/grim/lua_v1.cpp
View file

@ -740,10 +740,10 @@ void Lua_V1::OverlayCreate() {
float layer = lua_getnumber(table);
Overlay *overlay = g_resourceloader->loadOverlay(overlayName);
overlay->setPos(x, y);
overlay->setLayer(layer);
if (overlay) {
overlay->setPos(x, y);
overlay->setLayer(layer);
lua_pushusertag(overlay->getId(), overlay->getTag());
} else {
lua_pushnil();
@ -796,6 +796,11 @@ void Lua_V1::GetCursorPosition() {
lua_pushnumber(0);
}
void Lua_V1::GetPlatform() {
warning("Stub function: GetPlatform, returns 1 (windows)");
lua_pushnumber(1);
}
void Lua_V1::JustLoaded() {
Debug::error("OPCODE USAGE VERIFICATION: JustLoaded");
}
@ -841,7 +846,6 @@ STUB_FUNC(Lua_V1::GetMemoryUsage)
STUB_FUNC(Lua_V1::PurgeText)
// Remastered
STUB_FUNC(Lua_V1::GetPlatform)
STUB_FUNC(Lua_V1::PreloadCursors)
STUB_FUNC(Lua_V1::ReadRegistryIntValue)
STUB_FUNC(Lua_V1::GetFindSaveGameStatus)
@ -884,6 +888,10 @@ STUB_FUNC(Lua_V1::IsConceptUnlocked)
STUB_FUNC(Lua_V1::GetRemappedKeyName)
STUB_FUNC(Lua_V1::GetRemappedKeyHint)
STUB_FUNC(Lua_V1::New)
STUB_FUNC(Lua_V1::RemoveBorders)
STUB_FUNC(Lua_V1::GetSaveStatus)
STUB_FUNC(Lua_V1::StartCheckOfCrossSaveStatus)
STUB_FUNC(Lua_V1::GetCrossSaveStatus)
struct luaL_reg grimMainOpcodes[] = {
{ "EngineDisplay", LUA_OPCODE(Lua_V1, EngineDisplay) },
@ -1147,6 +1155,10 @@ struct luaL_reg grimMainOpcodes[] = {
{ "FindSaveGames", LUA_OPCODE(Lua_V1, FindSaveGames) },
{ "GetRemappedKeyName", LUA_OPCODE(Lua_V1, GetRemappedKeyName) },
{ "New", LUA_OPCODE(Lua_V1, New) },
{ "RemoveBorders", LUA_OPCODE(Lua_V1, RemoveBorders) },
{ "GetSaveStatus", LUA_OPCODE(Lua_V1, GetSaveStatus) },
{ "StartCheckOfCrossSaveStatus", LUA_OPCODE(Lua_V1, StartCheckOfCrossSaveStatus) },
{ "GetCrossSaveStatus", LUA_OPCODE(Lua_V1, GetCrossSaveStatus) },
};

4
engines/grim/lua_v1.h
View file

@ -342,6 +342,10 @@ protected:
DECLARE_LUA_OPCODE(GetRemappedKeyName);
DECLARE_LUA_OPCODE(GetRemappedKeyHint);
DECLARE_LUA_OPCODE(New);
DECLARE_LUA_OPCODE(RemoveBorders);
DECLARE_LUA_OPCODE(GetSaveStatus);
DECLARE_LUA_OPCODE(StartCheckOfCrossSaveStatus);
DECLARE_LUA_OPCODE(GetCrossSaveStatus);
};