Fixes to OpenTyrian compilation

This commit is contained in:
pelya
2012-08-08 02:17:06 +03:00
parent 0c5b24534b
commit e46400f500
4 changed files with 16 additions and 16 deletions

View File

@@ -34,9 +34,9 @@ StartupMenuButtonTimeout=3000
HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
FirstStartMenuOptions=''
MultiABI=n
AppVersionCode=2120
AppVersionName="2.1.20"
ResetSdlConfigForThisVersion=y
AppVersionCode=2121
AppVersionName="2.1.21"
ResetSdlConfigForThisVersion=n
DeleteFilesOnUpgrade="%"
CompiledLibraries="sdl_net"
CustomBuildScript=n

View File

@@ -146,18 +146,18 @@ typedef struct
JE_word eenemydie;
} JE_EnemyDatType[ENEMY_NUM + 1]; /* [0..enemynum] */
extern JE_WeaponPortType weaponPort;
extern JE_WeaponType weapons;
extern JE_PowerType powerSys;
extern JE_ShipType ships;
extern JE_OptionType options[OPTION_NUM + 1]; /* [0..optionnum] */
extern JE_ShieldType shields;
extern JE_SpecialType special;
extern JE_EnemyDatType enemyDat;
extern JE_byte initial_episode_num, episodeNum;
extern JE_boolean episodeAvail[EPISODE_MAX];
extern "C" JE_WeaponPortType weaponPort;
extern "C" JE_WeaponType weapons;
extern "C" JE_PowerType powerSys;
extern "C" JE_ShipType ships;
extern "C" JE_OptionType options[OPTION_NUM + 1]; /* [0..optionnum] */
extern "C" JE_ShieldType shields;
extern "C" JE_SpecialType special;
extern "C" JE_EnemyDatType enemyDat;
extern "C" JE_byte initial_episode_num, episodeNum;
extern "C" JE_boolean episodeAvail[EPISODE_MAX];
extern char episode_file[13], cube_file[13];
extern "C" char episode_file[13], cube_file[13];
extern JE_longint episode1DataLoc;
extern JE_boolean bonusLevel;