games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-14 02:33:51 +02:00
Code Issues Releases Activity

Added advmap config options to enable/disable fading;

Browse Source
This commit is contained in:
Fay 2015-02-02 19:38:30 +01:00
parent 5a7a208617
commit 3c3fb0e21d
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/mapHandler.cpp
View File

@ -1223,7 +1223,7 @@ bool CMapHandler::printObject(const CGObjectInstance *obj, bool fadein /* = fals
cr.x = fx*32; cr.x = fx*32;
cr.y = fy*32; cr.y = fy*32;
TerrainTileObject toAdd(obj, cr); TerrainTileObject toAdd(obj, cr);
if (fadein) if (fadein && ADVOPT.objectFading)
{ {
auto tmp = CSDL_Ext::newSurface(bitmap->w, bitmap->h); auto tmp = CSDL_Ext::newSurface(bitmap->w, bitmap->h);
SDL_BlitSurface(bitmap, nullptr, tmp, nullptr); // can't be 8bpp for fading SDL_BlitSurface(bitmap, nullptr, tmp, nullptr); // can't be 8bpp for fading
@ -1269,7 +1269,7 @@ bool CMapHandler::hideObject(const CGObjectInstance *obj, bool fadeout /* = fals
{ {
if (ttiles[i][j][k].objects[x].obj->id == obj->id) if (ttiles[i][j][k].objects[x].obj->id == obj->id)
{ {
if (fadeout) // erase delayed until end of fadeout if (fadeout && ADVOPT.objectFading) // erase delayed until end of fadeout
{ {
auto bitmap = graphics->getDef(obj)->ourImages[0].bitmap; auto bitmap = graphics->getDef(obj)->ourImages[0].bitmap;
auto tmp = CSDL_Ext::newSurface(bitmap->w, bitmap->h); // TODO cache these bitmaps instead of creating new ones? auto tmp = CSDL_Ext::newSurface(bitmap->w, bitmap->h); // TODO cache these bitmaps instead of creating new ones?

2
client/windows/CAdvmapInterface.cpp
View File

@ -353,6 +353,8 @@ int3 CTerrainRect::tileCountOnScreen()
void CTerrainRect::fadeFromCurrentView() void CTerrainRect::fadeFromCurrentView()
{ {
if (!ADVOPT.screenFading)
return;
if (adventureInt->mode == EAdvMapMode::WORLD_VIEW) if (adventureInt->mode == EAdvMapMode::WORLD_VIEW)
return; return;

2
config/resolutions.json
View File

@ -4,7 +4,7 @@
{ {
"resolution": { "x": 800, "y": 600 }, "resolution": { "x": 800, "y": 600 },
"InGameConsole": { "maxInputPerLine": 60, "maxOutputPerLine": 39 }, "InGameConsole": { "maxInputPerLine": 60, "maxOutputPerLine": 39 },
"AdvMap": { "x": 7, "y": 7, "width": 594, "height": 546, "smoothMove": 1, "puzzleSepia": 1 }, "AdvMap": { "x": 7, "y": 7, "width": 594, "height": 546, "smoothMove": 1, "puzzleSepia": 1, "objectFading" : 1, "screenFading" : 1 },
"InfoBox": { "x": 605, "y": 389 }, "InfoBox": { "x": 605, "y": 389 },
"gem0": { "x": 6, "y": 508, "graphic": "agemLL.def" }, "gem0": { "x": 6, "y": 508, "graphic": "agemLL.def" },
"gem1": { "x": 556, "y": 508, "graphic": "agemLR.def" }, "gem1": { "x": 556, "y": 508, "graphic": "agemLR.def" },

2
lib/CConfigHandler.cpp
View File

@ -228,6 +228,8 @@ void config::CConfigHandler::init()
current->ac.advmapH = g["AdvMap"]["height"].Float(); current->ac.advmapH = g["AdvMap"]["height"].Float();
current->ac.smoothMove = g["AdvMap"]["smoothMove"].Float(); current->ac.smoothMove = g["AdvMap"]["smoothMove"].Float();
current->ac.puzzleSepia = g["AdvMap"]["puzzleSepia"].Float(); current->ac.puzzleSepia = g["AdvMap"]["puzzleSepia"].Float();
current->ac.screenFading = g["AdvMap"]["screenFading"].Float();
current->ac.objectFading = g["AdvMap"]["objectFading"].Float();
current->ac.infoboxX = g["InfoBox"]["x"].Float(); current->ac.infoboxX = g["InfoBox"]["x"].Float();
current->ac.infoboxY = g["InfoBox"]["y"].Float(); current->ac.infoboxY = g["InfoBox"]["y"].Float();

2
lib/CConfigHandler.h
View File

@ -133,6 +133,8 @@ namespace config
int advmapX, advmapY, advmapW, advmapH; int advmapX, advmapY, advmapW, advmapH;
bool smoothMove; bool smoothMove;
bool puzzleSepia; bool puzzleSepia;
bool screenFading;
bool objectFading;
//general properties //general properties
std::string mainGraphic; std::string mainGraphic;
std::string worldViewGraphic; std::string worldViewGraphic;