From b8113e39fe31dda0c9afc0c7cb19bbc81d7e6995 Mon Sep 17 00:00:00 2001
From: eddie-0815 <eddie-0815@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 23 Nov 2007 19:39:47 +0000
Subject: Changed string to pchar in ModiSDK.pas.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@642 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Modis/5000Points/Until5000.dpr | 14 ++++++++++----
 Modis/SDK/ModiSDK.pas          | 24 ++++++++++++------------
 2 files changed, 22 insertions(+), 16 deletions(-)

(limited to 'Modis')

diff --git a/Modis/5000Points/Until5000.dpr b/Modis/5000Points/Until5000.dpr
index b826d212..72214a33 100644
--- a/Modis/5000Points/Until5000.dpr
+++ b/Modis/5000Points/Until5000.dpr
@@ -1,10 +1,16 @@
 library Until5000;
 
+{$IFDEF FPC}
+  {$MODE Delphi}
+{$ENDIF}
+
+{$I ../../Game/Code/switches.inc}
+
 uses
   ModiSDK in '..\SDK\ModiSDK.pas';
 
 //Gave the Plugins Info
-procedure PluginInfo (var Info: TPluginInfo); stdcall;
+procedure PluginInfo (var Info: TPluginInfo); {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 begin
   Info.Name    := 'PLUGIN_UNTIL5000_NAME';
 
@@ -40,13 +46,13 @@ begin
 end;
 
 //Executed on Game Start //If True Game begins, else Failure
-function Init (const TeamInfo: TTeamInfo; var Playerinfo: TPlayerinfo; const Sentences: TSentences; const Methods: TMethodRec): boolean; stdcall;
+function Init (const TeamInfo: TTeamInfo; var Playerinfo: TPlayerinfo; const Sentences: TSentences; const Methods: TMethodRec): boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 begin
 Result := True;
 end;
 
 //Executed everytime the Screen is Drawed //If False The Game finishes
-function Draw (var Playerinfo: TPlayerinfo; const CurSentence: Cardinal): boolean; stdcall;
+function Draw (var Playerinfo: TPlayerinfo; const CurSentence: Cardinal): boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 var
 I: Integer;
 begin
@@ -62,7 +68,7 @@ Result := True;
 end;
 
 //Is Executed on Finish, Returns the Playernum of the Winner
-function Finish (var Playerinfo: TPlayerinfo): byte; stdcall;
+function Finish (var Playerinfo: TPlayerinfo): byte; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 var
   I:Integer;
 begin
diff --git a/Modis/SDK/ModiSDK.pas b/Modis/SDK/ModiSDK.pas
index 7cc3ef1a..f42d13d9 100644
--- a/Modis/SDK/ModiSDK.pas
+++ b/Modis/SDK/ModiSDK.pas
@@ -6,7 +6,7 @@ interface
   {$MODE Delphi}
 {$ENDIF}
 
-{$I switches.inc}
+{$I ../../Game/Code/switches.inc}
 
 type  //PluginInfo, for Init
   TPluginInfo = record
@@ -98,7 +98,7 @@ type  //PluginInfo, for Init
     Sentence:    array of record
       Start:    integer;
       StartNote:  integer;
-      Lyric:      string;
+      Lyric:      PChar;      // todo: eddie: changed string to pchar.
       LyricWidth: real;
       Koniec:   integer;
       BaseNote: integer;
@@ -122,11 +122,11 @@ type  //PluginInfo, for Init
   HSTREAM = DWORD;
 
   //Routines to gave to the Plugin
-  fModi_LoadTex = function (const Name, Typ: PChar): TsmallTexture; stdcall; //Pointer to Texture Loader
-  //fModi_Translate = function (const Name, Translation: AChar): Integer; stdcall;       //Pointer to Translator
-  fModi_Print = procedure (const Style, Size: Byte; const X, Y: Real; const Text: PChar); stdcall;       //Procedure to Print Text   //Now translated automatically
-  fModi_LoadSound = function (const Name: PChar): Cardinal; stdcall;       //Procedure that loads a Custom Sound
-  pModi_PlaySound = procedure (const Index: Cardinal); stdcall;       //Plays a Custom Sound
+  fModi_LoadTex = function (const Name, Typ: PChar): TsmallTexture; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF} //Pointer to Texture Loader
+  //fModi_Translate = function (const Name, Translation: AChar): Integer; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}       //Pointer to Translator
+  fModi_Print = procedure (const Style, Size: Byte; const X, Y: Real; const Text: PChar); {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}       //Procedure to Print Text   //Now translated automatically
+  fModi_LoadSound = function (const Name: PChar): Cardinal; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}       //Procedure that loads a Custom Sound
+  pModi_PlaySound = procedure (const Index: Cardinal); {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}       //Plays a Custom Sound
 
   TMethodRec = record
     LoadTex:    fModi_LoadTex;
@@ -136,15 +136,15 @@ type  //PluginInfo, for Init
   end;
   //DLL Funktionen
   //Gave the Plugins Info
-  pModi_PluginInfo = procedure (var Info: TPluginInfo); stdcall;
+  pModi_PluginInfo = procedure (var Info: TPluginInfo); {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
   //Executed on Game Start //If True Game begins, else Failure
-  fModi_Init = function (const TeamInfo: TTeamInfo; var Playerinfo: TPlayerinfo; const Sentences: TSentences; const Methods: TMethodRec): boolean; stdcall;
+  fModi_Init = function (const TeamInfo: TTeamInfo; var Playerinfo: TPlayerinfo; const Sentences: TSentences; const Methods: TMethodRec): boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
   //Executed everytime the Screen is Drawed //If False The Game finishes
-  fModi_Draw = function (var Playerinfo: TPlayerinfo; const CurSentence: Cardinal): boolean; stdcall;
+  fModi_Draw = function (var Playerinfo: TPlayerinfo; const CurSentence: Cardinal): boolean; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
   //Is Executed on Finish, Returns the Playernum of the Winner
-  fModi_Finish = function (var Playerinfo: TPlayerinfo): byte; stdcall;
+  fModi_Finish = function (var Playerinfo: TPlayerinfo): byte; {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
   //Procedure called when new Sound Data is available
-  pModi_RData = procedure (handle: HSTREAM; buffer: Pointer; len: DWORD; user: DWORD); stdcall;
+  pModi_RData = procedure (handle: HSTREAM; buffer: Pointer; len: DWORD; user: DWORD); {$IFDEF MSWINDOWS} stdcall; {$ELSE} cdecl; {$ENDIF}
 
 implementation
 
-- 
cgit v1.2.3