[clinkster] some misc fixes and tweaks

clinkster/Clinkster/converter/clinksterxml.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 
 import xml.dom
 import xml.dom.minidom

clinkster/Clinkster/player/clinkster.asm

@@ -593,15 +593,15 @@ PUBLIC_FN(Clinkster_GenerateMusic,0):
 %endif
 
 .stereoloop:
-	mov dword [noteposptr], PUBLIC_DATA(NotePositions)
-	mov dword [notesamptr], PUBLIC_DATA(NoteSamples)
+	mov dword [noteposptr], NotePositions
+	mov dword [notesamptr], NoteSamples
 
 	xor		eax, eax
 	mov		edi, PUBLIC_DATA(MixingBuffer)
 	mov		ecx, TOTAL_SAMPLES
 	rep stosd
 
-	mov		esi, PUBLIC_DATA(InstrumentData)
+	mov		esi, InstrumentData
 %if USES_DELAY
 	jmp		short .trackloop
 

clinkster/Clinkster/player/clinkster.h

@@ -17,6 +17,7 @@ extern "C" {
 	// and Clinkster_StartMusic can be called.
 	void __stdcall Clinkster_GenerateMusic();
 
+#ifdef WIN32
 	// Play the music
 	void __stdcall Clinkster_StartMusic();
 
@@ -24,6 +25,7 @@ extern "C" {
 	// Use this function as the timer for the visuals in your intro.
 	// Returned value is measured in music ticks (pattern rows).
 	float __stdcall Clinkster_GetPosition();
+#endif
 
 	// Used for timing intro events to music notes.
 	// Returns how long ago (in ticks) a note was last triggered in the