diff -r 90f927b4b9e1 -r 0c6fb706f747 hedgewars/hwLibrary.pas --- a/hedgewars/hwLibrary.pas Fri Dec 22 23:59:03 2017 +0100 +++ b/hedgewars/hwLibrary.pas Sun Dec 24 00:44:16 2017 +0100 @@ -35,9 +35,6 @@ , uVariables , uSound , uCommands - , uUtils - , uLocale - {$IFDEF ANDROID}, jni{$ENDIF} , uFLTypes , uFLIPC , uPhysFSLayer @@ -47,60 +44,6 @@ {$INCLUDE "config.inc"} -// retrieve protocol information -procedure HW_versionInfo(netProto: PLongInt; versionStr: PPChar); cdecl; -begin - netProto^:= cNetProtoVersion; - versionStr^:= cVersionString; -end; - -function HW_versionString: PChar; cdecl; -begin - exit(cVersionString + '-r' + cRevisionString + ' (' + cHashString + ')'); -end; - -// equivalent to esc+y; when closeFrontend = true the game exits after memory cleanup -procedure HW_terminate(closeFrontend: boolean); cdecl; -begin - closeFrontend:= closeFrontend; // avoid hint - ParseCommand('forcequit', true); -end; - -function HW_getWeaponNameByIndex(whichone: LongInt): PChar; cdecl; -begin - HW_getWeaponNameByIndex:= (str2pchar(trammo[Ammoz[TAmmoType(whichone+1)].NameId])); -end; - -(*function HW_getWeaponCaptionByIndex(whichone: LongInt): PChar; cdecl; -begin - HW_getWeaponCaptionByIndex:= (str2pchar(trammoc[Ammoz[TAmmoType(whichone+1)].NameId])); -end; - -function HW_getWeaponDescriptionByIndex(whichone: LongInt): PChar; cdecl; -begin - HW_getWeaponDescriptionByIndex:= (str2pchar(trammod[Ammoz[TAmmoType(whichone+1)].NameId])); -end;*) - -function HW_getNumberOfWeapons: LongInt; cdecl; -begin - HW_getNumberOfWeapons:= ord(high(TAmmoType)); -end; - -function HW_getMaxNumberOfHogs: LongInt; cdecl; -begin - HW_getMaxNumberOfHogs:= cMaxHHIndex + 1; -end; - -function HW_getMaxNumberOfTeams: LongInt; cdecl; -begin - HW_getMaxNumberOfTeams:= cMaxTeams; -end; - -procedure HW_memoryWarningCallback; cdecl; -begin - ReleaseSound(false); -end; - procedure flibInit(localPrefix, userPrefix: PChar); cdecl; begin initIPC; @@ -113,42 +56,12 @@ freeIPC; end; -{$IFDEF ANDROID} -function JNI_HW_versionInfoNet(env: PJNIEnv; obj: JObject):JInt;cdecl; -begin - env:= env; // avoid hint - obj:= obj; // avoid hint - JNI_HW_versionInfoNet:= cNetProtoVersion; -end; - -function JNI_HW_versionInfoVersion(env: PJNIEnv; obj: JObject):JString; cdecl; -var envderef : JNIEnv; -begin - obj:= obj; // avoid hint - envderef:= @env; - JNI_HW_versionInfoVersion := envderef^.NewStringUTF(env, PChar(cVersionString)); -end; - -procedure JNI_HW_GenLandPreview(env: PJNIEnv; c: JClass; port: JInt); cdecl; -begin - GenLandPreview(port); -end; - -exports - JNI_HW_versionInfoNet name Java_Prefix+'HWversionInfoNetProto', - JNI_HW_versionInfoVersion name Java_Prefix+'HWversionInfoVersion', - JNI_HW_GenLandPreview name Java_Prefix + 'HWGenLandPreview', - HW_getNumberOfweapons name Java_Prefix + 'HWgetNumberOfWeapons', - HW_getMaxNumberOfHogs name Java_Prefix + 'HWgetMaxNumberOfHogs', - HW_getMaxNumberOfTeams name Java_Prefix + 'HWgetMaxNumberOfTeams', - Game; -{$ELSE} exports registerUIMessagesCallback, flibInit, - flibFree + flibFree, + queueExecution ; -{$ENDIF} begin end.