josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
XTZGZoReX
2010-06-06 22:58:12 +02:00
parent 62200e8d02 fe3976b347
commit 58c15e71a6
2 changed files with 55 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
externals/zlib/win/VC90/zlib.vcproj
Vendored
+4 -4
View File
@@ -22,7 +22,7 @@
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
> >
@@ -90,7 +90,7 @@
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
> >
@@ -159,7 +159,7 @@
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
> >
@@ -225,7 +225,7 @@
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)" OutputDirectory="..\..\bin\$(PlatformName)_$(ConfigurationName)"
IntermediateDirectory=".\bzip2__$(PlatformName)_$(ConfigurationName)" IntermediateDirectory=".\zlib__$(PlatformName)_$(ConfigurationName)"
ConfigurationType="4" ConfigurationType="4"
CharacterSet="2" CharacterSet="2"
> >
src/server/game/Chat/Commands/Level3.cpp
+51 -9
View File
@@ -7062,20 +7062,62 @@ bool ChatHandler::HandleInstanceOpenCloseCommand(const char *args,bool open)
uint8 status = objmgr.GetAccessRequirement(instance->access_id)->status; uint8 status = objmgr.GetAccessRequirement(instance->access_id)->status;
uint8 flag = 0; uint8 flag = 0;
if (strcmp(instanceModeStr,"normal") || strcmp(instanceModeStr,"10normal")) const MapEntry *entry = sMapStore.LookupEntry(mapid);
flag = DUNGEON_STATUSFLAG_NORMAL; if (!entry)
else if (strcmp(instanceModeStr,"heroic") || strcmp(instanceModeStr,"25normal")) return false;
flag = DUNGEON_STATUSFLAG_HEROIC;
else if (strcmp(instanceModeStr,"10heroic")) if (entry->IsDungeon())
flag = RAID_STATUSFLAG_10MAN_HEROIC; {
else if (strcmp(instanceModeStr,"25heroic")) if (strcmp(instanceModeStr,"normal"))
flag = RAID_STATUSFLAG_25MAN_HEROIC; flag = DUNGEON_STATUSFLAG_NORMAL;
else if (strcmp(instanceModeStr,"heroic"))
flag = DUNGEON_STATUSFLAG_HEROIC;
else if (strcmp(instanceModeStr,"all"))
flag = DUNGEON_STATUSFLAG_NORMAL & DUNGEON_STATUSFLAG_HEROIC;
else
{
PSendSysMessage("Unrecognized difficulty string");
SetSentErrorMessage(true);
return false;
}
}
else if (entry->IsRaid())
{
if (strcmp(instanceModeStr,"normal"))
flag = RAID_STATUSFLAG_10MAN_NORMAL & RAID_STATUSFLAG_25MAN_NORMAL;
else if (strcmp(instanceModeStr,"heroic"))
flag = RAID_STATUSFLAG_10MAN_HEROIC & RAID_STATUSFLAG_25MAN_HEROIC;
else if (strcmp(instanceModeStr,"10man"))
flag = RAID_STATUSFLAG_10MAN_NORMAL & RAID_STATUSFLAG_10MAN_HEROIC;
else if (strcmp(instanceModeStr,"25man"))
flag = RAID_STATUSFLAG_25MAN_NORMAL & RAID_STATUSFLAG_25MAN_HEROIC;
else if (strcmp(instanceModeStr,"heroic"))
flag = RAID_STATUSFLAG_10MAN_HEROIC & RAID_STATUSFLAG_25MAN_HEROIC;
else if (strcmp(instanceModeStr,"10normal"))
flag = DUNGEON_STATUSFLAG_NORMAL;
else if (strcmp(instanceModeStr,"25normal"))
flag = DUNGEON_STATUSFLAG_HEROIC;
else if (strcmp(instanceModeStr,"10heroic"))
flag = RAID_STATUSFLAG_10MAN_HEROIC;
else if (strcmp(instanceModeStr,"25heroic"))
flag = RAID_STATUSFLAG_25MAN_HEROIC;
else if (strcmp(instanceModeStr,"all"))
flag = RAID_STATUSFLAG_10MAN_NORMAL & RAID_STATUSFLAG_10MAN_HEROIC & RAID_STATUSFLAG_25MAN_NORMAL & RAID_STATUSFLAG_25MAN_HEROIC;
else
{
PSendSysMessage("Unrecognized difficulty string");
SetSentErrorMessage(true);
return false;
}
}
else else
{ {
PSendSysMessage("Unrecognized difficulty string"); PSendSysMessage("Map is not a dungeon/raid");
SetSentErrorMessage(true); SetSentErrorMessage(true);
return false; return false;
} }
if (open) if (open)
status |= flag; status |= flag;
else else