fix compilation in windows and skip icon fetching in network mode

cheat-engine · Feb 28, 2015 · 28e64bf · 28e64bf
1 parent 3a58fde
commit 28e64bf
Show file tree

Hide file tree

Showing 17 changed files with 215 additions and 160 deletions.
diff --git a/Cheat Engine/CustomTypeHandler.pas b/Cheat Engine/CustomTypeHandler.pas
@@ -10,7 +10,7 @@ interface
 {$ifdef windows}
 uses
   dialogs, Classes, SysUtils,cefuncproc, autoassembler, lua, lauxlib, lualib,
-  math;
+  math, commonTypeDefs;
 {$endif}
 
 {$ifdef unix} //not yet implemented, but the interface is available

diff --git a/Cheat Engine/LuaGenericHotkey.pas b/Cheat Engine/LuaGenericHotkey.pas
@@ -7,7 +7,8 @@
 interface
 
 uses
-  windows, Classes, SysUtils, lua, lauxlib, lualib, genericHotkey, CEFuncProc, math;
+  windows, Classes, SysUtils, lua, lauxlib, lualib, genericHotkey, CEFuncProc,
+  math, commonTypeDefs;
 
 
 procedure initializeLuaGenericHotkey;

diff --git a/Cheat Engine/MainUnit2.pas b/Cheat Engine/MainUnit2.pas
@@ -8,7 +8,8 @@ interface
 
 uses windows, dialogs,forms,classes,LCLIntf, LCLProc, sysutils,registry,ComCtrls, menus,
      formsettingsunit, cefuncproc,AdvancedOptionsUnit, MemoryBrowserFormUnit,
-     memscan,plugin, hotkeyhandler,frmProcessWatcherunit, newkernelhandler, debuggertypedefinitions;
+     memscan,plugin, hotkeyhandler,frmProcessWatcherunit, newkernelhandler,
+     debuggertypedefinitions, commonTypeDefs;
 
 const ceversion=6.4;
 
@@ -117,13 +118,13 @@ procedure UpdateToolsMenu;
 procedure LoadSettingsFromRegistry;
 var reg : TRegistry;
     i,j: integer;
-    temphotkeylist: array [0..30] of cefuncproc.tkeycombo;
+    temphotkeylist: array [0..30] of commontypedefs.tkeycombo;
     found:boolean;
     names: TStringList;
     li: tlistitem;
     s,s2: string;
 begin
-  ZeroMemory(@temphotkeylist, 31*sizeof(cefuncproc.tkeycombo));
+  ZeroMemory(@temphotkeylist, 31*sizeof(commontypedefs.tkeycombo));
   if formsettings=nil then exit;
 
   try

diff --git a/Cheat Engine/OpenSave.pas b/Cheat Engine/OpenSave.pas
@@ -10,8 +10,9 @@ interface
 uses windows, forms, LCLIntf,registry, SysUtils,AdvancedOptionsUnit,CommentsUnit,
      CEFuncProc,classes,{formmemorymodifier,formMemoryTrainerUnit,}shellapi,
      {MemoryTrainerDesignUnit,}StdCtrls,{ExtraTrainerComponents,}Graphics,Controls,
-     tableconverter, ExtCtrls,Dialogs,NewKernelHandler, hotkeyhandler, structuresfrm, StructuresFrm2,
-     comctrls,dom, xmlread,xmlwrite, FileUtil, ceguicomponents, zstream, luafile, disassemblerComments;
+     tableconverter, ExtCtrls,Dialogs,NewKernelHandler, hotkeyhandler, structuresfrm,
+     StructuresFrm2, comctrls,dom, xmlread,xmlwrite, FileUtil, ceguicomponents,
+     zstream, luafile, disassemblerComments, commonTypeDefs;
 
 
 var CurrentTableVersion: dword=18;