Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated to compile on the latest gcc and guichan.

  • Loading branch information...
commit 94bbe25a1b93a30e94e2ab072f792bb273da3b06 1 parent fbc2901
@luqui authored
View
20 soylent/minesweeper_infinity/GUI.cpp
@@ -166,13 +166,13 @@ class OptionsPage : public GUIPage {
std::string eid = eventId.getId();
if(eid == "autocountCheckBox") {
- autocount = oPage->autocountCheckBox->isMarked();
+ autocount = oPage->autocountCheckBox->isSelected();
refreshGameBoard(screenStack.top());
}
else if(eid == "flagClearCheckBox")
- flagClear = oPage->flagClearCheckBox->isMarked();
+ flagClear = oPage->flagClearCheckBox->isSelected();
else if(eid == "interfaceCheckBox")
- rightClickInterface = oPage->interfaceCheckBox->isMarked();
+ rightClickInterface = oPage->interfaceCheckBox->isSelected();
else if(eid == "OKButton")
oPage->running = false;
}
@@ -191,7 +191,7 @@ class OptionsPage : public GUIPage {
void MakeCheckBox(string text, bool checked, int x, int y, string eventID, gcn::CheckBox*& checkBox) {
checkBox = new gcn::CheckBox(text);
- checkBox->setMarked(checked);
+ checkBox->setSelected(checked);
checkBox->setFocusable(false);
checkBox->setPosition(x, y);
// checkBox->setEventId(eventID);
@@ -204,9 +204,9 @@ class OptionsPage : public GUIPage {
if (event.type == SDL_KEYUP)
{
- autocountCheckBox->setMarked(autocount);
- flagClearCheckBox->setMarked(flagClear);
- interfaceCheckBox->setMarked(rightClickInterface);
+ autocountCheckBox->setSelected(autocount);
+ flagClearCheckBox->setSelected(flagClear);
+ interfaceCheckBox->setSelected(rightClickInterface);
}
}
@@ -225,7 +225,7 @@ class OptionsPage : public GUIPage {
titleLabel->setPosition(top->getWidth()/2-titleLabel->getWidth()/2,0);
top->add(titleLabel);
- MakeCheckBox("(A)utocount", autocount, titleLabel->getBorderSize(),
+ MakeCheckBox("(A)utocount", autocount, titleLabel->getFrameSize(),
int(titleLabel->getHeight() + 20*scaleFactor), "autocountCheckBox", autocountCheckBox);
MakeCheckBox("(F)lag Clear", flagClear, autocountCheckBox->getX(),
@@ -242,7 +242,7 @@ class OptionsPage : public GUIPage {
OKButton->addActionListener(optionsActionListener);
//OKButton->setBaseColor(gcn::Color(162, 175, 242, 150));
OKButton->setBaseColor(gcn::Color(255, 255, 255, 0));
- OKButton->setBorderSize(5);
+ OKButton->setFrameSize(5);
top->add(OKButton);
}
@@ -354,7 +354,7 @@ class HighScorePage : public GUIPage {
} else {*/
OKButton->setBaseColor(gcn::Color(255, 255, 255, 0));
//}
- OKButton->setBorderSize(5);
+ OKButton->setFrameSize(5);
top->add(OKButton);
}
View
6 soylent/minesweeper_infinity/HighScoreSheet.h
@@ -35,10 +35,10 @@ struct HighScoreEntry {
bool operator < (const HighScoreEntry& o) const {
return score < o.score
- || score == o.score && (
+ || (score == o.score && (
date < o.date ||
- date == o.date && (
- name < o.name));
+ (date == o.date && (
+ name < o.name))));
}
};
View
2  soylent/minesweeper_infinity/init.cpp
@@ -60,7 +60,7 @@ void initMinefield()
// This is a pretty dumb approximation to the bailout,
// but it should do for now.
- bailout = (boardWidth * boardHeight * 10000) / (30);
+ //bailout = (boardWidth * boardHeight * 10000) / (30);
};
void resetTestChanges(){
View
1  soylent/minesweeper_infinity/main.cpp
@@ -6,6 +6,7 @@
#include <iostream>
#include <ctime>
#include <exception>
+#include <climits>
#include "SDL.h"
#ifdef __WINDOWS__
Please sign in to comment.
Something went wrong with that request. Please try again.