dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'extra_large_maps' into extra_large_maps-sx

Browse Source 
Conflicts:
	src/genworld_gui.cpp
	src/map_type.h
	src/newgrf_debug_gui.cpp
This commit is contained in:
Jonathan G Rennison
2015-09-11 22:39:01 +01:00
parent 86dea90c4f 7d2b4bd3ea
commit 5d222e4d5e
6 changed files with 104 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/newgrf_debug_gui.cpp
View File

@@ -56,7 +56,7 @@ NewGrfDebugSpritePicker _newgrf_debug_sprite_picker = { SPM_NONE, NULL, 0, Small
*/
static inline uint GetFeatureIndex(uint window_number)
{
return GB(window_number, 0, 24);
return GB(window_number, 0, 27);
}
/**
@@ -68,8 +68,8 @@ static inline uint GetFeatureIndex(uint window_number)
*/
static inline uint GetInspectWindowNumber(GrfSpecFeature feature, uint index)
{
assert((index >> 24) == 0);
return (feature << 24) | index;
assert((index >> 27) == 0);
return (feature << 27) | index;
}
/**
@@ -246,7 +246,7 @@ struct NIFeature {
*/
static inline GrfSpecFeature GetFeatureNum(uint window_number)
{
return (GrfSpecFeature)GB(window_number, 24, 8);
return (GrfSpecFeature)GB(window_number, 27, 5);
}
/**