games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

Compile fix for MSVC.

Browse Source 
Fixed crash when no maps are present.
Fixed crash on opening the loading screen.
Fixed crash on starting the turn when Games/ subfolder is not present.
This commit is contained in:
Michał W. Urbańczyk
2012-12-19 18:19:09 +00:00
parent b5ebf443fc
commit 27f8408c52
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/CPlayerInterface.cpp
View File

@ -1579,10 +1579,14 @@ int CPlayerInterface::getLastIndex( std::string namePrefix)
using namespace boost::filesystem; using namespace boost::filesystem;
using namespace boost::algorithm; using namespace boost::algorithm;
path gamesDir = GVCMIDirs.UserPath + "/Games";
std::map<std::time_t, int> dates; //save number => datestamp std::map<std::time_t, int> dates; //save number => datestamp
directory_iterator enddir; directory_iterator enddir;
for (directory_iterator dir(GVCMIDirs.UserPath + "/Games"); dir!=enddir; dir++) if(!exists(gamesDir))
create_directory(gamesDir);
for (directory_iterator dir(gamesDir); dir!=enddir; dir++)
{ {
if(is_regular(dir->status())) if(is_regular(dir->status()))
{ {

7
client/CPreGame.cpp
View File

@ -801,13 +801,14 @@ void CSelectionScreen::changeSelection(const CMapInfo * to)
if(screenType == CMenuScreen::newGame) if(screenType == CMenuScreen::newGame)
{ {
sInfo.createRandomMap = to->isRandomMap; if(to && to->isRandomMap)
if(to->isRandomMap)
{ {
sInfo.createRandomMap = true;
sInfo.mapGenOptions = std::shared_ptr<CMapGenOptions>(new CMapGenOptions(randMapTab->getMapGenOptions())); sInfo.mapGenOptions = std::shared_ptr<CMapGenOptions>(new CMapGenOptions(randMapTab->getMapGenOptions()));
} }
else else
{ {
sInfo.createRandomMap = false;
sInfo.mapGenOptions.reset(); sInfo.mapGenOptions.reset();
} }
} }
@ -4025,7 +4026,7 @@ void CCampaignScreen::showAll(SDL_Surface *to)
void CGPreGame::showLoadingScreen(boost::function<void()> loader) void CGPreGame::showLoadingScreen(boost::function<void()> loader)
{ {
if (GH.listInt.front() == CGP) //pregame active if (GH.listInt.size() && GH.listInt.front() == CGP) //pregame active
CGP->removeFromGui(); CGP->removeFromGui();
GH.pushInt(new CLoadingScreen(loader)); GH.pushInt(new CLoadingScreen(loader));
} }

2
client/UIFramework/CIntObject.cpp
View File

@ -2,7 +2,7 @@
#include "CIntObject.h" #include "CIntObject.h"
#include "CGuiHandler.h" #include "CGuiHandler.h"
#include "SDL_Extensions.h" #include "SDL_Extensions.h"
#include "CMessage.h" #include "../CMessage.h"
CIntObject::CIntObject(int used_, Point pos_): CIntObject::CIntObject(int used_, Point pos_):
parent_m(nullptr), parent_m(nullptr),