Fixes to MQ2-20150516 for ISXEQ compilation

[iluvseq]

The following context diff fixes all the compilation errors for ISXEQ with the latest zip.

It also includes the config file fix so that ISXEQ will load MacroQuest.ini for run-time configuration.

Code: Select all

diff -cr MQ2-20150516/MQ2Main/ISXEQ/ISXEQ.cpp mq2_cz/MQ2Main/ISXEQ/ISXEQ.cpp
*** MQ2-20150516/MQ2Main/ISXEQ/ISXEQ.cpp	2014-09-27 10:58:50.000000000 -0400
--- mq2_cz/MQ2Main/ISXEQ/ISXEQ.cpp	2015-05-17 20:56:20.252992500 -0400
***************
*** 139,145 ****
  	RegisterTopLevelObjects();
      RegisterServices();
  	HookMemChecker(TRUE);
! 	strcpy(gszINIPath,INIFileName);
  	MQ2Initialize();
  	printf("ISXEQ Loaded");
  	return true;
--- 139,145 ----
  	RegisterTopLevelObjects();
      RegisterServices();
  	HookMemChecker(TRUE);
! 	strcpy(gszINIPath,ModulePath);
  	MQ2Initialize();
  	printf("ISXEQ Loaded");
  	return true;
***************
*** 229,235 ****
          _var_->SetInheritance(_inherits_); \
      }
      // NOTE: SetInheritance does NOT make it inherit, just notifies the syntax checker...
! #include "DataTypeList.h"
  #undef DATATYPE
  }
  
--- 229,235 ----
          _var_->SetInheritance(_inherits_); \
      }
      // NOTE: SetInheritance does NOT make it inherit, just notifies the syntax checker...
! #include "..\DataTypeList.h"
  #undef DATATYPE
  }
  
***************
*** 308,314 ****
          pISInterface->RemoveLSType(*_var_); \
          delete _var_; \
      }
! #include "DataTypeList.h"
  #undef DATATYPE
  }
  void CISXEQ::UnRegisterTopLevelObjects()
--- 308,314 ----
          pISInterface->RemoveLSType(*_var_); \
          delete _var_; \
      }
! #include "..\DataTypeList.h"
  #undef DATATYPE
  }
  void CISXEQ::UnRegisterTopLevelObjects()
diff -cr MQ2-20150516/MQ2Main/MQ2Utilities.cpp mq2_cz/MQ2Main/MQ2Utilities.cpp
*** MQ2-20150516/MQ2Main/MQ2Utilities.cpp	2015-05-16 13:04:26.000000000 -0400
--- mq2_cz/MQ2Main/MQ2Utilities.cpp	2015-05-17 09:44:27.939260100 -0400
***************
*** 7614,7622 ****
--- 7614,7624 ----
  					((CXWnd*)krwnd)->Show(0,1);
  					((CSidlScreenWnd*)krwnd)->StoreIniVis();
  				}
+ #ifndef ISXEQ
  				if(bUseCmd && ((CSidlScreenWnd*)clist)->Items) {
  					UseItemCmd(GetCharInfo()->pSpawn,szItemName);
  				}
+ #endif
  			}
  		}
  	}

[LamahHerder]

So.... does isxeq actually work now? I thought it was abandoned

Is there a community anywhere or anyone that is using it? I am interested in helping out

[Maskoi]

On second thought , let’s not go to Camelot. ‘Tis a silly place.

[SwiftyMUSE]

changes added for next zip.

[iluvseq]

So.... does isxeq actually work now? I thought it was abandoned

Is there a community anywhere or anyone that is using it? I am interested in helping out

It works just fine :)

I'll be posting an updated ISXEQExchange shortly (using MoveItem, none of this /notify crap). I've gotten /exchange working flawlessly, just ironing out a bug in /unequip.

The other clients / conversions such as ISXEQMovement that I've posted previously all still work just fine. Granted, I've only done limited testing over the last couple of days, but I'll be keeping them up-to-date now that I've been sucked back into playing again.

[DWSJ]

I spent a ton of time trying to get ISXEQ working using VS 2015. Initially i had to manually switch all projects to vs12.

After finally getting it to compile by updating LSType.h

Code: Select all

typedef struct _LSTypeVar
...
unsigned __int64 UInt64;

typedef struct _LSVarPtr
...
unsigned __int64 UInt64;

InnerSpace complained that the extensions were version 34 and not 35.

I downloaded 35 from bithub, and replaced all the 34 files, but that didnt seem to work.

I tried adding to the isxGamesCommon.props for version 35 and VS 2015 by

Code: Select all

    <When Condition="'$(PlatformToolsetVersion)' == '140'">
      <PropertyGroup>
        <ISXDKVERSION Condition="'$(ISXDKVERSION)' == ''">35</ISXDKVERSION>
        <LSMODULEVERSION Condition="'$(LSMODULEVERSION)' == ''">22</LSMODULEVERSION>
        <LS2MODULEVERSION Condition="'$(LS2MODULEVERSION)' == ''">1</LS2MODULEVERSION>
        <VSVERSIONDIRNAME>vs14</VSVERSIONDIRNAME>
      </PropertyGroup>
    </When>

I updated back to vs14, but now it cant see the files.

I am way rusty on C++, but seems like something might be missing from the default download.

[DWSJ]

Finally got vs14 (Visual Studio 2015) . .compiled.

Inner Space tries to load 'extension isxeq' and crashes the game.... so dead end i think.

cant seem to find logs yet....

[DWSJ]

all resolved, still contend that the default download probably doesnt work with newest version of innerspace.

off to have fun with the new scripting language.

[LamahHerder]

Can you post your findings?