summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-13 01:37:45 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-13 01:37:45 +0300
commit357560f6a8a0b61d94b6a70a519a2d3ece6f364d (patch)
tree66e2fb9d2e7ec821d432cea7242e0724c52f9796 /src
parent2eb0a7d5c06b0505d862fde29dd9d9807933959b (diff)
downloadplus-357560f6a8a0b61d94b6a70a519a2d3ece6f364d.tar.gz
plus-357560f6a8a0b61d94b6a70a519a2d3ece6f364d.tar.bz2
plus-357560f6a8a0b61d94b6a70a519a2d3ece6f364d.tar.xz
plus-357560f6a8a0b61d94b6a70a519a2d3ece6f364d.zip
Fix make files and compilation errors.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt5
-rw-r--r--src/Makefile.am5
-rw-r--r--src/net/eathena/maphandler.cpp2
-rw-r--r--src/net/tmwa/maphandler.cpp2
4 files changed, 12 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 670a06bb4..1d050bf96 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1389,6 +1389,8 @@ SET(SRCS_TMWAEATHENA
net/tmwa/homunculushandler.h
net/tmwa/mailhandler.cpp
net/tmwa/mailhandler.h
+ net/tmwa/maphandler.cpp
+ net/tmwa/maphandler.h
net/tmwa/markethandler.cpp
net/tmwa/markethandler.h
net/tmwa/mercenaryhandler.cpp
@@ -1429,6 +1431,7 @@ SET(SRCS_EATHENA
net/friendshandler.h
net/homunculushandler.h
net/mailhandler.h
+ net/maphandler.h
net/markethandler.h
net/mercenaryhandler.h
net/searchstorehandler.h
@@ -1475,6 +1478,8 @@ SET(SRCS_EATHENA
net/eathena/loginhandler.h
net/eathena/mailhandler.cpp
net/eathena/mailhandler.h
+ net/eathena/maphandler.cpp
+ net/eathena/maphandler.h
net/eathena/maptypeproperty2.h
net/eathena/markethandler.cpp
net/eathena/markethandler.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 0aeda3e94..7ceb56bcc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1320,6 +1320,8 @@ manaplus_SOURCES += net/tmwa/auctionhandler.cpp \
net/tmwa/homunculushandler.h \
net/tmwa/mailhandler.cpp \
net/tmwa/mailhandler.h \
+ net/tmwa/maphandler.cpp \
+ net/tmwa/maphandler.h \
net/tmwa/markethandler.cpp \
net/tmwa/markethandler.h \
net/tmwa/mercenaryhandler.cpp \
@@ -1360,6 +1362,7 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
net/friendshandler.h \
net/homunculushandler.h \
net/mailhandler.h \
+ net/maphandler.h \
net/markethandler.h \
net/mercenaryhandler.h \
net/searchstorehandler.h \
@@ -1406,6 +1409,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
net/eathena/loginhandler.h \
net/eathena/mailhandler.cpp \
net/eathena/mailhandler.h \
+ net/eathena/maphandler.cpp \
+ net/eathena/maphandler.h \
net/eathena/maptypeproperty2.h \
net/eathena/markethandler.cpp \
net/eathena/markethandler.h \
diff --git a/src/net/eathena/maphandler.cpp b/src/net/eathena/maphandler.cpp
index e265db717..51b78d4ff 100644
--- a/src/net/eathena/maphandler.cpp
+++ b/src/net/eathena/maphandler.cpp
@@ -46,7 +46,7 @@ MapHandler::MapHandler() :
0
};
handledMessages = _messages;
- mailHandler = this;
+ mapHandler = this;
}
void MapHandler::handleMessage(Net::MessageIn &msg)
diff --git a/src/net/tmwa/maphandler.cpp b/src/net/tmwa/maphandler.cpp
index 483ca0f54..da0cb2421 100644
--- a/src/net/tmwa/maphandler.cpp
+++ b/src/net/tmwa/maphandler.cpp
@@ -42,7 +42,7 @@ MapHandler::MapHandler() :
0
};
handledMessages = _messages;
- mailHandler = this;
+ mapHandler = this;
}
void MapHandler::handleMessage(Net::MessageIn &msg)