X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameDraw.cpp;h=ad674461ca94485f982766aecd10cb6d02ad0505;hb=b757d628d06570c93feb2f485b7a9f9b8134ca25;hp=66f1e27eb5cd01ee744e122d81fa184e5cc744a3;hpb=42bf932baf8cecf12b4daba00c4453093aa4971a;p=lugaru.git diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp index 66f1e27..ad67446 100644 --- a/Source/GameDraw.cpp +++ b/Source/GameDraw.cpp @@ -2276,7 +2276,7 @@ void Game::DrawMenu() { Menu::addButton(3,"Delete User",NULL,400,10,-1,-1); Menu::addButton(4,"Main Menu",NULL,5,10,-1,-1); Menu::addButton(5,"Change User",NULL,5,180,-1,-1); - Menu::addButton(6,"",NULL,200,420,-1,-1); + Menu::addButton(6,"Campaign : "+accountactive->getCurrentCampaign(),NULL,200,420,-1,-1); //show campaign map //with (2,-5) offset from old code @@ -2291,8 +2291,10 @@ void Game::DrawMenu() { if(!active) itemsize/=2; - if(i>=1) - Menu::addMapLine(campaignlevels[i-1].getCenter(),midpoint,0.5,active?1:0.5,active?1:0.5,0,0); + if(i>=1){ + XYZ start=campaignlevels[i-1].getCenter(); + Menu::addMapLine(start.x,start.y,midpoint.x-start.x,midpoint.y-start.y,0.5,active?1:0.5,active?1:0.5,0,0); + } Menu::addMapMarker(NB_CAMPAIGN_MENU_ITEM+i, Mapcircletexture, NULL, midpoint.x-itemsize/2, midpoint.y-itemsize/2, itemsize, itemsize, active?1:0.5, 0, 0); @@ -2304,7 +2306,6 @@ void Game::DrawMenu() { } } } - Menu::setButtonText(6,"Campaign : "+accountactive->getCurrentCampaign()); } break; case 6: {