matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update stamps.def when deleting stamps, missing stamps show up as "error loading save" and can be deleted

Browse Source
This commit is contained in:
jacob1 2014-11-11 23:48:36 -05:00
parent cd9fa0c85a
commit 1289465a2c
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -15,6 +15,7 @@ stderr.txt
build*/* build*/*
stamps/* stamps/*
Saves/* Saves/*
scripts/*
generated/* generated/*
includes/* includes/*
generate generate

10
src/client/Client.cpp
View File

@ -989,11 +989,11 @@ void Client::MoveStampToFront(std::string stampID)
SaveFile * Client::GetStamp(std::string stampID) SaveFile * Client::GetStamp(std::string stampID)
{ {
std::string stampFile = std::string(STAMPS_DIR PATH_SEP + stampID + ".stm"); std::string stampFile = std::string(STAMPS_DIR PATH_SEP + stampID + ".stm");
SaveFile * file = new SaveFile(stampID);
if (!FileExists(stampFile)) if (!FileExists(stampFile))
stampFile = stampID; stampFile = stampID;
if(FileExists(stampFile)) if (FileExists(stampFile))
{ {
SaveFile * file = new SaveFile(stampID);
try try
{ {
GameSave * tempSave = new GameSave(ReadFile(stampFile)); GameSave * tempSave = new GameSave(ReadFile(stampFile));
@ -1003,12 +1003,8 @@ SaveFile * Client::GetStamp(std::string stampID)
{ {
std::cerr << "Client: Invalid stamp file, " << stampID << " " << std::string(e.what()) << std::endl; std::cerr << "Client: Invalid stamp file, " << stampID << " " << std::string(e.what()) << std::endl;
} }
}
return file; return file;
}
else
{
return NULL;
}
} }
void Client::DeleteStamp(std::string stampID) void Client::DeleteStamp(std::string stampID)

2
src/client/Client.h
View File

@ -73,7 +73,6 @@ private:
int activeThumbRequestTimes[IMGCONNS]; int activeThumbRequestTimes[IMGCONNS];
int activeThumbRequestCompleteTimes[IMGCONNS]; int activeThumbRequestCompleteTimes[IMGCONNS];
std::string activeThumbRequestIDs[IMGCONNS]; std::string activeThumbRequestIDs[IMGCONNS];
void updateStamps();
static std::vector<std::string> explodePropertyString(std::string property); static std::vector<std::string> explodePropertyString(std::string property);
void notifyUpdateAvailable(); void notifyUpdateAvailable();
void notifyAuthUserChanged(); void notifyAuthUserChanged();
@ -129,6 +128,7 @@ public:
int GetStampsCount(); int GetStampsCount();
SaveFile * GetFirstStamp(); SaveFile * GetFirstStamp();
void MoveStampToFront(std::string stampID); void MoveStampToFront(std::string stampID);
void updateStamps();
RequestStatus AddComment(int saveID, std::string comment); RequestStatus AddComment(int saveID, std::string comment);

8
src/gui/interface/SaveButton.cpp
View File

@ -190,6 +190,8 @@ void SaveButton::Draw(const Point& screenPos)
else else
g->draw_image(thumbnail, screenPos.X+(Size.X-thumbBoxSize.X)/2, screenPos.Y+(Size.Y-21-thumbBoxSize.Y)/2, 255); g->draw_image(thumbnail, screenPos.X+(Size.X-thumbBoxSize.X)/2, screenPos.Y+(Size.Y-21-thumbBoxSize.Y)/2, 255);
} }
else if (file && !file->GetGameSave())
g->drawtext(screenPos.X+(Size.X-Graphics::textwidth("Error loading save"))/2, screenPos.Y+(Size.Y-28)/2, "Error loading save", 180, 180, 180, 255);
if(save) if(save)
{ {
if(save->id) if(save->id)
@ -253,14 +255,14 @@ void SaveButton::Draw(const Point& screenPos)
g->drawtext(screenPos.X, screenPos.Y-2, "\xCE", 212, 151, 81, 255); g->drawtext(screenPos.X, screenPos.Y-2, "\xCE", 212, 151, 81, 255);
} }
} }
if(file) else if (file)
{ {
if(isMouseInside) if (isMouseInside)
g->drawrect(screenPos.X+(Size.X-thumbBoxSize.X)/2, screenPos.Y+(Size.Y-21-thumbBoxSize.Y)/2, thumbBoxSize.X, thumbBoxSize.Y, 210, 230, 255, 255); g->drawrect(screenPos.X+(Size.X-thumbBoxSize.X)/2, screenPos.Y+(Size.Y-21-thumbBoxSize.Y)/2, thumbBoxSize.X, thumbBoxSize.Y, 210, 230, 255, 255);
else else
g->drawrect(screenPos.X+(Size.X-thumbBoxSize.X)/2, screenPos.Y+(Size.Y-21-thumbBoxSize.Y)/2, thumbBoxSize.X, thumbBoxSize.Y, 180, 180, 180, 255); g->drawrect(screenPos.X+(Size.X-thumbBoxSize.X)/2, screenPos.Y+(Size.Y-21-thumbBoxSize.Y)/2, thumbBoxSize.X, thumbBoxSize.Y, 180, 180, 180, 255);
if(isMouseInside) if (isMouseInside)
{ {
g->drawtext(screenPos.X+(Size.X-Graphics::textwidth((char *)name.c_str()))/2, screenPos.Y+Size.Y - 21, name, 255, 255, 255, 255); g->drawtext(screenPos.X+(Size.X-Graphics::textwidth((char *)name.c_str()))/2, screenPos.Y+Size.Y - 21, name, 255, 255, 255, 255);
} }

1
src/gui/localbrowser/LocalBrowserController.cpp
View File

@ -76,6 +76,7 @@ void LocalBrowserController::removeSelectedC()
} }
virtual void after() virtual void after()
{ {
Client::Ref().updateStamps();
c->RefreshSavesList(); c->RefreshSavesList();
} }
}; };

6
src/gui/localbrowser/LocalBrowserView.cpp
View File

@ -233,12 +233,12 @@ void LocalBrowserView::NotifySavesListChanged(LocalBrowserModel * sender)
void LocalBrowserView::NotifySelectedChanged(LocalBrowserModel * sender) void LocalBrowserView::NotifySelectedChanged(LocalBrowserModel * sender)
{ {
vector<std::string> selected = sender->GetSelected(); vector<std::string> selected = sender->GetSelected();
for(int j = 0; j < stampButtons.size(); j++) for (int j = 0; j < stampButtons.size(); j++)
{ {
stampButtons[j]->SetSelected(false); stampButtons[j]->SetSelected(false);
for(int i = 0; i < selected.size(); i++) for (int i = 0; i < selected.size(); i++)
{ {
if(stampButtons[j]->GetSaveFile()->GetName()==selected[i]) if (stampButtons[j]->GetSaveFile()->GetName()==selected[i])
stampButtons[j]->SetSelected(true); stampButtons[j]->SetSelected(true);
} }
} }