comparison src/town_cmd.cpp @ 10480:649ba332458f draft

(svn r14735) -Codechange: remove a bit of bit-waste in the map array (without changing the map array) and make the CompanyIDs contiguous. -Note: 15 should be enough for now... making it any more means adding more bytes to the map array and thus wasting more bits instead of reducing the bit waste.
author rubidium <rubidium@openttd.org>
date Wed, 24 Dec 2008 09:53:15 +0000
parents d352cf399eb7
children 75d47d3e0644
comparison
equal deleted inserted replaced
10479:605b63342569 10480:649ba332458f
2680 SLE_VAR(Town, townnametype, SLE_UINT16), 2680 SLE_VAR(Town, townnametype, SLE_UINT16),
2681 SLE_VAR(Town, townnameparts, SLE_UINT32), 2681 SLE_VAR(Town, townnameparts, SLE_UINT32),
2682 SLE_CONDSTR(Town, name, SLE_STR, 0, 84, SL_MAX_VERSION), 2682 SLE_CONDSTR(Town, name, SLE_STR, 0, 84, SL_MAX_VERSION),
2683 2683
2684 SLE_VAR(Town, flags12, SLE_UINT8), 2684 SLE_VAR(Town, flags12, SLE_UINT8),
2685 SLE_VAR(Town, statues, SLE_UINT8), 2685 SLE_CONDVAR(Town, statues, SLE_FILE_U8 | SLE_VAR_U16, 0, 103),
2686 SLE_CONDVAR(Town, statues, SLE_UINT16, 104, SL_MAX_VERSION),
2686 2687
2687 SLE_CONDNULL(1, 0, 1), ///< sort_index, no longer in use 2688 SLE_CONDNULL(1, 0, 1), ///< sort_index, no longer in use
2688 2689
2689 SLE_VAR(Town, have_ratings, SLE_UINT8), 2690 SLE_CONDVAR(Town, have_ratings, SLE_FILE_U8 | SLE_VAR_U16, 0, 103),
2690 SLE_ARR(Town, ratings, SLE_INT16, 8), 2691 SLE_CONDVAR(Town, have_ratings, SLE_UINT16, 104, SL_MAX_VERSION),
2692 SLE_CONDARR(Town, ratings, SLE_INT16, 8, 0, 103),
2693 SLE_CONDARR(Town, ratings, SLE_INT16, MAX_COMPANIES, 104, SL_MAX_VERSION),
2691 /* failed bribe attempts are stored since savegame format 4 */ 2694 /* failed bribe attempts are stored since savegame format 4 */
2692 SLE_CONDARR(Town, unwanted, SLE_INT8, 8, 4, SL_MAX_VERSION), 2695 SLE_CONDARR(Town, unwanted, SLE_INT8, 8, 4, 103),
2696 SLE_CONDARR(Town, unwanted, SLE_INT8, MAX_COMPANIES, 104, SL_MAX_VERSION),
2693 2697
2694 SLE_CONDVAR(Town, max_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), 2698 SLE_CONDVAR(Town, max_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8),
2695 SLE_CONDVAR(Town, max_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), 2699 SLE_CONDVAR(Town, max_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8),
2696 SLE_CONDVAR(Town, new_max_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), 2700 SLE_CONDVAR(Town, new_max_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8),
2697 SLE_CONDVAR(Town, new_max_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8), 2701 SLE_CONDVAR(Town, new_max_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8),