├── FortConsole.sln ├── FortConsole.vcxproj ├── LICENSE ├── README.md ├── enums.h ├── main.cpp ├── memory.h └── structs.h /FortConsole.sln: -------------------------------------------------------------------------------- 1 |  2 | Microsoft Visual Studio Solution File, Format Version 12.00 3 | # Visual Studio Version 16 4 | VisualStudioVersion = 16.0.30621.155 5 | MinimumVisualStudioVersion = 10.0.40219.1 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FortConsole", "FortConsole.vcxproj", "{87FB450A-957F-446E-BE13-5F58074672A7}" 7 | EndProject 8 | Global 9 | GlobalSection(SolutionConfigurationPlatforms) = preSolution 10 | Debug|x64 = Debug|x64 11 | Debug|x86 = Debug|x86 12 | Release|x64 = Release|x64 13 | Release|x86 = Release|x86 14 | EndGlobalSection 15 | GlobalSection(ProjectConfigurationPlatforms) = postSolution 16 | {87FB450A-957F-446E-BE13-5F58074672A7}.Debug|x64.ActiveCfg = Debug|x64 17 | {87FB450A-957F-446E-BE13-5F58074672A7}.Debug|x64.Build.0 = Debug|x64 18 | {87FB450A-957F-446E-BE13-5F58074672A7}.Debug|x86.ActiveCfg = Debug|Win32 19 | {87FB450A-957F-446E-BE13-5F58074672A7}.Debug|x86.Build.0 = Debug|Win32 20 | {87FB450A-957F-446E-BE13-5F58074672A7}.Release|x64.ActiveCfg = Release|x64 21 | {87FB450A-957F-446E-BE13-5F58074672A7}.Release|x64.Build.0 = Release|x64 22 | {87FB450A-957F-446E-BE13-5F58074672A7}.Release|x86.ActiveCfg = Release|Win32 23 | {87FB450A-957F-446E-BE13-5F58074672A7}.Release|x86.Build.0 = Release|Win32 24 | EndGlobalSection 25 | GlobalSection(SolutionProperties) = preSolution 26 | HideSolutionNode = FALSE 27 | EndGlobalSection 28 | GlobalSection(ExtensibilityGlobals) = postSolution 29 | SolutionGuid = {B26F8D7A-BFBA-4C20-9D79-86656AC20EA0} 30 | EndGlobalSection 31 | EndGlobal 32 | -------------------------------------------------------------------------------- /FortConsole.vcxproj: -------------------------------------------------------------------------------- 1 | 2 | 3 | 4 | 5 | Debug 6 | Win32 7 | 8 | 9 | Release 10 | Win32 11 | 12 | 13 | Debug 14 | x64 15 | 16 | 17 | Release 18 | x64 19 | 20 | 21 | 22 | 16.0 23 | Win32Proj 24 | {87fb450a-957f-446e-be13-5f58074672a7} 25 | FortConsole 26 | 10.0 27 | 28 | 29 | 30 | DynamicLibrary 31 | true 32 | v142 33 | Unicode 34 | 35 | 36 | DynamicLibrary 37 | false 38 | v142 39 | true 40 | Unicode 41 | 42 | 43 | DynamicLibrary 44 | true 45 | v142 46 | Unicode 47 | 48 | 49 | DynamicLibrary 50 | false 51 | v142 52 | true 53 | Unicode 54 | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | 68 | 69 | 70 | 71 | 72 | 73 | 74 | true 75 | 76 | 77 | false 78 | 79 | 80 | true 81 | 82 | 83 | false 84 | 85 | 86 | 87 | Level3 88 | true 89 | WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) 90 | true 91 | 92 | 93 | 94 | 95 | Console 96 | true 97 | 98 | 99 | 100 | 101 | Level3 102 | true 103 | true 104 | true 105 | WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) 106 | true 107 | 108 | 109 | 110 | 111 | Console 112 | true 113 | true 114 | true 115 | 116 | 117 | 118 | 119 | Level3 120 | true 121 | _DEBUG;_CONSOLE;%(PreprocessorDefinitions) 122 | true 123 | 124 | 125 | 126 | 127 | Console 128 | true 129 | 130 | 131 | 132 | 133 | Level3 134 | true 135 | true 136 | true 137 | NDEBUG;_CONSOLE;%(PreprocessorDefinitions) 138 | true 139 | 140 | 141 | 142 | 143 | Console 144 | true 145 | true 146 | true 147 | 148 | 149 | 150 | 151 | 152 | 153 | 154 | 155 | 156 | 157 | 158 | 159 | 160 | -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- 1 | Apache License 2 | Version 2.0, January 2004 3 | http://www.apache.org/licenses/ 4 | 5 | TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 6 | 7 | 1. Definitions. 8 | 9 | "License" shall mean the terms and conditions for use, reproduction, 10 | and distribution as defined by Sections 1 through 9 of this document. 11 | 12 | "Licensor" shall mean the copyright owner or entity authorized by 13 | the copyright owner that is granting the License. 14 | 15 | "Legal Entity" shall mean the union of the acting entity and all 16 | other entities that control, are controlled by, or are under common 17 | control with that entity. For the purposes of this definition, 18 | "control" means (i) the power, direct or indirect, to cause the 19 | direction or management of such entity, whether by contract or 20 | otherwise, or (ii) ownership of fifty percent (50%) or more of the 21 | outstanding shares, or (iii) beneficial ownership of such entity. 22 | 23 | "You" (or "Your") shall mean an individual or Legal Entity 24 | exercising permissions granted by this License. 25 | 26 | "Source" form shall mean the preferred form for making modifications, 27 | including but not limited to software source code, documentation 28 | source, and configuration files. 29 | 30 | "Object" form shall mean any form resulting from mechanical 31 | transformation or translation of a Source form, including but 32 | not limited to compiled object code, generated documentation, 33 | and conversions to other media types. 34 | 35 | "Work" shall mean the work of authorship, whether in Source or 36 | Object form, made available under the License, as indicated by a 37 | copyright notice that is included in or attached to the work 38 | (an example is provided in the Appendix below). 39 | 40 | "Derivative Works" shall mean any work, whether in Source or Object 41 | form, that is based on (or derived from) the Work and for which the 42 | editorial revisions, annotations, elaborations, or other modifications 43 | represent, as a whole, an original work of authorship. For the purposes 44 | of this License, Derivative Works shall not include works that remain 45 | separable from, or merely link (or bind by name) to the interfaces of, 46 | the Work and Derivative Works thereof. 47 | 48 | "Contribution" shall mean any work of authorship, including 49 | the original version of the Work and any modifications or additions 50 | to that Work or Derivative Works thereof, that is intentionally 51 | submitted to Licensor for inclusion in the Work by the copyright owner 52 | or by an individual or Legal Entity authorized to submit on behalf of 53 | the copyright owner. For the purposes of this definition, "submitted" 54 | means any form of electronic, verbal, or written communication sent 55 | to the Licensor or its representatives, including but not limited to 56 | communication on electronic mailing lists, source code control systems, 57 | and issue tracking systems that are managed by, or on behalf of, the 58 | Licensor for the purpose of discussing and improving the Work, but 59 | excluding communication that is conspicuously marked or otherwise 60 | designated in writing by the copyright owner as "Not a Contribution." 61 | 62 | "Contributor" shall mean Licensor and any individual or Legal Entity 63 | on behalf of whom a Contribution has been received by Licensor and 64 | subsequently incorporated within the Work. 65 | 66 | 2. Grant of Copyright License. Subject to the terms and conditions of 67 | this License, each Contributor hereby grants to You a perpetual, 68 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable 69 | copyright license to reproduce, prepare Derivative Works of, 70 | publicly display, publicly perform, sublicense, and distribute the 71 | Work and such Derivative Works in Source or Object form. 72 | 73 | 3. Grant of Patent License. Subject to the terms and conditions of 74 | this License, each Contributor hereby grants to You a perpetual, 75 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable 76 | (except as stated in this section) patent license to make, have made, 77 | use, offer to sell, sell, import, and otherwise transfer the Work, 78 | where such license applies only to those patent claims licensable 79 | by such Contributor that are necessarily infringed by their 80 | Contribution(s) alone or by combination of their Contribution(s) 81 | with the Work to which such Contribution(s) was submitted. If You 82 | institute patent litigation against any entity (including a 83 | cross-claim or counterclaim in a lawsuit) alleging that the Work 84 | or a Contribution incorporated within the Work constitutes direct 85 | or contributory patent infringement, then any patent licenses 86 | granted to You under this License for that Work shall terminate 87 | as of the date such litigation is filed. 88 | 89 | 4. Redistribution. You may reproduce and distribute copies of the 90 | Work or Derivative Works thereof in any medium, with or without 91 | modifications, and in Source or Object form, provided that You 92 | meet the following conditions: 93 | 94 | (a) You must give any other recipients of the Work or 95 | Derivative Works a copy of this License; and 96 | 97 | (b) You must cause any modified files to carry prominent notices 98 | stating that You changed the files; and 99 | 100 | (c) You must retain, in the Source form of any Derivative Works 101 | that You distribute, all copyright, patent, trademark, and 102 | attribution notices from the Source form of the Work, 103 | excluding those notices that do not pertain to any part of 104 | the Derivative Works; and 105 | 106 | (d) If the Work includes a "NOTICE" text file as part of its 107 | distribution, then any Derivative Works that You distribute must 108 | include a readable copy of the attribution notices contained 109 | within such NOTICE file, excluding those notices that do not 110 | pertain to any part of the Derivative Works, in at least one 111 | of the following places: within a NOTICE text file distributed 112 | as part of the Derivative Works; within the Source form or 113 | documentation, if provided along with the Derivative Works; or, 114 | within a display generated by the Derivative Works, if and 115 | wherever such third-party notices normally appear. The contents 116 | of the NOTICE file are for informational purposes only and 117 | do not modify the License. You may add Your own attribution 118 | notices within Derivative Works that You distribute, alongside 119 | or as an addendum to the NOTICE text from the Work, provided 120 | that such additional attribution notices cannot be construed 121 | as modifying the License. 122 | 123 | You may add Your own copyright statement to Your modifications and 124 | may provide additional or different license terms and conditions 125 | for use, reproduction, or distribution of Your modifications, or 126 | for any such Derivative Works as a whole, provided Your use, 127 | reproduction, and distribution of the Work otherwise complies with 128 | the conditions stated in this License. 129 | 130 | 5. Submission of Contributions. Unless You explicitly state otherwise, 131 | any Contribution intentionally submitted for inclusion in the Work 132 | by You to the Licensor shall be under the terms and conditions of 133 | this License, without any additional terms or conditions. 134 | Notwithstanding the above, nothing herein shall supersede or modify 135 | the terms of any separate license agreement you may have executed 136 | with Licensor regarding such Contributions. 137 | 138 | 6. Trademarks. This License does not grant permission to use the trade 139 | names, trademarks, service marks, or product names of the Licensor, 140 | except as required for reasonable and customary use in describing the 141 | origin of the Work and reproducing the content of the NOTICE file. 142 | 143 | 7. Disclaimer of Warranty. Unless required by applicable law or 144 | agreed to in writing, Licensor provides the Work (and each 145 | Contributor provides its Contributions) on an "AS IS" BASIS, 146 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or 147 | implied, including, without limitation, any warranties or conditions 148 | of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A 149 | PARTICULAR PURPOSE. You are solely responsible for determining the 150 | appropriateness of using or redistributing the Work and assume any 151 | risks associated with Your exercise of permissions under this License. 152 | 153 | 8. Limitation of Liability. In no event and under no legal theory, 154 | whether in tort (including negligence), contract, or otherwise, 155 | unless required by applicable law (such as deliberate and grossly 156 | negligent acts) or agreed to in writing, shall any Contributor be 157 | liable to You for damages, including any direct, indirect, special, 158 | incidental, or consequential damages of any character arising as a 159 | result of this License or out of the use or inability to use the 160 | Work (including but not limited to damages for loss of goodwill, 161 | work stoppage, computer failure or malfunction, or any and all 162 | other commercial damages or losses), even if such Contributor 163 | has been advised of the possibility of such damages. 164 | 165 | 9. Accepting Warranty or Additional Liability. While redistributing 166 | the Work or Derivative Works thereof, You may choose to offer, 167 | and charge a fee for, acceptance of support, warranty, indemnity, 168 | or other liability obligations and/or rights consistent with this 169 | License. However, in accepting such obligations, You may act only 170 | on Your own behalf and on Your sole responsibility, not on behalf 171 | of any other Contributor, and only if You agree to indemnify, 172 | defend, and hold each Contributor harmless for any liability 173 | incurred by, or claims asserted against, such Contributor by reason 174 | of your accepting any such warranty or additional liability. 175 | 176 | END OF TERMS AND CONDITIONS 177 | 178 | APPENDIX: How to apply the Apache License to your work. 179 | 180 | To apply the Apache License to your work, attach the following 181 | boilerplate notice, with the fields enclosed by brackets "[]" 182 | replaced with your own identifying information. (Don't include 183 | the brackets!) The text should be enclosed in the appropriate 184 | comment syntax for the file format. We also recommend that a 185 | file or class name and description of purpose be included on the 186 | same "printed page" as the copyright notice for easier 187 | identification within third-party archives. 188 | 189 | Copyright [yyyy] [name of copyright owner] 190 | 191 | Licensed under the Apache License, Version 2.0 (the "License"); 192 | you may not use this file except in compliance with the License. 193 | You may obtain a copy of the License at 194 | 195 | http://www.apache.org/licenses/LICENSE-2.0 196 | 197 | Unless required by applicable law or agreed to in writing, software 198 | distributed under the License is distributed on an "AS IS" BASIS, 199 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 200 | See the License for the specific language governing permissions and 201 | limitations under the License. 202 | -------------------------------------------------------------------------------- /README.md: -------------------------------------------------------------------------------- 1 | # FortConsole 2 | 3 | Yes, this does work for the latest version of Fortnite, make sure you're compiling x64 and not x86 as that is the most common mistake. 4 | 5 | No, this does not need to be updated every update, and the rare occurrences where it does, I will update it within 24 hours. 6 | 7 | A DLL that creates the UE4 console. 8 | 9 | Specifically made for the latest version of Fortnite, so may not work for other games. 10 | 11 | Make sure to launch without anti-cheat to avoid being banned. 12 | 13 | Any DLL injector should work if launched without anti-cheat. 14 | 15 | CheatManager/FortCheatManager commands will not work (e.g.``toggledebugcamera``, ``summon``, ``destroyall``, ect). 16 | Re-enabling them will be added in the future, infact, it's already done, but won't be pushed to this repo yet due to inefficient version flexibility (breaks on updates). 17 | 18 | Be careful when using ``showdebug`` as it lags the game due to not being able to find a font. 19 | -------------------------------------------------------------------------------- /enums.h: -------------------------------------------------------------------------------- 1 | #pragma once 2 | 3 | enum EObjectFlags 4 | { 5 | RF_NoFlags = 0x00000000, 6 | RF_Public = 0x00000001, 7 | RF_Standalone = 0x00000002, 8 | RF_MarkAsNative = 0x00000004, 9 | RF_Transactional = 0x00000008, 10 | RF_ClassDefaultObject = 0x00000010, 11 | RF_ArchetypeObject = 0x00000020, 12 | RF_Transient = 0x00000040, 13 | RF_MarkAsRootSet = 0x00000080, 14 | RF_TagGarbageTemp = 0x00000100, 15 | RF_NeedInitialization = 0x00000200, 16 | RF_NeedLoad = 0x00000400, 17 | RF_KeepForCooker = 0x00000800, 18 | RF_NeedPostLoad = 0x00001000, 19 | RF_NeedPostLoadSubobjects = 0x00002000, 20 | RF_NewerVersionExists = 0x00004000, 21 | RF_BeginDestroyed = 0x00008000, 22 | RF_FinishDestroyed = 0x00010000, 23 | RF_BeingRegenerated = 0x00020000, 24 | RF_DefaultSubObject = 0x00040000, 25 | RF_WasLoaded = 0x00080000, 26 | RF_TextExportTransient = 0x00100000, 27 | RF_LoadCompleted = 0x00200000, 28 | RF_InheritableComponentTemplate = 0x00400000, 29 | RF_DuplicateTransient = 0x00800000, 30 | RF_StrongRefOnFrame = 0x01000000, 31 | RF_NonPIEDuplicateTransient = 0x02000000, 32 | RF_Dynamic = 0x04000000, 33 | RF_WillBeLoaded = 0x08000000, 34 | }; 35 | 36 | enum EInternalObjectFlags 37 | { 38 | None = 0, 39 | ReachableInCluster = 1 << 23, 40 | ClusterRoot = 1 << 24, 41 | Native = 1 << 25, 42 | Async = 1 << 26, 43 | AsyncLoading = 1 << 27, 44 | Unreachable = 1 << 28, 45 | PendingKill = 1 << 29, 46 | RootSet = 1 << 30, 47 | GarbageCollectionKeepFlags = Native | Async | AsyncLoading, 48 | AllFlags = ReachableInCluster | ClusterRoot | Native | Async | AsyncLoading | Unreachable | PendingKill | RootSet, 49 | }; -------------------------------------------------------------------------------- /main.cpp: -------------------------------------------------------------------------------- 1 | /* 2 | * FortConsole by Makks 3 | * Build with debug configuration for nerd stuff. 4 | */ 5 | 6 | #ifdef WIN32 7 | #error x86 is not supported, please compile in x64 8 | #endif 9 | 10 | #define _CRT_SECURE_NO_WARNINGS 11 | 12 | #include "enums.h" 13 | #include "structs.h" 14 | #include "memory.h" 15 | #include 16 | #include 17 | 18 | HMODULE handle; 19 | 20 | #ifdef _DEBUG 21 | #define DEBUG_LOG(input, ...) printf(input, __VA_ARGS__); 22 | #else 23 | #define DEBUG_LOG(input, ...) 24 | #endif 25 | 26 | #define VALIDATE_ADDRESS(address, error) \ 27 | if (!address) { \ 28 | MessageBox(0, (LPCWSTR)error, L"FortConsole", MB_OK); \ 29 | FreeLibraryAndExitThread((HMODULE)param, 0); \ 30 | return 0; \ 31 | } 32 | 33 | UEngine* GEngine; 34 | 35 | typedef UObject* (__fastcall* f_StaticConstructObject_Internal)( 36 | UClass* Class, 37 | UObject* InOuter, 38 | void* Name, 39 | EObjectFlags SetFlags, 40 | EInternalObjectFlags InternalSetFlags, 41 | UObject* Template, 42 | bool bCopyTransientsFromClassDefaults, 43 | void* InstanceGraph, 44 | bool bAssumeTemplateIsArchetype 45 | ); 46 | static f_StaticConstructObject_Internal StaticConstructObject_Internal; 47 | 48 | DWORD WINAPI MainThread(LPVOID param) 49 | { 50 | #ifdef _DEBUG 51 | AllocConsole(); 52 | #pragma warning( push ) 53 | #pragma warning( disable : 6031 ) 54 | freopen("CONOUT$", "w", stdout); 55 | #pragma warning( pop ) 56 | #endif 57 | 58 | handle = (HMODULE)param; 59 | 60 | uintptr_t GEngine_Address = Memory::FindPattern("\x48\x89\x74\x24\x20\xE8\x00\x00\x00\x00\x48\x8B\x4C\x24\x40\x48\x89\x05", 61 | "xxxxxx????xxxxxxxx"); 62 | 63 | VALIDATE_ADDRESS(GEngine_Address, L"Failed to find GEngine."); 64 | 65 | GEngine = *(UEngine**)(GEngine_Address + 22 + *(int32_t*)(GEngine_Address + 18)); 66 | 67 | DEBUG_LOG("GEngine: %p\n", GEngine); 68 | DEBUG_LOG("Console Class: %p\n", GEngine->ConsoleClass); 69 | DEBUG_LOG("Game Viewport Client: %p\n", GEngine->GameViewportClient); 70 | 71 | uintptr_t SCOI_Address = Memory::FindPattern("\x4C\x89\x44\x24\x18\x55\x53\x56\x57\x41\x54\x41\x55\x41\x56\x41\x57\x48\x8D\xAC\x24\x00\x00\x00\x00\x48\x81\xEC\x00\x00\x00\x00\x48\x8B\x05\x00\x00\x00\x00\x48\x33\xC4", 72 | "xxxxxxxxxxxxxxxxxxxxx????xxx????xxx????xxx"); 73 | 74 | VALIDATE_ADDRESS(SCOI_Address, L"Failed to find StaticConstructObject_Internal."); 75 | 76 | StaticConstructObject_Internal = (f_StaticConstructObject_Internal)(SCOI_Address); 77 | 78 | DEBUG_LOG("StaticConstructObject_Internal: %p\n", StaticConstructObject_Internal); 79 | 80 | UConsole* Console = reinterpret_cast(StaticConstructObject_Internal( 81 | GEngine->ConsoleClass, 82 | reinterpret_cast(GEngine->GameViewportClient), 83 | nullptr, 84 | EObjectFlags::RF_NoFlags, 85 | EInternalObjectFlags::None, 86 | nullptr, 87 | false, 88 | nullptr, 89 | false 90 | )); 91 | 92 | DEBUG_LOG("Console: %p\n", Console); 93 | 94 | GEngine->GameViewportClient->ViewportConsole = Console; 95 | 96 | FreeLibraryAndExitThread((HMODULE)param, 0); 97 | return 0; 98 | } 99 | 100 | BOOL APIENTRY DllMain(HMODULE hModule, DWORD dwReason, LPVOID lpReserved) 101 | { 102 | switch (dwReason) 103 | { 104 | case DLL_PROCESS_ATTACH: 105 | CreateThread(0, 0, MainThread, hModule, 0, 0); 106 | break; 107 | } 108 | return TRUE; 109 | } 110 | -------------------------------------------------------------------------------- /memory.h: -------------------------------------------------------------------------------- 1 | #pragma once 2 | 3 | #include 4 | #include 5 | 6 | class Memory { 7 | private: 8 | static __forceinline bool MaskCompare(PVOID pBuffer, LPCSTR lpPattern, LPCSTR lpMask) 9 | { 10 | for (PBYTE value = reinterpret_cast(pBuffer); *lpMask; ++lpPattern, ++lpMask, ++value) 11 | { 12 | if (*lpMask == 'x' && *reinterpret_cast(lpPattern) != *value) 13 | return false; 14 | } 15 | return true; 16 | } 17 | public: 18 | static __forceinline uintptr_t FindPattern(PVOID pBase, DWORD dwSize, LPCSTR lpPattern, LPCSTR lpMask) 19 | { 20 | dwSize -= static_cast(strlen(lpMask)); 21 | for (unsigned long index = 0; index < dwSize; ++index) 22 | { 23 | PBYTE pAddress = reinterpret_cast(pBase) + index; 24 | if (MaskCompare(pAddress, lpPattern, lpMask)) 25 | return reinterpret_cast(pAddress); 26 | } 27 | return NULL; 28 | } 29 | 30 | static __forceinline uintptr_t FindPattern(LPCSTR lpPattern, LPCSTR lpMask) 31 | { 32 | MODULEINFO info = { 0 }; 33 | GetModuleInformation(GetCurrentProcess(), GetModuleHandle(0), &info, sizeof(info)); 34 | return FindPattern(info.lpBaseOfDll, info.SizeOfImage, lpPattern, lpMask); 35 | } 36 | }; -------------------------------------------------------------------------------- /structs.h: -------------------------------------------------------------------------------- 1 | #pragma once 2 | 3 | struct UObject; 4 | 5 | struct UClass; 6 | 7 | struct UConsole; 8 | 9 | struct UGameViewportClient 10 | { 11 | char unknown1[0x40]; 12 | UConsole* ViewportConsole; 13 | }; 14 | 15 | struct UEngine 16 | { 17 | char unknown1[0xF8]; 18 | UClass* ConsoleClass; 19 | char unknown2[0x688]; 20 | UGameViewportClient* GameViewportClient; 21 | }; --------------------------------------------------------------------------------