msvc idiosyncrasy fix

Author: hhhikr

ProTrekkr.dsp

@@ -4,14 +4,16 @@ ProTrekkr releases history
 
 v2.5.4:
 
-- Fixed 2 issues with interpolate commands (it wouldn't work on all effects)
-  and the whole commmand column is now filled with the first value.
+- Fixed 2 issues with interpolate command: it wouldn't work on all effects
+  and the whole commmand column is now properly filled with the first value.
 - Input was partly disabled when caps lock was turned on.
 - Right mouse button on pattern lines will now increase/decrease value by 8.
 - F5 to F9 keys now jumps to 0, 1/4, 2/4, 3/4, 4/4 of the patterns lines.
 - Per request, I changed the way the number of patterns is calculated
   when saving a song, the tracker now looks for any used (scratch) patterns
   and save them within the .ptk module.
+- Fixed an issue in digibooster import function which was due
+  to a MSVC compiler quirk.
 
 v2.5.3:
 

ProTrekkr.ncb

@@ -230,7 +230,7 @@ unsigned short Getc_Mod_Word()
 }
 
 // ------------------------------------------------------
-// Retrieve a word from the .mod data
+// Retrieve a double word from the .mod data
 unsigned int Getc_Mod_Dword()
 {
     return (int) (Getc_Mod() << 24) + 
@@ -459,8 +459,13 @@ void LoadAmigaMod(char *Name, const char *FileName, int channels, int digibooste
                                 // Check bit mask
                                 if(BitMasks[i] & (1 << j))
                                 {
-                                    *wDigi_Mod++ = Getc_Mod() | (Getc_Mod() << 8);
-                                    *wDigi_Mod++ = Getc_Mod() | (Getc_Mod() << 8);
+                                    int value;
+                                    value = (int) Getc_Mod();
+                                    value |= (int) (Getc_Mod() << 8);
+                                    *wDigi_Mod++ = value;
+                                    value = (int) Getc_Mod();
+                                    value |= (int) (Getc_Mod() << 8);
+                                    *wDigi_Mod++ = value;
                                 }
                                 else
                                 {
@@ -482,8 +487,13 @@ void LoadAmigaMod(char *Name, const char *FileName, int channels, int digibooste
                             wDigi_Mod2 = &wDigi_Mod[j * 2];
                             for(i = 0; i < 64; i++)
                             {
-                                wDigi_Mod2[0] = Getc_Mod() | (Getc_Mod() << 8);
-                                wDigi_Mod2[1] = Getc_Mod() | (Getc_Mod() << 8);
+                                int value;
+                                value = (int) Getc_Mod();
+                                value |= (int) (Getc_Mod() << 8);
+                                wDigi_Mod2[0] = value;
+                                value = (int) Getc_Mod();
+                                value |= (int) (Getc_Mod() << 8);
+                                wDigi_Mod2[1] = value;
                                 wDigi_Mod2 += (channels * 2);
                             }
                         }

ProTrekkr.opt

@@ -6,7 +6,7 @@
 --------------------Configuration: plugin - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\franck\LOCALS~1\Temp\RSP5B.tmp" with contents
+Creating temporary file "C:\DOCUME~1\franck\LOCALS~1\Temp\RSPEE.tmp" with contents
 [
 /nologo /MT /W3 /GX /O2 /D "__WIN32__" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PLUGIN_EXPORTS" /D "__WINAMP__" /D "__STAND_ALONE__" /Fp"Release/plugin.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
 "C:\Src\Pc\ptk\src\files\303s.cpp"
@@ -23,8 +23,8 @@ Creating temporary file "C:\DOCUME~1\franck\LOCALS~1\Temp\RSP5B.tmp" with conten
 "C:\Src\Pc\ptk\release\distrib\replay\lib\tb_303.cpp"
 "C:\Src\Pc\ptk\release\distrib\replay\lib\wavpack.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\franck\LOCALS~1\Temp\RSP5B.tmp" 
-Creating temporary file "C:\DOCUME~1\franck\LOCALS~1\Temp\RSP5C.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\franck\LOCALS~1\Temp\RSPEE.tmp" 
+Creating temporary file "C:\DOCUME~1\franck\LOCALS~1\Temp\RSPEF.tmp" with contents
 [
 kernel32.lib user32.lib ../../zlib.lib msvcrt.lib msacm32.lib dsound.lib /nologo /dll /incremental:no /pdb:"Release/in_ptk.pdb" /machine:I386 /out:"Distrib\in_ptk.dll" /implib:"Release/in_ptk.lib" 
 .\Release\303s.obj
@@ -41,7 +41,7 @@ kernel32.lib user32.lib ../../zlib.lib msvcrt.lib msacm32.lib dsound.lib /nologo
 .\Release\tb_303.obj
 .\Release\wavpack.obj
 ]
-Creating command line "link.exe @C:\DOCUME~1\franck\LOCALS~1\Temp\RSP5C.tmp"
+Creating command line "link.exe @C:\DOCUME~1\franck\LOCALS~1\Temp\RSPEF.tmp"
 <h3>Output Window</h3>
 Compiling...
 303s.cpp