summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui/chat.cpp16
-rw-r--r--src/gui/confirm_dialog.cpp4
-rw-r--r--src/gui/debugwindow.cpp2
-rw-r--r--src/gui/listbox.cpp2
-rw-r--r--src/gui/ok_dialog.cpp6
-rw-r--r--src/gui/setup_players.cpp4
-rw-r--r--src/gui/shop.h2
-rw-r--r--src/gui/widgets/dropdown.cpp6
-rw-r--r--src/map.cpp2
-rw-r--r--src/shopitem.h2
10 files changed, 23 insertions, 23 deletions
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 91e410ce..47fadc8d 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -141,12 +141,12 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord)
// *implements actions in a backwards compatible way*
if (own == BY_PLAYER &&
- tmp.text.at(0) == '*' &&
- tmp.text.at(tmp.text.length()-1) == '*')
+ tmp.text.at(0) == '*' &&
+ tmp.text.at(tmp.text.length()-1) == '*')
{
- tmp.text[0] = ' ';
- tmp.text.erase(tmp.text.length() - 1);
- own = ACT_IS;
+ tmp.text[0] = ' ';
+ tmp.text.erase(tmp.text.length() - 1);
+ own = ACT_IS;
}
std::string lineColor = "##C";
@@ -615,9 +615,9 @@ void ChatWindow::chatSend(const std::string &nick, std::string msg)
}
else if (command == "me")
{
- std::stringstream actionStr;
- actionStr << "*" << msg << "*";
- chatSend(player_node->getName(), actionStr.str());
+ std::stringstream actionStr;
+ actionStr << "*" << msg << "*";
+ chatSend(player_node->getName(), actionStr.str());
}
else
{
diff --git a/src/gui/confirm_dialog.cpp b/src/gui/confirm_dialog.cpp
index 2bc330c0..f4b49251 100644
--- a/src/gui/confirm_dialog.cpp
+++ b/src/gui/confirm_dialog.cpp
@@ -57,7 +57,7 @@ ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
{
// fontHeight == height of each line of text (based on font heights)
// 14 == row top + bottom graphic pixel heights
- setContentSize(mTextBox->getMinWidth() + fontHeight, ((numRows + 1) *
+ setContentSize(mTextBox->getMinWidth() + fontHeight, ((numRows + 1) *
fontHeight) + noButton->getHeight());
mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5,
3 + (numRows * fontHeight)));
@@ -68,7 +68,7 @@ ConfirmDialog::ConfirmDialog(const std::string &title, const std::string &msg,
width = getFont()->getWidth(msg);
if (width < inWidth)
width = inWidth;
- setContentSize(width + fontHeight, (2 * fontHeight) +
+ setContentSize(width + fontHeight, (2 * fontHeight) +
noButton->getHeight());
mTextArea->setDimension(gcn::Rectangle(4, 5, width + 5, 17));
}
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 1a805dd4..dafd604a 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -71,7 +71,7 @@ void DebugWindow::logic()
mFPSLabel->setCaption(toString(fps) + " FPS");
- mTileMouseLabel->setCaption("Tile: (" + toString(mouseTileX) + ", " +
+ mTileMouseLabel->setCaption("Tile: (" + toString(mouseTileX) + ", " +
toString(mouseTileY) + ")");
Map *currentMap = engine->getCurrentMap();
diff --git a/src/gui/listbox.cpp b/src/gui/listbox.cpp
index 6d5c0ca8..82011239 100644
--- a/src/gui/listbox.cpp
+++ b/src/gui/listbox.cpp
@@ -112,7 +112,7 @@ void ListBox::keyPressed(gcn::KeyEvent& keyEvent)
}
else if (key.getValue() == gcn::Key::UP)
{
- setSelected(mSelected - 1);
+ setSelected(mSelected - 1);
keyEvent.consume();
}
else if (key.getValue() == gcn::Key::DOWN)
diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 9621b389..d3e7bec6 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -53,10 +53,10 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
if (numRows > 1)
{
// 14 == row top + bottom graphic pixel heights
- setContentSize(mTextBox->getMinWidth() + fontHeight, ((numRows + 1) *
+ setContentSize(mTextBox->getMinWidth() + fontHeight, ((numRows + 1) *
fontHeight) + okButton->getHeight());
- mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5,
- 3 + (numRows * fontHeight)));
+ mTextArea->setDimension(gcn::Rectangle(4, 5,
+ mTextBox->getMinWidth() + 5, 3 + (numRows * fontHeight)));
}
else
{
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 9105d44a..faf80640 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -330,7 +330,7 @@ void Setup_Players::apply()
~(PlayerRelation::TRADE |
PlayerRelation::WHISPER);
player_relations.setDefault(old_default_relations
- | (mDefaultTrading->isSelected() ?
+ | (mDefaultTrading->isSelected() ?
PlayerRelation::TRADE : 0)
| (mDefaultWhisper->isSelected() ?
PlayerRelation::WHISPER : 0));
@@ -342,7 +342,7 @@ void Setup_Players::cancel()
void Setup_Players::action(const gcn::ActionEvent &event)
{
- if (event.getId() == ACTION_TABLE)
+ if (event.getId() == ACTION_TABLE)
{
// temporarily eliminate ourselves: we are fully aware of this change,
// so there is no need for asynchronous updates. (In fact, thouse
diff --git a/src/gui/shop.h b/src/gui/shop.h
index 26a9429d..118847f9 100644
--- a/src/gui/shop.h
+++ b/src/gui/shop.h
@@ -38,7 +38,7 @@ class ShopItem;
* The addItem routine can automatically check, if an item already exists and
* only adds duplicates to the old item, if one is found. The original
* distribution of the duplicates can be retrieved from the item.
- *
+ *
* This functionality can be enabled in the constructor.
*/
class ShopItems : public gcn::ListModel
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 9fcf173c..035ce5d7 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -79,10 +79,10 @@ DropDown::DropDown(gcn::ListModel *listModel, gcn::ScrollArea *scrollArea,
{
for (x = 0; x < 3; x++)
{
- skin.grid[a] = boxBorder->getSubImage(gridx[x], gridy[y],
- gridx[x + 1] -
+ skin.grid[a] = boxBorder->getSubImage(gridx[x], gridy[y],
+ gridx[x + 1] -
gridx[x] + 1,
- gridy[y + 1] -
+ gridy[y + 1] -
gridy[y] + 1);
skin.grid[a]->setAlpha(mAlpha);
a++;
diff --git a/src/map.cpp b/src/map.cpp
index b780b5cc..bda618e2 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -86,7 +86,7 @@ void TileAnimation::update()
Image *img = mAnimation->getCurrentImage();
if (img != mLastImage)
{
- for (std::list<std::pair<MapLayer*, int> >::iterator i =
+ for (std::list<std::pair<MapLayer*, int> >::iterator i =
mAffected.begin(); i != mAffected.end(); i++)
{
i->first->setTile(i->second, img);
diff --git a/src/shopitem.h b/src/shopitem.h
index 18608a94..afc48bf5 100644
--- a/src/shopitem.h
+++ b/src/shopitem.h
@@ -96,7 +96,7 @@ class ShopItem : public Item
* Reduces the quantity of the topmost duplicate by the specified
* amount. Also reduces the total quantity of this DuplicateItem.
* Empty duplicates are automatically removed.
- *
+ *
* If the amount is bigger than the quantity of the current topmost,
* only sell as much as possible. Returns the amount actually sold (do
* not ignore the return value!)
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-22 16:36:08 +0000