Commit Graph
100 Commits
Author SHA1 Message Date
Frank Zago f7ac873303 Added test for librt, since linux needs it and OSX doesn't have it. 2012-02-13 02:15:05 +00:00
Frank Zago a62634cf94 Add support for SDL 1.3 in compatibility mode. 2011-11-17 00:24:27 +00:00
Frank Zago e43ac3fa06 Fixed alignment issue on sparc. Minor optimization of CCreatureAnimation::nextFrameT. 2011-10-13 04:33:19 +00:00
Frank Zago 7b1ede449d Removed last instances of readNormalNr. Made readChar an inline. 2011-10-08 16:06:11 +00:00
Frank Zago c8f837b51b Cleaned-up pcx loader. 2011-10-08 05:44:37 +00:00
Frank Zago 8403d177aa Added endian aware macros read_le_u16 and read_le_u32 to replace readNormalNR(). Fixes a couple of issues on big endian machines. 2011-10-08 01:23:46 +00:00
Frank Zago 8963293c07 Avoid soname versioning for AI libraries. These libraries are dlopened so there is no need to make them versioned at all.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2011-10-06 01:21:25 +00:00
Frank Zago 28231fee98 Newest GCC linker requires that every necessary library must be explicitly mentioned - no implicit linking allowed.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2011-10-06 01:11:23 +00:00
Frank Zago 16c23bbf4e Fixed one bad condition; and a compile fix. 2011-10-06 00:27:27 +00:00
Frank Zago 5d4cfc0d0f Fixed #382. 2011-09-26 00:01:47 +00:00
Frank Zago 14261d6be9 Removed debug trace. 2011-09-25 18:59:59 +00:00
Frank Zago 4a3d1a22d6 Only draw the necessary borders for a message window. Fixes #388. 2011-09-25 18:44:13 +00:00
Frank Zago 1f9e97005f When changing resolution, both screen? and res? must be set. Fixes #813. 2011-09-25 16:39:13 +00:00
Frank Zago ddd3d166b1 Let user add maps in his home directory. Linux only. 2011-09-25 15:41:03 +00:00
Frank Zago 01566fcde1 Patch from Yupsi. Hero sleep/wake-up. Fixes #162 and #601. 2011-09-24 16:46:23 +00:00
Frank Zago 6dd9d416b4 Fixed #812. 2011-09-24 01:24:11 +00:00
Frank Zago c4b8039c1e Added a missing rturn in CGameHandler::isAllowedExchangeForQuery. Fixed several typos. 2011-09-24 01:15:36 +00:00
Frank Zago c481177515 Fixed #815. 2011-09-24 00:32:55 +00:00
Frank Zago 0cfb2deeaf Reverted r2382; add zvs to the game data (linux); simplified BitmapHandler::loadBitmap(). 2011-09-14 05:27:49 +00:00
Frank Zago 479a714dbf Better fix than r2381. 2011-09-13 03:31:17 +00:00
Frank Zago bc8bfc2c9c Fixed path to zvs (bug #809); fix from from vaderas. 2011-09-13 02:33:09 +00:00
Frank Zago c46cb29446 sex is uninitialized (a virgin ?). Fixed a typo. 2011-09-13 01:46:11 +00:00
Frank Zago 4dedfcabd1 Compile fix. 2011-09-13 01:45:28 +00:00
Frank Zago 2ae53395d7 Removed duplicate function initVillagesCapitols(), and simplified its clone loadTownDInfos(). 2011-09-04 18:07:26 +00:00
Frank Zago 34698eee4d Fix description. 2011-09-04 02:40:46 +00:00
Frank Zago 76268fac46 Created spell_info.json from spell_info.txt. 2011-09-04 02:26:56 +00:00
Frank Zago 35350aeeff Created hall.json from hall.txt. 2011-09-04 02:02:20 +00:00
Frank Zago 2787830c00 Created buildings5.json from buildings5.txt. 2011-09-03 20:45:27 +00:00
Frank Zago eff17aa850 Created campaign_regions.json from campaign_regions.txt. 2011-09-03 19:51:45 +00:00
Frank Zago 00adba18c9 Created battleStartpos.json from battleStartpos.txt. 2011-09-03 19:25:37 +00:00
Frank Zago c03a5eb4d2 Created bankconfig.json from bankconfig.txt. 2011-09-03 18:32:37 +00:00
Frank Zago 1568e58029 Fixed malformed json file. 2011-09-03 16:14:31 +00:00
Frank Zago 11b50ca176 Created ressources.json from resources.txt. 2011-09-03 14:26:39 +00:00
Frank Zago 029b77e7c4 Created dwellings.json from cregens.txt. 2011-09-03 14:14:43 +00:00
Frank Zago 04995938dc Fixed bad battle backgrounds (introduced in r2334). 2011-09-03 03:53:08 +00:00
Frank Zago bcce343b6c Created terrains.json from native_terrains.txt and TERCOSTS.TXT. 2011-09-02 03:39:49 +00:00
Frank Zago f9b14ba282 Created puzzle_map.json from puzzle_map.txt. 2011-09-02 02:46:18 +00:00
Frank Zago 3cb92baf18 Created obstacles.json from obstacles.txt. 2011-09-02 02:12:55 +00:00
Frank Zago fbf822ba11 Fixed typo. 2011-09-02 01:09:53 +00:00
Frank Zago d8249d007f Replaced a few iterators with BOOST_FOREACH. 2011-09-01 04:01:54 +00:00
Frank Zago 99000866bc Moved the notUsedMonsters values into creatures.json. 2011-09-01 03:48:58 +00:00
Frank Zago 2c26b9be96 Merge cr_abils.txt into creatures.json. Force loading of data from ZCRTRAIT.TXT (was controlable before, but switch was in an inconvenient place). 2011-09-01 03:39:53 +00:00
Frank Zago d49058049e Created towns_defs.json from townsDefs.txt. 2011-09-01 00:11:34 +00:00
Frank Zago 35622913f9 Convert ERMU_to_picture.txt into ERMU_to_picture.json. 2011-08-31 23:27:33 +00:00
Frank Zago e5349c58cd Created wall_pos.json from wall_pos.txt. 2011-08-31 04:11:44 +00:00
Frank Zago 71b1eef6b6 Merged AC_desc.txt into battles_graphics.json. 2011-08-31 03:27:18 +00:00
Frank Zago 68090a4ec6 Created battles_graphics.json from battleBack.txt and battleHeroes.txt. 2011-08-31 01:11:41 +00:00
Frank Zago 0a58d1f2cf Created town_pictures.json from townPics.txt. 2011-08-31 00:35:04 +00:00
Frank Zago 21f72c61b1 Created creature_backgrounds.json from cr_bgs.txt. 2011-08-31 00:12:02 +00:00
Frank Zago 6826826e87 Reintroduced partial patch from r2327 (sex->female) + typo fix. 2011-08-30 23:10:01 +00:00
Frank Zago f3b6ecf9a3 Compile fix for ubuntu 10.04 2011-08-27 19:58:46 +00:00
Frank Zago 2a0fef0e4d Merged specials.txt into heroes.json. 2011-08-27 17:33:07 +00:00
Frank Zago 9594058157 Merged hero_spells.txt into heroes.json. 2011-08-27 16:13:44 +00:00
Frank Zago fc9282fd50 Created heroes.json from heroes_sec_skills.txt. 2011-08-27 15:53:45 +00:00
Frank Zago 866d1c6e2a Rewrote CCreature::estimateCreatureCount to fix a compile warning. 2011-08-27 02:15:58 +00:00
Frank Zago cb66e1b69b Fixed many typos. 2011-08-27 01:27:02 +00:00
Frank Zago e3e2e45777 Merged requirements.txt into buildings.json. Plus a few cleanups in buildings.json. 2011-08-27 01:17:23 +00:00
Frank Zago 74620dc685 Merged mageLevel.txt into buildings.json. 2011-08-26 04:12:46 +00:00
Frank Zago e997b25583 Merged building_horde.txt into buildings.json. 2011-08-26 03:58:07 +00:00
Frank Zago 584e7e3c46 Merged creatures_upgr.txt and basicCres.txt into buildings.json. 2011-08-26 03:43:43 +00:00
Frank Zago 1a2323996e Move CTownHandler::loadStructures inside CTownHandler::loadNames and rename the latter with the former. 2011-08-26 03:10:56 +00:00
Frank Zago b114047738 Integrate buildings4.txt into buildings.json. It's ligthly tested because I can't find what this file is supposed to define. 2011-08-26 02:39:58 +00:00
Frank Zago 06ca4a7c76 Convert minimap.txt to a json file. 2011-08-26 00:29:37 +00:00
Frank Zago 4725cfbf68 Compile fix. 2011-08-26 00:27:58 +00:00
Frank Zago 4cad2f4587 Cache the selected graphic resolution instead of looking it up many times. 2011-08-24 04:13:45 +00:00
Frank Zago 839c437fbc Moved the resolution configurations in their own json files. Lots of C++ voodoo going away. Yay! 2011-08-24 02:19:53 +00:00
Frank Zago 16fcd025a7 Converted bonusnames.txt to a json file. 2011-08-20 22:31:59 +00:00
Frank Zago b853df76ba Consolidated crerefnam.txt, monsters.txt, cr_factions.txt, cr_upgrade_list.txt, CREDEFS.TXT, cr_shots.txt and cr_to_turret.txt into creatures.json 2011-08-20 21:53:03 +00:00
Frank Zago 81e50c9f2b Convert hero portraits config file to json. 2011-08-20 18:46:52 +00:00
Frank Zago 233ce7d6e3 Merge buildings3.txt into buildings.json. 2011-08-20 16:03:27 +00:00
Frank Zago 8fa540b4da Add building blit priorities in the json building file. Reorganized building coordinates processing code a little. 2011-08-20 06:08:48 +00:00
Frank Zago 6bbccaa76d Convert the buildings coordinates into a json file. 2011-08-20 04:48:23 +00:00
Frank Zago b3a3cabd5b Moved the starting ressources into a json file. 2011-08-20 02:53:57 +00:00
Frank Zago 3519cca2c9 Moved the spell sounds into a json file. 2011-08-20 01:57:03 +00:00
Frank Zago cf1d179acf Store battle fields sounds in a json file instead of a text file. 2011-08-20 01:15:37 +00:00
Frank Zago f6c39eed0c Added a new json constructor to read from a file. 2011-08-20 01:04:59 +00:00
Frank Zago c1ffe738f0 Load sound file from 2nd CD. 2011-08-07 21:37:07 +00:00
Frank Zago 2cc80e1267 Modified CMediaHandler to handle more than one file. 2011-08-07 19:14:46 +00:00
Frank Zago 56bf3dc8ab Replaced io_service()) with get_io_service(). Fixes bug #780. 2011-08-04 23:49:32 +00:00
Frank Zago 18a376696d Support for newwer libavformat API. Patch from exine, bug #779. 2011-08-04 22:12:53 +00:00
Frank Zago 5eab8339d0 Someone likes to put semicolons in the wrong places. Fixed. 2011-07-28 00:38:19 +00:00
Frank Zago 20574dea3d Added missing initializations. 2011-07-21 02:39:37 +00:00
Frank Zago 9c3a10b2c7 Fixed a bug in phoenix code. Fixed a couple warnings. 2011-07-09 22:42:39 +00:00
Frank Zago 7c9c939675 (linux) autoconf update for the new scripting directory. 2011-06-21 02:35:23 +00:00
Frank Zago f99d0bf966 (linux) autoconf update for the new scripting directory. 2011-06-21 02:34:11 +00:00
Frank Zago 129c9d521e Warning fixes + typo. 2011-06-18 23:56:48 +00:00
Frank Zago 4b7d0f3092 Partial integration of Android patches, from Pelya. 2011-06-15 02:15:05 +00:00
Frank Zago 14efb9fd13 Warning fix. 2011-06-15 01:36:36 +00:00
Frank Zago 415b142522 (linux) configure fix. 2011-06-15 01:35:25 +00:00
Frank Zago b471c10149 Compile fix, from Pelya. 2011-06-14 13:22:00 +00:00
Frank Zago eecb470e74 Fixed all warnings "take address of temporary". 2011-06-11 04:54:41 +00:00
Frank Zago 78b5e11b93 Compile fix. 2011-06-10 12:49:31 +00:00
Frank Zago bf9f0beb01 (linux) configure fixes. 2011-06-09 23:41:52 +00:00
Frank Zago f9a5cf430f (linux) set LIBS and CFLAGS before testing for sdl and ffmpeg presence. 2011-06-07 03:10:37 +00:00
Frank Zago aca118b613 Fixed creature bonus parser. Fixed several uninitialized variables. Updated data build script to v0.85. 2011-06-03 03:23:50 +00:00
Frank Zago 4d699d735c Added test for presence of the SDL headers. 2011-06-02 01:26:56 +00:00
Frank Zago ff49b852df Silenced several "warning: suggest parentheses around ‘&&’ within ‘||’": added some parenthesis, optimized a couple statments and fix a bug in another. 2011-05-30 19:20:14 +00:00
Frank Zago b11981293f Compile fix. 2011-05-28 05:09:06 +00:00
Frank Zago 4af4f0a707 Compile and warning fixes. 2011-05-27 22:34:58 +00:00
Frank Zago abc0d3537e Some compile fixes. 2011-05-27 13:49:18 +00:00