openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Numerous changes to terrain and trim. The changes to the scneario editor work as expected.

Browse Source 
- New way of drawing walkway (doesn't work yet)
- New way of drawing roads (doesn't yet work correctly)
- New way of drawing trim (not tested yet)
- New way of handling marked specials (works in editor but not in game)
- New way of handling two-space rubble in the editor (works as expected)
- Merged several terrain special properties
- Deprecated several terrain graphics
- Completed (probably) the import & convert code for old-format terrain
- Probably other things that I have forgotten that have something to do with terrain
- A few other little things, bugfixes, etc

git-svn-id: http://openexile.googlecode.com/svn/trunk@56 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Celtic Minstrel
2009-05-09 14:11:39 +00:00
parent 7bc95dc7c8
commit 28f4368651
38 changed files with 1435 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
osx/boe.locutils.cpp
View File

@@ -77,20 +77,20 @@ short set_direction (location old_pt, location new_pt)
{
if (old_pt.x == new_pt.x)
if (old_pt.y > new_pt.y)
return 0;
else return 4;
return DIR_N;
else return DIR_S;
if (old_pt.x > new_pt.x) {
if (old_pt.y > new_pt.y)
return 7;
return DIR_NW;
if (old_pt.y < new_pt.y)
return 5;
return 6;
}
return DIR_SW;
return DIR_W;
}
if (old_pt.y > new_pt.y)
return 1;
return DIR_NE;
if (old_pt.y < new_pt.y)
return 3;
return 2;
return DIR_SE;
return DIR_E;
}
location global_to_local(location global)
@@ -322,7 +322,7 @@ bool is_container(location loc)
if ((univ.town.is_barrel(loc.x,loc.y)) || (univ.town.is_crate(loc.x,loc.y)))
return true;
ter = coord_to_ter(loc.x,loc.y);
if (scenario.ter_types[ter].special == 14)
if (scenario.ter_types[ter].special == TER_SPEC_IS_A_CONTAINER)
return true;
return false;
}
@@ -393,10 +393,10 @@ bool is_blocked(location to_check)
}
// Keep away from marked specials during combat
if ((is_combat()) && (gr <= 212) && (gr >= 207))
if ((is_combat()) && univ.town.is_spot(to_check.x, to_check.y))
return true;
if ((is_combat()) && (gr == 406))
return true;
return true; // TODO: Replace gr == 406 with a blockage == clear/special && is_special() check
// Party there?
if (is_town())
@@ -755,8 +755,7 @@ void alter_space(short i,short j,unsigned char ter)
else {
univ.town->terrain(i,j) = ter;
combat_terrain[i][j] = ter;
if ((scenario.ter_types[univ.town->terrain(i,j)].special >= 16) &&
(scenario.ter_types[univ.town->terrain(i,j)].special <= 19))
belt_present = true;
if (scenario.ter_types[univ.town->terrain(i,j)].special == TER_SPEC_CONVEYOR)
belt_present = true;
}
}