summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/being.cpp8
-rw-r--r--src/game.cpp4
-rw-r--r--src/gui/focushandler.cpp2
-rw-r--r--src/gui/playerbox.cpp2
-rw-r--r--src/gui/popupmenu.cpp20
-rw-r--r--src/gui/radiobutton.cpp2
-rw-r--r--src/gui/scrollarea.cpp2
-rw-r--r--src/gui/table.cpp4
-rw-r--r--src/gui/truetypefont.cpp2
-rw-r--r--src/gui/updatewindow.cpp4
-rw-r--r--src/gui/widgets/tabbedarea.cpp2
-rw-r--r--src/localplayer.cpp2
-rw-r--r--src/net/partyhandler.cpp2
-rw-r--r--src/resources/resourcemanager.cpp2
-rw-r--r--src/simpleanimation.cpp2
-rw-r--r--src/sound.cpp8
16 files changed, 34 insertions, 34 deletions
diff --git a/src/being.cpp b/src/being.cpp
index 565eb35f..0ccf675c 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -370,8 +370,8 @@ void Being::setDirection(Uint8 direction)
for (int i = 0; i < VECTOREND_SPRITE; i++)
{
- if (mSprites[i] != NULL)
- mSprites[i]->setDirection(dir);
+ if (mSprites[i])
+ mSprites[i]->setDirection(dir);
}
}
@@ -470,7 +470,7 @@ void Being::logic()
// Update sprite animations
for (int i = 0; i < VECTOREND_SPRITE; i++)
{
- if (mSprites[i] != NULL)
+ if (mSprites[i])
{
mSprites[i]->update(tick_time * 10);
}
@@ -500,7 +500,7 @@ void Being::draw(Graphics *graphics, int offsetX, int offsetY) const
for (int i = 0; i < VECTOREND_SPRITE; i++)
{
- if (mSprites[i] != NULL)
+ if (mSprites[i])
{
mSprites[i]->draw(graphics, px, py);
}
diff --git a/src/game.cpp b/src/game.cpp
index f09e06e6..5b701fc1 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -518,8 +518,8 @@ void Game::handleInput()
{
// Input chat window
if (!(chatWindow->isInputFocused() ||
- deathNotice != NULL ||
- weightNotice != NULL))
+ deathNotice ||
+ weightNotice))
{
// Quit by pressing Enter if the exit confirm is there
if (exitConfirm &&
diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp
index dd605be6..b9cfd789 100644
--- a/src/gui/focushandler.cpp
+++ b/src/gui/focushandler.cpp
@@ -26,7 +26,7 @@ void FocusHandler::requestModalFocus(gcn::Widget *widget)
/* If there is another widget with modal focus, remove its modal focus
* and put it on the modal widget stack.
*/
- if (mModalFocusedWidget != NULL && mModalFocusedWidget != widget)
+ if (mModalFocusedWidget && mModalFocusedWidget != widget)
{
mModalStack.push_front(mModalFocusedWidget);
mModalFocusedWidget = NULL;
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 60003fb5..f99ce6ef 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -87,7 +87,7 @@ void PlayerBox::draw(gcn::Graphics *graphics)
y = getHeight() / 2 + bs;
for (int i = 0; i < Being::VECTOREND_SPRITE; i++)
{
- if (mPlayer->getSprite(i) != NULL)
+ if (mPlayer->getSprite(i))
{
mPlayer->getSprite(i)->draw(static_cast<Graphics*>(graphics), x, y);
}
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index be5252f7..3503d0ea 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -148,7 +148,7 @@ void PopupMenu::handleLink(const std::string& link)
// Talk To action
if (link == "talk" &&
- being != NULL &&
+ being &&
being->getType() == Being::NPC &&
current_npc == 0)
{
@@ -157,7 +157,7 @@ void PopupMenu::handleLink(const std::string& link)
// Trade action
else if (link == "trade" &&
- being != NULL &&
+ being &&
being->getType() == Being::PLAYER)
{
player_node->trade(being);
@@ -166,35 +166,35 @@ void PopupMenu::handleLink(const std::string& link)
// Attack action
else if (link == "attack" &&
- being != NULL &&
+ being &&
being->getType() == Being::PLAYER)
{
player_node->attack(being, true);
}
else if (link == "unignore" &&
- being != NULL &&
+ being &&
being->getType() == Being::PLAYER)
{
player_relations.setRelation(being->getName(), PlayerRelation::NEUTRAL);
}
else if (link == "ignore" &&
- being != NULL &&
+ being &&
being->getType() == Being::PLAYER)
{
player_relations.setRelation(being->getName(), PlayerRelation::IGNORED);
}
else if (link == "disregard" &&
- being != NULL &&
+ being &&
being->getType() == Being::PLAYER)
{
player_relations.setRelation(being->getName(), PlayerRelation::DISREGARDED);
}
else if (link == "friend" &&
- being != NULL &&
+ being &&
being->getType() == Being::PLAYER)
{
player_relations.setRelation(being->getName(), PlayerRelation::FRIEND);
@@ -208,7 +208,7 @@ void PopupMenu::handleLink(const std::string& link)
/*
// Add Buddy action
- else if ((link == "buddy") && being != NULL && being->isPlayer())
+ else if ((link == "buddy") && being && being->isPlayer())
{
if (!buddyWindow->isVisible())
buddyWindow->setVisible(true);
@@ -217,7 +217,7 @@ void PopupMenu::handleLink(const std::string& link)
}*/
// Pick Up Floor Item action
- else if ((link == "pickup") && mFloorItem != NULL)
+ else if ((link == "pickup") && mFloorItem)
{
player_node->pickUp(mFloorItem);
}
@@ -257,7 +257,7 @@ void PopupMenu::handleLink(const std::string& link)
new ItemAmountWindow(AMOUNT_ITEM_DROP, inventoryWindow, mItem);
}
else if (link == "party-invite" &&
- being != NULL &&
+ being &&
being->getType() == Being::PLAYER)
{
MessageOut outMsg(player_node->getNetwork());
diff --git a/src/gui/radiobutton.cpp b/src/gui/radiobutton.cpp
index de8d4d9d..c8ae2fad 100644
--- a/src/gui/radiobutton.cpp
+++ b/src/gui/radiobutton.cpp
@@ -92,7 +92,7 @@ void RadioButton::drawBox(gcn::Graphics* graphics)
else
box = radioDisabled;
- if (box != NULL)
+ if (box)
static_cast<Graphics*>(graphics)->drawImage(box, 2, 2);
}
diff --git a/src/gui/scrollarea.cpp b/src/gui/scrollarea.cpp
index eacc4714..bc3a62dc 100644
--- a/src/gui/scrollarea.cpp
+++ b/src/gui/scrollarea.cpp
@@ -153,7 +153,7 @@ void ScrollArea::logic()
// When no scrollbar in a certain direction, adapt content size to match
// the content dimension exactly.
- if (content != NULL)
+ if (content)
{
if (getHorizontalScrollPolicy() == gcn::ScrollArea::SHOW_NEVER)
{
diff --git a/src/gui/table.cpp b/src/gui/table.cpp
index 1ee9da0f..8dd546d9 100644
--- a/src/gui/table.cpp
+++ b/src/gui/table.cpp
@@ -185,7 +185,7 @@ int GuiTable::getColumnWidth(int i)
void GuiTable::setSelectedRow(int selected)
{
- if (mModel == NULL)
+ if (!mModel)
{
mSelectedRow = -1;
}
@@ -213,7 +213,7 @@ void GuiTable::setSelectedRow(int selected)
void GuiTable::setSelectedColumn(int selected)
{
- if (mModel == NULL)
+ if (!mModel)
{
mSelectedColumn = -1;
}
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 66855b77..8e6636df 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -91,7 +91,7 @@ TrueTypeFont::TrueTypeFont(const std::string &filename, int size)
++fontCounter;
mFont = TTF_OpenFont(filename.c_str(), size);
- if (mFont == NULL)
+ if (!mFont)
{
throw GCN_EXCEPTION("SDLTrueTypeFont::SDLTrueTypeFont: " +
std::string(TTF_GetError()));
diff --git a/src/gui/updatewindow.cpp b/src/gui/updatewindow.cpp
index 01c28aca..b3861b27 100644
--- a/src/gui/updatewindow.cpp
+++ b/src/gui/updatewindow.cpp
@@ -205,7 +205,7 @@ void UpdaterWindow::loadNews()
// Tokenize and add each line separately
char *line = strtok(mMemoryBuffer, "\n");
- while (line != NULL)
+ while (line)
{
mBrowserBox->addRow(line);
line = strtok(NULL, "\n");
@@ -408,7 +408,7 @@ void UpdaterWindow::download()
mDownloadComplete = false;
mThread = SDL_CreateThread(UpdaterWindow::downloadThread, this);
- if (mThread == NULL)
+ if (!mThread)
{
logger->log("Unable to create mThread");
mDownloadStatus = UPDATE_ERROR;
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index c4e22bff..5ff7c4bc 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -90,7 +90,7 @@ void TabbedArea::addTab(Tab *tab, gcn::Widget *widget)
mTabContainer->add(tab);
mTabs.push_back(std::pair<Tab*, gcn::Widget*>(tab, widget));
- if (mSelectedTab == NULL)
+ if (!mSelectedTab)
{
setSelectedTab(tab);
}
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index bb43f24f..a02a8b1b 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -343,7 +343,7 @@ void LocalPlayer::setTarget(Being *target)
return;
mLastTarget = tick_time;
- if ((target == NULL) || target == mTarget)
+ if (!target || target == mTarget)
{
target = NULL;
mKeepAttacking = false;
diff --git a/src/net/partyhandler.cpp b/src/net/partyhandler.cpp
index 03aca66d..fe7db55d 100644
--- a/src/net/partyhandler.cpp
+++ b/src/net/partyhandler.cpp
@@ -69,7 +69,7 @@ void PartyHandler::handleMessage(MessageIn *msg)
{
int id = msg->readInt32();
Being *being = beingManager->findBeing(id);
- if (being == NULL)
+ if (!being)
{
break;
}
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index d005c212..fa8f4654 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -159,7 +159,7 @@ void ResourceManager::searchAndAddArchives(const std::string &path,
const char *dirSep = PHYSFS_getDirSeparator();
char **list = PHYSFS_enumerateFiles(path.c_str());
- for (char **i = list; *i != NULL; i++)
+ for (char **i = list; *i; i++)
{
size_t len = strlen(*i);
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp
index d90602a6..48f2f6a5 100644
--- a/src/simpleanimation.cpp
+++ b/src/simpleanimation.cpp
@@ -49,7 +49,7 @@ SimpleAnimation::SimpleAnimation(xmlNodePtr animationNode):
// Get animation frames
for ( xmlNodePtr frameNode = animationNode->xmlChildrenNode;
- frameNode != NULL;
+ frameNode;
frameNode = frameNode->next)
{
int delay = XML::getProperty(frameNode, "delay", 0);
diff --git a/src/sound.cpp b/src/sound.cpp
index 78538c09..6e0b0da0 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -128,7 +128,7 @@ void Sound::playMusic(const std::string &filename, int loop)
{
if (!mInstalled) return;
- if (mMusic != NULL) {
+ if (mMusic) {
stopMusic();
}
@@ -154,7 +154,7 @@ void Sound::stopMusic()
logger->log("Sound::stopMusic()");
- if (mMusic != NULL) {
+ if (mMusic) {
Mix_HaltMusic();
Mix_FreeMusic(mMusic);
mMusic = NULL;
@@ -165,7 +165,7 @@ void Sound::fadeInMusic(const std::string &path, int loop, int ms)
{
if (!mInstalled) return;
- if (mMusic != NULL) {
+ if (mMusic) {
stopMusic();
}
@@ -188,7 +188,7 @@ void Sound::fadeOutMusic(int ms)
logger->log("Sound::fadeOutMusic() Fading-out (%i ms)", ms);
- if (mMusic != NULL) {
+ if (mMusic) {
Mix_FadeOutMusic(ms);
Mix_FreeMusic(mMusic);
mMusic = NULL;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-22 11:22:55 +0000