Index: oup/current/Global/Exporters.pas
===================================================================
--- oup/current/Global/Exporters.pas	(revision 110)
+++ oup/current/Global/Exporters.pas	(revision 111)
@@ -84,12 +84,12 @@
   TDatData = packed record
     {0x00}
-    _fileid:         LongWord;
-    level:           LongWord;
-    FormatSize:      LongWord;
+    _fileid:         Integer;
+    level:           Integer;
+    FormatSize:      Integer;
     AudioFormat:     Word;
     NumChannels:     Word;
     {0x10}
-    SampleRate:      LongWord;
-    ByteRate:        LongWord;
+    SampleRate:      Integer;
+    ByteRate:        Integer;
     BlockAlign:      Word;
     BitsPerSample:   Word;
@@ -98,10 +98,10 @@
     SamplesPerBlock: Word;
     NumCoefficients: Word;
-    Coefficients:    array[0..6] of LongWord;
+    Coefficients:    array[0..6] of Integer;
     {0x3E}
     Duration:        Word;
     {0x40}
-    RawSize:         LongWord;
-    RawPos:          LongWord;
+    RawSize:         Integer;
+    RawPos:          Integer;
   end;
 var
@@ -112,10 +112,10 @@
   //Wave Header Stuff
   ASCII_RIFF:   LongWord; //"RIFF"
-  WAVE_Len:     LongWord;
+  WAVE_Len:     Integer;
   ASCII_WAVE:   LongWord; //"WAVE"
   ASCII_FMT:    LongWord; //"fmt "
-  WAVE_FMT_Len: LongWord;
+  WAVE_FMT_Len: Integer;
   ASCII_DATA:   LongWord; //"data"
-  WAVE_DataLen:  LongWord;
+  WAVE_DataLen:  Integer;
 begin
   Result := 0;
@@ -190,6 +190,6 @@
 var
   loop_speed, unknown: Word;
-  linkcount: LongWord;
-  link: LongWord;
+  linkcount: Integer;
+  link: Integer;
   i: Byte;
 begin
Index: oup/current/Global/Functions.pas
===================================================================
--- oup/current/Global/Functions.pas	(revision 110)
+++ oup/current/Global/Functions.pas	(revision 111)
@@ -202,5 +202,5 @@
 var
   string_build, ascii_version: String;
-  i: LongWord;
+  i: Integer;
 begin
   string_build  := '';
@@ -235,5 +235,5 @@
 function DecodeHexString(hex: String): TByteData;
 var
-  i: LongWord;
+  i: Integer;
 begin
   SetLength(Result, Length(hex) div 2);
Index: oup/current/Global/TypeDefs.pas
===================================================================
--- oup/current/Global/TypeDefs.pas	(revision 110)
+++ oup/current/Global/TypeDefs.pas	(revision 111)
@@ -26,5 +26,5 @@
       Ident:       array[0..$7] of Byte;
       Extension:   array[0..$3] of Char;
-      ExtCount:    LongWord;
+      ExtCount:    Integer;
   end;
 
@@ -98,6 +98,6 @@
 
  TDatLinks = array of record
-    Src_Offset: LongWord;
-    Target:     LongWord;
+    Src_Offset: Integer;
+    Target:     Integer;
   end;
 }
Index: oup/current/Helper/ValueEdit.pas
===================================================================
--- oup/current/Helper/ValueEdit.pas	(revision 110)
+++ oup/current/Helper/ValueEdit.pas	(revision 111)
@@ -19,5 +19,5 @@
     procedure btn_cancelClick(Sender: TObject);
     procedure btn_okClick(Sender: TObject);
-    procedure MakeVarInput(objectname: String; offset: LongWord;
+    procedure MakeVarInput(objectname: String; offset: Integer;
       datatype: Word; current: String; caller: TObject);
     procedure FormCreate(Sender: TObject);
@@ -41,10 +41,10 @@
   caller_win_raw: TForm_RawEdit;
   _datatype: Word;
-  _offset: LongWord;
+  _offset: Integer;
 
 
 
 
-procedure TForm_ValueEdit.MakeVarInput(objectname: String; offset: LongWord;
+procedure TForm_ValueEdit.MakeVarInput(objectname: String; offset: Integer;
   datatype: Word; current: String; caller: TObject);
 begin
Index: oup/current/Tools/BinEdit.pas
===================================================================
--- oup/current/Tools/BinEdit.pas	(revision 110)
+++ oup/current/Tools/BinEdit.pas	(revision 111)
@@ -34,6 +34,6 @@
     procedure LoadDat(_fileid: Integer);
     function Save: Boolean;
-    function GetValue(datatype: Word; offset: LongWord): String;
-    procedure SetNewValue(datatype: Word; offset: LongWord; Value: String);
+    function GetValue(datatype: Word; offset: Integer): String;
+    procedure SetNewValue(datatype: Word; offset: Integer; Value: String);
 
     procedure WriteStructureInfos;
@@ -179,5 +179,5 @@
 
 
-function TForm_BinEdit.GetValue(datatype: Word; offset: LongWord): String;
+function TForm_BinEdit.GetValue(datatype: Word; offset: Integer): String;
 var
   Data: TByteData;
@@ -274,5 +274,5 @@
 procedure TForm_BinEdit.WriteStructureInfos;
 var
-  i, j:    LongWord;
+  i, j:    Integer;
   pdata:   PNodeData;
   Data:    TNodeData;
@@ -376,5 +376,5 @@
   Data:  TByteData;
   str:   String;
-  Value: LongWord;
+  Value: Integer;
   floatformat: TFormatSettings;
 begin
@@ -489,5 +489,5 @@
 var
   mem:  TMemoryStream;
-  i:    LongWord;
+  i:    Integer;
 begin
   case MessageBox(Self.Handle, PChar('Save changes to file ' +
@@ -671,5 +671,5 @@
 var
   Name:  String;
-  Value: LongWord;
+  Value: Integer;
 begin
   Name := TMenuItem(Sender).Name;
@@ -856,5 +856,5 @@
 
 
-procedure TForm_BinEdit.SetNewValue(datatype: Word; offset: LongWord; Value: String);
+procedure TForm_BinEdit.SetNewValue(datatype: Word; offset: Integer; Value: String);
 var
   Data: TByteData;
@@ -923,5 +923,5 @@
 procedure TForm_BinEdit.value_viewerDblClick(Sender: TObject);
 var
-  offset:     LongWord;
+  offset:     Integer;
   datatype:   Word;
   objectname: String;
Index: oup/current/Tools/Extractor.pas
===================================================================
--- oup/current/Tools/Extractor.pas	(revision 110)
+++ oup/current/Tools/Extractor.pas	(revision 111)
@@ -70,8 +70,8 @@
 var
   begintime: Double;
-  files:     LongWord;
-  i, done:   LongWord;
+  files:     Integer;
+  i, done:   Integer;
   selonly:   Boolean;
-  fileid:    LongWord;
+  fileid:    Integer;
   filename:  String;
   path:      String;
Index: oup/current/Tools/Preview.pas
===================================================================
--- oup/current/Tools/Preview.pas	(revision 110)
+++ oup/current/Tools/Preview.pas	(revision 111)
@@ -138,6 +138,6 @@
 var
   loop_speed: Word;
-  linkcount: LongWord;
-  link: LongWord;
+  linkcount: Integer;
+  link: Integer;
   i:    Byte;
 begin
Index: oup/current/Tools/RawEdit.pas
===================================================================
--- oup/current/Tools/RawEdit.pas	(revision 110)
+++ oup/current/Tools/RawEdit.pas	(revision 111)
@@ -39,8 +39,8 @@
     procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
 
-    function GetValue(datatype: Word; offset: LongWord): String;
+    function GetValue(datatype: Word; offset: Integer): String;
     procedure ClearValues;
     procedure WriteValues;
-    procedure SetNewValue(datatype: Word; offset: LongWord; Value: String);
+    procedure SetNewValue(datatype: Word; offset: Integer; Value: String);
 
     procedure value_viewerDblClick(Sender: TObject);
@@ -101,5 +101,5 @@
 procedure TForm_RawEdit.LoadRaw(raw_info: TRawDataInfo);
 var
-  i:    LongWord;
+  i:    Integer;
   mem: TMemoryStream;
 begin
@@ -154,5 +154,5 @@
 
 
-function TForm_RawEdit.GetValue(datatype: Word; offset: LongWord): String;
+function TForm_RawEdit.GetValue(datatype: Word; offset: Integer): String;
 var
   Data: TByteData;
@@ -228,5 +228,5 @@
   Data:  TByteData;
   str:   String;
-  Value: LongWord;
+  Value: Integer;
   floatformat: TFormatSettings;
 begin
@@ -340,5 +340,5 @@
 procedure TForm_RawEdit.FormCreate(Sender: TObject);
 var
-  i:     LongWord;
+  i:     Integer;
   exts: String;
 begin
@@ -388,5 +388,5 @@
 var
   mem:  TMemoryStream;
-  i:    LongWord;
+  i:    Integer;
 begin
   case MessageBox(Self.Handle, PChar('Save changes to .raw-part of file ' +
@@ -635,5 +635,5 @@
 //  i:     Byte;
   Name:  String;
-  Value: LongWord;
+  Value: Integer;
 begin
   Name := TMenuItem(Sender).Name;
@@ -694,5 +694,5 @@
 
 
-procedure TForm_RawEdit.SetNewValue(datatype: Word; offset: LongWord; Value: String);
+procedure TForm_RawEdit.SetNewValue(datatype: Word; offset: Integer; Value: String);
 var
   Data: TByteData;
@@ -761,5 +761,5 @@
 procedure TForm_RawEdit.value_viewerDblClick(Sender: TObject);
 var
-  offset:     LongWord;
+  offset:     Integer;
   datatype:   Word;
   objectname: String;
Index: oup/current/Tools/TxmpReplace.pas
===================================================================
--- oup/current/Tools/TxmpReplace.pas	(revision 110)
+++ oup/current/Tools/TxmpReplace.pas	(revision 111)
@@ -90,6 +90,6 @@
 procedure TForm_TxmpReplace.btn_replaceClick(Sender: TObject);
 var
-  newsize: LongWord;
-  old_rawaddr, new_rawaddr: LongWord;
+  newsize: Integer;
+  old_rawaddr, new_rawaddr: Integer;
   oldfading: Byte;
   datbyte: Word;