summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-02-27 16:37:03 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-02-27 17:08:30 +0100
commit26b6a14eac441e6069701b37255e1eafa532d7f6 (patch)
tree4f985c3ba2d90613fd066f13140c01da7a998fd6 /src
parent12f9c5639d74747d5e22ec29c1df8d09256b8772 (diff)
downloadmana-client-26b6a14eac441e6069701b37255e1eafa532d7f6.tar.gz
mana-client-26b6a14eac441e6069701b37255e1eafa532d7f6.tar.bz2
mana-client-26b6a14eac441e6069701b37255e1eafa532d7f6.tar.xz
mana-client-26b6a14eac441e6069701b37255e1eafa532d7f6.zip
No point in calling Viewport::setMap(0) before deleting it
Reviewed-by: Jared Adams
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp3
-rw-r--r--src/net/ea/messageout.cpp2
-rw-r--r--src/net/ea/network.cpp2
-rw-r--r--src/net/ea/network.h2
-rw-r--r--src/net/manaserv/messageout.cpp2
5 files changed, 4 insertions, 7 deletions
diff --git a/src/game.cpp b/src/game.cpp
index c474d41b..5b0295da 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -275,9 +275,6 @@ Game::~Game()
delete commandHandler;
delete joystick;
delete particleEngine;
-
- viewport->setMap(NULL);
-
delete viewport;
delete mCurrentMap;
map_path = "";
diff --git a/src/net/ea/messageout.cpp b/src/net/ea/messageout.cpp
index 9e7f2b15..844580a9 100644
--- a/src/net/ea/messageout.cpp
+++ b/src/net/ea/messageout.cpp
@@ -125,4 +125,4 @@ void MessageOut::writeCoordinates(unsigned short x, unsigned short y,
data[2] |= direction;
}
-}
+} // namespace EAthena
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index 3b8ad509..0467241f 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -475,4 +475,4 @@ Uint16 Network::readWord(int pos)
#endif
}
-}
+} // namespace EAthena
diff --git a/src/net/ea/network.h b/src/net/ea/network.h
index baaefb4a..0b391bf0 100644
--- a/src/net/ea/network.h
+++ b/src/net/ea/network.h
@@ -125,6 +125,6 @@ class Network
static Network *mInstance;
};
-}
+} // namespace EAthena
#endif // NET_EA_NETWORK_H
diff --git a/src/net/manaserv/messageout.cpp b/src/net/manaserv/messageout.cpp
index 887d91d6..8779c5f6 100644
--- a/src/net/manaserv/messageout.cpp
+++ b/src/net/manaserv/messageout.cpp
@@ -61,4 +61,4 @@ void MessageOut::writeInt32(Sint32 value)
mPos += 4;
}
-}
+} // namespace ManaServ