diff options
| author | Seline <none@none> | 2008-10-14 11:57:03 -0500 |
|---|---|---|
| committer | Seline <none@none> | 2008-10-14 11:57:03 -0500 |
| commit | 2265aef916e3b2d63d87faa68a2b51e7d747c54c (patch) | |
| tree | b05420685b7d202aade6f70a6f511adbfb79e37f /src/game/Makefile.am | |
| parent | 222cbfd4644412fb8e5aeed7c37c88797d09964a (diff) | |
[svn] * Merge Temp dev SVN with Assembla.
* Changes include:
- Implementation of w12x's Outdoor PvP and Game Event Systems.
- Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed).
- All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql).
- Improved Config cleanup.
- And many more changes.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Makefile.am')
| -rw-r--r-- | src/game/Makefile.am | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/src/game/Makefile.am b/src/game/Makefile.am index e839304ad8c..290441870e1 100644 --- a/src/game/Makefile.am +++ b/src/game/Makefile.am @@ -4,7 +4,7 @@ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -141,21 +141,6 @@ $(srcdir)/InstanceData.cpp \ $(srcdir)/InstanceData.h \ $(srcdir)/InstanceSaveMgr.cpp \ $(srcdir)/InstanceSaveMgr.h \ -$(srcdir)/IRCClient.cpp \ -$(srcdir)/IRCClient.h \ -$(srcdir)/IRCCmd.cpp \ -$(srcdir)/IRCCmd.h \ -$(srcdir)/IRCCmde.cpp \ -$(srcdir)/IRCConf.cpp \ -$(srcdir)/IRCConf.h \ -$(srcdir)/IRCConf.h \ -$(srcdir)/IRCFunc.h \ -$(srcdir)/IRCIO.cpp \ -$(srcdir)/IRCLog.cpp \ -$(srcdir)/IRCLog.h \ -$(srcdir)/IRCSock.cpp \ -$(srcdir)/MCS_OnlinePlayers.cpp \ -$(srcdir)/MCS_OnlinePlayers.h \ $(srcdir)/Item.cpp \ $(srcdir)/Item.h \ $(srcdir)/ItemEnchantmentMgr.cpp \ @@ -201,6 +186,24 @@ $(srcdir)/ObjectMgr.cpp \ $(srcdir)/ObjectMgr.h \ $(srcdir)/Opcodes.cpp \ $(srcdir)/Opcodes.h \ +$(srcdir)/OutdoorPvP.cpp \ +$(srcdir)/OutdoorPvP.h \ +$(srcdir)/OutdoorPvPEP.cpp \ +$(srcdir)/OutdoorPvPEP.h \ +$(srcdir)/OutdoorPvPHP.cpp \ +$(srcdir)/OutdoorPvPHP.h \ +$(srcdir)/OutdoorPvPMgr.cpp \ +$(srcdir)/OutdoorPvPMgr.h \ +$(srcdir)/OutdoorPvPNA.cpp \ +$(srcdir)/OutdoorPvPNA.h \ +$(srcdir)/OutdoorPvPObjectiveAI.cpp \ +$(srcdir)/OutdoorPvPObjectiveAI.h \ +$(srcdir)/OutdoorPvPSI.cpp \ +$(srcdir)/OutdoorPvPSI.h \ +$(srcdir)/OutdoorPvPTF.cpp \ +$(srcdir)/OutdoorPvPTF.h \ +$(srcdir)/OutdoorPvPZM.cpp \ +$(srcdir)/OutdoorPvPZM.h \ $(srcdir)/Path.h \ $(srcdir)/PetAI.cpp \ $(srcdir)/PetAI.h \ |