summaryrefslogtreecommitdiff
path: root/src/save/ServerSaveActivity.h
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2013-03-16 11:20:23 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2013-03-16 11:20:23 (GMT)
commitb6e1526345b2e2e189b999ddc3fabdb151f395fb (patch)
tree65dd16210aea9bfdef8b099e1a8515e5bc6ff71a /src/save/ServerSaveActivity.h
parent0646b7fe41bf8dc94b4f2eb1e3e1c0e85ac1f254 (diff)
parentff304321c54530040d82cb51b8c8742ed7611e54 (diff)
downloadpowder-b6e1526345b2e2e189b999ddc3fabdb151f395fb.zip
powder-b6e1526345b2e2e189b999ddc3fabdb151f395fb.tar.gz
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/save/ServerSaveActivity.h')
-rw-r--r--src/save/ServerSaveActivity.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/save/ServerSaveActivity.h b/src/save/ServerSaveActivity.h
index 43411c3..793579b 100644
--- a/src/save/ServerSaveActivity.h
+++ b/src/save/ServerSaveActivity.h
@@ -28,6 +28,7 @@ public:
void saveUpload();
virtual void Save();
virtual void Exit();
+ virtual void ShowRules();
virtual void OnDraw();
virtual void OnResponseReady(void * imagePtr);
virtual void OnTick(float dt);
@@ -44,6 +45,8 @@ protected:
ui::Checkbox * pausedCheckbox;
class CancelAction;
class SaveAction;
+ class RulesAction;
friend class CancelAction;
friend class SaveAction;
+ friend class RulesAction;
}; \ No newline at end of file