diff --git a/code/nel/src/misc.vcproj b/code/nel/src/misc.vcproj index 36c0efdfd..017efdf64 100644 --- a/code/nel/src/misc.vcproj +++ b/code/nel/src/misc.vcproj @@ -91,80 +91,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + // Copyright (C) 2010 Winch Gate Property Limited // diff --git a/code/ryzom/client/data/gamedev/adds/interfaces/matis_island_full_map.tga b/code/ryzom/client/data/gamedev/adds/interfaces/matis_island_full_map.tga new file mode 100644 index 000000000..36ff71c6c Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/interfaces/matis_island_full_map.tga differ diff --git a/code/ryzom/client/data/gamedev/adds/sfx/mp_flower.ps b/code/ryzom/client/data/gamedev/adds/sfx/mp_flower.ps new file mode 100644 index 000000000..5b34ae358 Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/sfx/mp_flower.ps differ diff --git a/code/ryzom/client/data/gamedev/adds/shapes/FY_Acc_Chaudron_A_1.shape b/code/ryzom/client/data/gamedev/adds/shapes/FY_Acc_Chaudron_A_1.shape new file mode 100644 index 000000000..346a6942c Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/FY_Acc_Chaudron_A_1.shape differ diff --git a/code/ryzom/client/data/gamedev/adds/shapes/GE_Mission_Table.shape b/code/ryzom/client/data/gamedev/adds/shapes/GE_Mission_Table.shape new file mode 100644 index 000000000..402e4f026 Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/GE_Mission_Table.shape differ diff --git a/code/ryzom/client/data/gamedev/adds/shapes/GE_Mission_larvicultor_table.shape b/code/ryzom/client/data/gamedev/adds/shapes/GE_Mission_larvicultor_table.shape new file mode 100644 index 000000000..5fa7f2125 Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/GE_Mission_larvicultor_table.shape differ diff --git a/code/ryzom/client/data/gamedev/adds/shapes/GE_Tr_Map_Panel.shape b/code/ryzom/client/data/gamedev/adds/shapes/GE_Tr_Map_Panel.shape new file mode 100644 index 000000000..1446b694c Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/GE_Tr_Map_Panel.shape differ diff --git a/code/ryzom/client/data/gamedev/adds/shapes/GE_Zo_Map_Table.shape b/code/ryzom/client/data/gamedev/adds/shapes/GE_Zo_Map_Table.shape new file mode 100644 index 000000000..e1fbcbbff Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/GE_Zo_Map_Table.shape differ diff --git a/code/ryzom/client/data/gamedev/adds/shapes/GE_mission_scrollmaker.shape b/code/ryzom/client/data/gamedev/adds/shapes/GE_mission_scrollmaker.shape new file mode 100644 index 000000000..6e2abb8fc Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/GE_mission_scrollmaker.shape differ diff --git a/code/ryzom/client/data/gamedev/adds/shapes/GE_mission_tente_ZO_rescuer.shape b/code/ryzom/client/data/gamedev/adds/shapes/GE_mission_tente_ZO_rescuer.shape new file mode 100644 index 000000000..962215cbd Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/GE_mission_tente_ZO_rescuer.shape differ diff --git a/code/ryzom/client/data/gamedev/adds/shapes/TR_MO_arma_mount.shape b/code/ryzom/client/data/gamedev/adds/shapes/TR_MO_arma_mount.shape new file mode 100644 index 000000000..3d09ba100 Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/TR_MO_arma_mount.shape differ diff --git a/code/ryzom/client/data/gamedev/adds/shapes/TR_MO_arma_mount.skel b/code/ryzom/client/data/gamedev/adds/shapes/TR_MO_arma_mount.skel new file mode 100644 index 000000000..e7bce78f3 Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/TR_MO_arma_mount.skel differ diff --git a/code/ryzom/client/data/gamedev/adds/textures/ge_mission_stand_top_scroolmaker.tga b/code/ryzom/client/data/gamedev/adds/textures/ge_mission_stand_top_scroolmaker.tga new file mode 100644 index 000000000..fb391e4d2 Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/textures/ge_mission_stand_top_scroolmaker.tga differ diff --git a/code/ryzom/client/data/gamedev/adds/textures/ge_mission_tente_zo_toit_rescuer.tga b/code/ryzom/client/data/gamedev/adds/textures/ge_mission_tente_zo_toit_rescuer.tga new file mode 100644 index 000000000..d24da67ad Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/textures/ge_mission_tente_zo_toit_rescuer.tga differ diff --git a/code/ryzom/client/data/gamedev/adds/textures/ge_mission_tente_zo_wall_rescuer.tga b/code/ryzom/client/data/gamedev/adds/textures/ge_mission_tente_zo_wall_rescuer.tga new file mode 100644 index 000000000..9261a67d9 Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/textures/ge_mission_tente_zo_wall_rescuer.tga differ diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/keys.xml b/code/ryzom/client/data/gamedev/interfaces_v3/keys.xml index 4473f2614..5632f3c86 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/keys.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/keys.xml @@ -41,14 +41,14 @@ - - - - - - - - + + + + + + + + diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wasd.xml b/code/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wasd.xml index a45872684..56fe0ae1f 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wasd.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wasd.xml @@ -41,14 +41,14 @@ - - - - - - - - + + + + + + + + diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wow_alike.xml b/code/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wow_alike.xml index 712ad6a26..9d23b5ac3 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wow_alike.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/keys_bi.wow_alike.xml @@ -138,22 +138,22 @@ - - + + - - - - - - + + + + + + - - + + diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/keys_bi.zqsd.xml b/code/ryzom/client/data/gamedev/interfaces_v3/keys_bi.zqsd.xml index 75c4929a9..265f6d8f2 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/keys_bi.zqsd.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/keys_bi.zqsd.xml @@ -41,14 +41,14 @@ - - - - - - - - + + + + + + + + diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/texture_interfaces_v3.tga b/code/ryzom/client/data/gamedev/interfaces_v3/texture_interfaces_v3.tga new file mode 100644 index 000000000..93f67233d Binary files /dev/null and b/code/ryzom/client/data/gamedev/interfaces_v3/texture_interfaces_v3.tga differ diff --git a/code/ryzom/client/src/client.vcproj b/code/ryzom/client/src/client.vcproj index 5039a8dab..bcee826f6 100644 --- a/code/ryzom/client/src/client.vcproj +++ b/code/ryzom/client/src/client.vcproj @@ -101,6 +101,93 @@ CommandLine="$(InputDir)\..\..\tools\scripts\windows\tools\replace_vista_icon.exe $(TargetPath) $(InputDir)\ryzom.ico 101" /> + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - Family == ITEMFAMILY::PET_ANIMAL_TICKET) + // If the item is an animal representation or rpjob item + if (pIS!=NULL && ((pIS->Family == ITEMFAMILY::PET_ANIMAL_TICKET) || (pIS->Id.toString().substr(0, 6) == "rpjob_"))) { // cannot move to other animals! :) if(pMoveToBag) pMoveToBag->setActive(false); diff --git a/code/ryzom/client/src/interface_v3/group_html.cpp b/code/ryzom/client/src/interface_v3/group_html.cpp index fca0eb987..2615e2653 100644 --- a/code/ryzom/client/src/interface_v3/group_html.cpp +++ b/code/ryzom/client/src/interface_v3/group_html.cpp @@ -47,6 +47,7 @@ extern "C" #include "../time_client.h" #include "nel/misc/i18n.h" #include "nel/misc/md5.h" +#include "nel/3d/texture_file.h" using namespace std; using namespace NLMISC; @@ -173,7 +174,7 @@ void CGroupHTML::checkImageDownload() // don't display image that are not power of 2 uint32 w, h; CBitmap::loadSize (image, w, h); - if (w == 0 || h == 0 || !NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) + if (w == 0 || h == 0 || ((!NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) && !NL3D::CTextureFile::supportNonPowerOfTwoTextures())) image.clear(); CCtrlButton *btn = dynamic_cast(it->imgs[i]); @@ -2103,7 +2104,7 @@ void CGroupHTML::addImage(const char *img, bool globalColor) // don't display image that are not power of 2 uint32 w, h; CBitmap::loadSize (image, w, h); - if (w == 0 || h == 0 || !NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) + if (w == 0 || h == 0 || ((!NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) && !NL3D::CTextureFile::supportNonPowerOfTwoTextures())) image.clear(); newImage->setTexture (image); @@ -2475,12 +2476,13 @@ void CGroupHTML::setTitle (const ucstring &title) CInterfaceElement *parent = getParent(); if (parent) { - parent = parent->getParent(); - - CGroupContainer *container = dynamic_cast(parent); - if (container) + if (parent = parent->getParent()) { - container->setUCTitle (title); + CGroupContainer *container = dynamic_cast(parent); + if (container) + { + container->setUCTitle (title); + } } } } diff --git a/code/ryzom/client/src/interface_v3/group_html_webig.cpp b/code/ryzom/client/src/interface_v3/group_html_webig.cpp index 14579e34d..393b690b6 100644 --- a/code/ryzom/client/src/interface_v3/group_html_webig.cpp +++ b/code/ryzom/client/src/interface_v3/group_html_webig.cpp @@ -66,7 +66,7 @@ static string getWebAuthKey() void addWebIGParams (string &url) { - if(!UserEntity || (NetMngr.getConnectionState() < CNetworkConnection::Connected)) return; + if(!UserEntity || !NetMngr.getLoginCookie().isValid()) return; uint32 cid = NetMngr.getLoginCookie().getUserId() * 16 + PlayerSelectedSlot; url += ((url.find('?') != string::npos) ? "&" : "?") + diff --git a/code/ryzom/common/src/game_share/character_sync_itf.h b/code/ryzom/common/src/game_share/character_sync_itf.h index d11b42633..771d66e59 100644 --- a/code/ryzom/common/src/game_share/character_sync_itf.h +++ b/code/ryzom/common/src/game_share/character_sync_itf.h @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . ///////////////////////////////////////////////////////////////// // WARNING : this is a generated file, don't change it ! diff --git a/code/ryzom/common/src/game_share/msg_ais_egs_gen.h b/code/ryzom/common/src/game_share/msg_ais_egs_gen.h index 3e7748f7d..99de7c001 100644 --- a/code/ryzom/common/src/game_share/msg_ais_egs_gen.h +++ b/code/ryzom/common/src/game_share/msg_ais_egs_gen.h @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . ///////////////////////////////////////////////////////////////// // WARNING : this is a generated file, don't change it ! diff --git a/code/ryzom/common/src/game_share/r2_share_itf.h b/code/ryzom/common/src/game_share/r2_share_itf.h index 91d8bab1c..f6be6cb0e 100644 --- a/code/ryzom/common/src/game_share/r2_share_itf.h +++ b/code/ryzom/common/src/game_share/r2_share_itf.h @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . ///////////////////////////////////////////////////////////////// // WARNING : this is a generated file, don't change it ! diff --git a/code/ryzom/server/server.sln b/code/ryzom/server/server.sln index be7a69816..5fb435f8e 100644 --- a/code/ryzom/server/server.sln +++ b/code/ryzom/server/server.sln @@ -212,12 +212,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "driver_fmod", "..\..\nel\sr EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "3d", "..\..\nel\src\3d.vcproj", "{2B48BE83-108B-4E8E-8A55-6627CF09AC5A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "admin_service", "..\..\nelns\admin_service\admin_service.vcproj", "{AA03E539-FE77-4B63-BE0E-DE637635E5A9}" - ProjectSection(ProjectDependencies) = postProject - {44B21233-EFCC-4825-B5E5-3A3BD6CC5516} = {44B21233-EFCC-4825-B5E5-3A3BD6CC5516} - {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9} = {67AF56A4-A228-4BFB-BDA8-026CBEDE8BF9} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monitor_service", "src\monitor_service\monitor_service.vcproj", "{1648BD89-6D2C-441E-9D5A-D83F22F4F5EC}" ProjectSection(ProjectDependencies) = postProject {44B21233-EFCC-4825-B5E5-3A3BD6CC5516} = {44B21233-EFCC-4825-B5E5-3A3BD6CC5516} @@ -539,14 +533,6 @@ Global {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|Win32.Build.0 = Release|Win32 {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|x64.ActiveCfg = Release|x64 {2B48BE83-108B-4E8E-8A55-6627CF09AC5A}.Release|x64.Build.0 = Release|x64 - {AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Debug|Win32.ActiveCfg = Debug|Win32 - {AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Debug|Win32.Build.0 = Debug|Win32 - {AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Debug|x64.ActiveCfg = Debug|x64 - {AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Debug|x64.Build.0 = Debug|x64 - {AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Release|Win32.ActiveCfg = Release|Win32 - {AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Release|Win32.Build.0 = Release|Win32 - {AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Release|x64.ActiveCfg = Release|x64 - {AA03E539-FE77-4B63-BE0E-DE637635E5A9}.Release|x64.Build.0 = Release|x64 {1648BD89-6D2C-441E-9D5A-D83F22F4F5EC}.Debug|Win32.ActiveCfg = Debug|Win32 {1648BD89-6D2C-441E-9D5A-D83F22F4F5EC}.Debug|Win32.Build.0 = Debug|Win32 {1648BD89-6D2C-441E-9D5A-D83F22F4F5EC}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/code/ryzom/server/src/ai_service/ai_instance.cpp b/code/ryzom/server/src/ai_service/ai_instance.cpp index 0d40f4128..0fc47128d 100644 --- a/code/ryzom/server/src/ai_service/ai_instance.cpp +++ b/code/ryzom/server/src/ai_service/ai_instance.cpp @@ -650,7 +650,7 @@ static float randomAngle() return val; } -CGroupNpc* CAIInstance::eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots) +CGroupNpc* CAIInstance::eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots, double orientation, const std::string &botsName) { if (!_EventNpcManager) return NULL; @@ -681,7 +681,7 @@ CGroupNpc* CAIInstance::eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& // build unnamed bot for (uint i=0; ibots().addChild(new CBotNpc(grp, 0, grp->getName()), i); // Doub: 0 instead of getAlias()+i otherwise aliases are wrong + grp->bots().addChild(new CBotNpc(grp, 0, botsName.empty() ? grp->getName():botsName), i); // Doub: 0 instead of getAlias()+i otherwise aliases are wrong CBotNpc* const bot = NLMISC::safe_cast(grp->bots()[i]); @@ -702,7 +702,14 @@ CGroupNpc* CAIInstance::eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& if (maxTries<=0) rpos = pos; } - bot->setStartPos(rpos.x().asDouble(),rpos.y().asDouble(), randomAngle(), AITYPES::vp_auto); + + float angle = 0.f; + if (orientation < (NLMISC::Pi * 2.0) && orientation > (-NLMISC::Pi * 2.0)) + angle = orientation; + else + angle = randomAngle(); + + bot->setStartPos(rpos.x().asDouble(),rpos.y().asDouble(), angle, AITYPES::vp_auto); } } @@ -838,25 +845,27 @@ void cbEventCreateNpcGroup( NLNET::CMessage& msgin, const std::string &serviceNa uint32 instanceNumber; sint32 x; sint32 y; - sint32 z; + sint32 orientation; uint32 nbBots; NLMISC::CSheetId sheetId; double dispersionRadius; bool spawnBots; + std::string botsName; msgin.serial(messageVersion); nlassert(messageVersion==1); msgin.serial(instanceNumber); msgin.serial(x); msgin.serial(y); - msgin.serial(z); + msgin.serial(orientation); msgin.serial(nbBots); msgin.serial(sheetId); msgin.serial(dispersionRadius); msgin.serial(spawnBots); + msgin.serial(botsName); CAIInstance* instance = CAIS::instance().getAIInstance(instanceNumber); if (instance) { - instance->eventCreateNpcGroup(nbBots, sheetId, CAIVector((double)x/1000., (double)y/1000.), dispersionRadius, spawnBots); + instance->eventCreateNpcGroup(nbBots, sheetId, CAIVector((double)x/1000., (double)y/1000.), dispersionRadius, spawnBots, (double)orientation/1000., botsName); } } diff --git a/code/ryzom/server/src/ai_service/ai_instance.h b/code/ryzom/server/src/ai_service/ai_instance.h index 98c58651d..ce53d0559 100644 --- a/code/ryzom/server/src/ai_service/ai_instance.h +++ b/code/ryzom/server/src/ai_service/ai_instance.h @@ -207,7 +207,7 @@ public: return NULL; } - CGroupNpc* eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots); + CGroupNpc* eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots, double orientation, const std::string &botsName); /// create a new easter egg CBotEasterEgg* createEasterEgg(uint32 easterEggId, NLMISC::CSheetId const& sheetId, std::string const& botName, double x, double y, double z, double heading, const std::string& look); diff --git a/code/ryzom/server/src/ai_service/commands.cpp b/code/ryzom/server/src/ai_service/commands.cpp index 5ea7837a6..772a5cfed 100644 --- a/code/ryzom/server/src/ai_service/commands.cpp +++ b/code/ryzom/server/src/ai_service/commands.cpp @@ -190,7 +190,7 @@ NLMISC_COMMAND(search, "search all the data tree for a name part","") //---------------------------------------------------------------------------- -NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", " [ []]") +NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", " [ [ [ []]]]") { if (args.size()<5) return false; @@ -231,7 +231,7 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", " double x = atof(args[3].c_str()); double y = atof(args[4].c_str()); - + double dispersionRadius = 10.; if (args.size()>5) { @@ -248,8 +248,18 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", " { NLMISC::fromString(args[6], spawnBots); } - - aiInstance->eventCreateNpcGroup(nbBots, sheetId, CAIVector(x, y), dispersionRadius, spawnBots); + + double orientation = 6.666; + if (args.size()>7 && args[7] != "random") + { + NLMISC::fromString(args[7], orientation); + orientation = orientation / 360.0 * (NLMISC::Pi * 2.0); + } + + std::string botsName; + if (args.size()>8) botsName = args[8]; + + aiInstance->eventCreateNpcGroup(nbBots, sheetId, CAIVector(x, y), dispersionRadius, spawnBots, orientation, botsName); return true; } diff --git a/code/ryzom/server/src/entities_game_service/admin.cpp b/code/ryzom/server/src/entities_game_service/admin.cpp index 99c3ccd64..24e77f1b4 100644 --- a/code/ryzom/server/src/entities_game_service/admin.cpp +++ b/code/ryzom/server/src/entities_game_service/admin.cpp @@ -5232,7 +5232,7 @@ NLMISC_COMMAND(setFamePlayer, "set the fame value of a player in the given facti //---------------------------------------------------------------------------- -NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", " [ []]") +NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", " [ [ [ []]]]") { if (args.size () < 3) return false; GET_ENTITY @@ -5240,7 +5240,7 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", " < uint32 instanceNumber = e->getInstanceNumber(); sint32 x = e->getX(); sint32 y = e->getY(); - sint32 z = e->getZ(); + sint32 orientation = 6666; // used to specify a random orientation uint32 nbBots = NLMISC::atoui(args[1].c_str()); if (nbBots<=0) @@ -5275,17 +5275,34 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", " < NLMISC::fromString(args[4], spawnBots); } + if (args.size()>5) + { + if (args[5] == "self") + { + orientation = (sint32)(e->getHeading() * 1000.0); + } + else + { + NLMISC::fromString(args[5], orientation); + orientation = (sint32)((double)orientation / 360.0 * (NLMISC::Pi * 2.0) * 1000.0); + } + } + + std::string botsName; + if (args.size()>6) botsName = args[6]; + CMessage msgout("EVENT_CREATE_NPC_GROUP"); uint32 messageVersion = 1; msgout.serial(messageVersion); msgout.serial(instanceNumber); msgout.serial(x); msgout.serial(y); - msgout.serial(z); + msgout.serial(orientation); msgout.serial(nbBots); msgout.serial(sheetId); msgout.serial(dispersionRadius); msgout.serial(spawnBots); + msgout.serial(botsName); CWorldInstances::instance().msgToAIInstance2(instanceNumber, msgout); return true; diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_ai.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_ai.cpp index 130ff77b7..7075c6678 100644 --- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_ai.cpp +++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_ai.cpp @@ -185,6 +185,7 @@ uint CMissionStepAIMsg::processEvent( const TDataSetRow & userRow, const CMissio if( event.Type == CMissionEvent::AIMsg ) { CMissionEventAIMsg & eventSpe = (CMissionEventAIMsg &) event; + nlwarning("CMissionStepAIMsg : Message from event = '%s', message of mission = '%s'", eventSpe.Msg.c_str(), Msg.c_str()); if ( eventSpe.Msg == Msg ) { LOGMISSIONSTEPSUCCESS("wait_msg"); diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/timed_actions.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/timed_actions.cpp index af8cbaa32..2c6439559 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/timed_actions.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/timed_actions.cpp @@ -425,7 +425,7 @@ bool CConsumeItemTimedAction::validate(CTimedActionPhrase *phrase, CEntityBase * { // check player is sit, on a mektoub or swimming otherwise return false const MBEHAV::EMode mode = player->getMode(); - if (mode != MBEHAV::SIT && mode != MBEHAV::MOUNT_NORMAL && mode != MBEHAV::MOUNT_SWIM && mode != MBEHAV::SWIM) + if (mode != MBEHAV::SIT && mode != MBEHAV::MOUNT_NORMAL && mode != MBEHAV::MOUNT_SWIM && mode != MBEHAV::SWIM && !player->isInWater()) { CCharacter::sendDynamicSystemMessage(player->getId(),"CONSUMABLE_NOT_STAND_UP"); return false; diff --git a/code/ryzom/server/src/ryzom_welcome_service/Makefile b/code/ryzom/server/src/ryzom_welcome_service/Makefile index 913850e01..279986552 100644 --- a/code/ryzom/server/src/ryzom_welcome_service/Makefile +++ b/code/ryzom/server/src/ryzom_welcome_service/Makefile @@ -15,7 +15,7 @@ LDFLAGS = $(LD_FLAGS_CMN) \ -L$(NEL_PATH)/lib \ -L../admin_modules \ -L$(RYZOM_COMMON_SRC)/game_share \ - -lgame_share \ + -lgame_share \ -lnelnet \ -lnelmisc \ -ladmin_modules \ diff --git a/code/ryzom/tools/connection_stats/connection_stats.h b/code/ryzom/tools/connection_stats/connection_stats.h index 704addde4..d745a0cfb 100644 --- a/code/ryzom/tools/connection_stats/connection_stats.h +++ b/code/ryzom/tools/connection_stats/connection_stats.h @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #ifndef CONNECTION_STATS_H diff --git a/code/ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cpp b/code/ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cpp index c67c26323..7653c964c 100644 --- a/code/ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cpp +++ b/code/ryzom/tools/leveldesign/alias_synchronizer/alias_synchronizer.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "nel/misc/types_nl.h" diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_interface.h b/code/ryzom/tools/leveldesign/georges_dll/georges_interface.h index 3165424c6..28ab22042 100644 --- a/code/ryzom/tools/leveldesign/georges_dll/georges_interface.h +++ b/code/ryzom/tools/leveldesign/georges_dll/georges_interface.h @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #ifndef GEORGES_INTERFACE #define GEORGES_INTERFACE diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp b/code/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp index 4b2eee23f..824a89ef3 100644 --- a/code/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp +++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "nel/misc/i18n.h" #include "mission_compiler.h" diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp b/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp index 47bcdf896..19d210f0f 100644 --- a/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp +++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/step_content.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "mission_compiler.h" #include "step.h" diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/steps.cpp b/code/ryzom/tools/leveldesign/mission_compiler_lib/steps.cpp index 72033c57e..10842c97c 100644 --- a/code/ryzom/tools/leveldesign/mission_compiler_lib/steps.cpp +++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/steps.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "mission_compiler.h" diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/variables.cpp b/code/ryzom/tools/leveldesign/mission_compiler_lib/variables.cpp index eb6ce6ee4..d4e1e4598 100644 --- a/code/ryzom/tools/leveldesign/mission_compiler_lib/variables.cpp +++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/variables.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "mission_compiler.h" diff --git a/code/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cpp b/code/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cpp index 9d93fdbee..33ee8444e 100644 --- a/code/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cpp +++ b/code/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "nel/misc/types_nl.h" diff --git a/code/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp b/code/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp index fcfb2e3f4..bbc7953b0 100644 --- a/code/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp +++ b/code/ryzom/tools/leveldesign/uni_conv/uni_conv.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_logic.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_logic.cpp index 9e420fec1..f5efa3231 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_logic.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_logic.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "stdafx.h" diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone.cpp index bd34b584d..e6c27a1a7 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "stdafx.h" #include "nel/misc/object_vector.h" diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.cpp index 84daa18c2..1c59b47da 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/builder_zone_region.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "stdafx.h" diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/display.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/display.h index 71f1796cc..44fdf4208 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/display.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/display.h @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #ifndef DISPLAY_H #define DISPLAY_H diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h index 602d926bb..d2c38ca58 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #ifndef NL_PLUGIN_INTERFACE_H diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/tools_logic.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/tools_logic.h index e1a66af5a..47955e9b4 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/tools_logic.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/tools_logic.h @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #ifndef TOOLSLOGIC_H #define TOOLSLOGIC_H diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/tools_zone.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/tools_zone.h index d282656e5..9acb2959d 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor/tools_zone.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/tools_zone.h @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #ifndef TOOLSZONE_H #define TOOLSZONE_H diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp index 1cfd87865..dcfd244d9 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.cpp @@ -168,6 +168,7 @@ void CPlugin::init(IPluginAccess *pluginAccess) AFX_MANAGE_STATE(AfxGetStaticModuleState()); AfxEnableControlContainer(); _PluginAccess = pluginAccess; + _PluginName="Player Plugin"; //#undef new LoadDlg = new CLoadDialog; //#define new NL_NEW @@ -304,3 +305,41 @@ void CPlugin::onIdle() } } } + +std::string& CPlugin::getName() +{ + return _PluginName; +} + +bool CPlugin::isActive() +{ + return _PluginActive; +} + +bool CPlugin::activatePlugin() +{ + if(!_PluginActive) + { + AFX_MANAGE_STATE(AfxGetStaticModuleState()); + AfxEnableControlContainer(); + + //_DialogFlag->Create(IDD_DIALOG_FLAGS, CWnd::FromHandle(_PluginAccess->getMainWindow()->m_hWnd)); + _DialogFlag->ShowWindow(TRUE); + //_DialogFlag->init(this); + _PluginActive=true; + return true; + } + return false; +} + +bool CPlugin::closePlugin() +{ + if (_PluginActive) + { + //_DialogFlag->CloseWindow(); + _DialogFlag->ShowWindow(FALSE); + _PluginActive=false; + return true; + } + return false; +} diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.h b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.h index 9bf7322e3..7e57dd2e7 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_plugin/plugin.h @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "nel/sound/u_audio_mixer.h" #include "nel/ligo/primitive.h" @@ -40,12 +55,27 @@ private: /// Sound plugin dialog. CDialogFlags *_DialogFlag; + std::string _PluginName; + + bool _PluginActive; + //NLSOUND::UAudioMixer *_Mixer; /// the position of the listener. //NLMISC::CVector _ListenerPos; virtual void onIdle(); + //getting the name of the plugin + virtual std::string& getName(); + + //testing whether the plugin is active or not (currently in use or not) + virtual bool isActive(); + + + virtual bool activatePlugin(); + + virtual bool closePlugin(); + bool m_Initialized; }; diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.cpp index 23b7f3c3d..3cc18a60f 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "primitive_plugin.h" diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.h b/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.h index e4220b541..731566ec6 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_shard_monitor_plugin/plugin.h @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "DialogFlags.h" #include "nel/misc/sheet_id.h" diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp index cbead2b40..8d1dd968e 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "stdafx.h" #include "sound_plugin.h" diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.h b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.h index c2c11242a..388ae4ada 100644 --- a/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.h +++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_sound_plugin/sound_plugin.h @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "nel/sound/u_audio_mixer.h" #include "nel/ligo/primitive.h" diff --git a/code/ryzom/tools/make_anim_melee_impact/main.cpp b/code/ryzom/tools/make_anim_melee_impact/main.cpp index 87143a106..6b4f6541d 100644 --- a/code/ryzom/tools/make_anim_melee_impact/main.cpp +++ b/code/ryzom/tools/make_anim_melee_impact/main.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . // *************************************************************************** /* diff --git a/code/ryzom/tools/pdr_util/pdr_util.cpp b/code/ryzom/tools/pdr_util/pdr_util.cpp index b72e95afc..974804168 100644 --- a/code/ryzom/tools/pdr_util/pdr_util.cpp +++ b/code/ryzom/tools/pdr_util/pdr_util.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "nel/misc/types_nl.h" #include "nel/misc/path.h" diff --git a/code/ryzom/tools/phrase_generator/skill_tree.cpp b/code/ryzom/tools/phrase_generator/skill_tree.cpp index 9fcc4b5c0..149ae81f9 100644 --- a/code/ryzom/tools/phrase_generator/skill_tree.cpp +++ b/code/ryzom/tools/phrase_generator/skill_tree.cpp @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "skill_tree.h" diff --git a/code/ryzom/tools/reynolds/stdpch.cpp b/code/ryzom/tools/reynolds/stdpch.cpp index 143fb51cd..d4b14ffe2 100644 --- a/code/ryzom/tools/reynolds/stdpch.cpp +++ b/code/ryzom/tools/reynolds/stdpch.cpp @@ -1,2 +1,17 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include "stdpch.h" diff --git a/code/ryzom/tools/reynolds/stdpch.h b/code/ryzom/tools/reynolds/stdpch.h index b4390399f..43d1fe8f7 100644 --- a/code/ryzom/tools/reynolds/stdpch.h +++ b/code/ryzom/tools/reynolds/stdpch.h @@ -1,3 +1,18 @@ +// Ryzom - MMORPG Framework +// Copyright (C) 2010 Winch Gate Property Limited +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . #include