X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FLevel%2FCampaign.cpp;h=410abcc7535c3177a203ee5f0dc79a70d82219e9;hb=b9a46d8e2b7e7e22c706e7dd3734f31015db4408;hp=236f631e6dd18705a85d9fceeb31946ed2609d9e;hpb=ed3662c0852c4312a612b4fc35bd03aba8d13db7;p=lugaru.git diff --git a/Source/Level/Campaign.cpp b/Source/Level/Campaign.cpp index 236f631..410abcc 100644 --- a/Source/Level/Campaign.cpp +++ b/Source/Level/Campaign.cpp @@ -36,8 +36,8 @@ int actuallevel = 0; std::vector ListCampaigns() { errno = 0; - DIR *campaigns = opendir(Folders::getResourcePath("Campaigns").c_str()); - struct dirent *campaign = NULL; + DIR* campaigns = opendir(Folders::getResourcePath("Campaigns").c_str()); + struct dirent* campaign = NULL; if (!campaigns) { perror(("Problem while loading campaigns from " + Folders::getResourcePath("Campaigns")).c_str()); exit(EXIT_FAILURE); @@ -45,8 +45,9 @@ std::vector ListCampaigns() std::vector campaignNames; while ((campaign = readdir(campaigns)) != NULL) { std::string name(campaign->d_name); - if (name.length() < 5) + if (name.length() < 5) { continue; + } if (!name.compare(name.length() - 4, 4, ".txt")) { campaignNames.push_back(name.substr(0, name.length() - 4)); } @@ -94,42 +95,49 @@ void LoadCampaign() } } -CampaignLevel::CampaignLevel() : - width(10), - choosenext(1) +CampaignLevel::CampaignLevel() + : width(10) + , choosenext(1) { location.x = 0; location.y = 0; } -int CampaignLevel::getStartX() { +int CampaignLevel::getStartX() +{ return 30 + 120 + location.x * 400 / 512; } -int CampaignLevel::getStartY() { +int CampaignLevel::getStartY() +{ return 30 + 30 + (512 - location.y) * 400 / 512; } -int CampaignLevel::getEndX() { +int CampaignLevel::getEndX() +{ return getStartX() + width; } -int CampaignLevel::getEndY() { +int CampaignLevel::getEndY() +{ return getStartY() + width; } -XYZ CampaignLevel::getCenter() { +XYZ CampaignLevel::getCenter() +{ XYZ center; center.x = getStartX() + width / 2; center.y = getStartY() + width / 2; return center; } -int CampaignLevel::getWidth() { +int CampaignLevel::getWidth() +{ return width; } -istream& CampaignLevel::operator<< (istream& is) { +istream& CampaignLevel::operator<<(istream& is) +{ is.ignore(256, ':'); is.ignore(256, ':'); is.ignore(256, ' ');