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

- Fixed bug with damaging terrain – it would print all messages instead of the one specific to the requested damage type.

Browse Source 
- The trim and walkway are partially functional. That is, it correctly detects when to round off walls and walkways. It draws them incorrectly though.

git-svn-id: http://openexile.googlecode.com/svn/trunk@61 4ebdad44-0ea0-11de-aab3-ff745001d230
This commit is contained in:
Celtic Minstrel
2009-05-20 13:50:19 +00:00
parent bf1487114a
commit 70c7895480
5 changed files with 68 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
osx/classes/terrain.cpp
View File

@@ -96,6 +96,22 @@ cTerrain& cTerrain::operator = (legacy::terrain_type_type& old){
};
picture = old.picture;
blockage = old.blockage;
if(picture >= 260) combat_arena = 1;
else combat_arena = arenas[picture];
if(picture < 260){
ground_type = ground[picture];
trim_type = (eTrimType) trims[picture];
trim_ter = trim_ters[picture];
}else if(picture >= 400 && picture < 1000){
ground_type = ground[picture - 140];
trim_type = (eTrimType) trims[picture - 140];
trim_ter = trim_ters[picture - 140];
}else{ // TODO: Implement new-style road and walkway handling, and deprecate picture 216.
ground_type = 255;
trim_type = TRIM_NONE;
trim_ter = 0;
}
if(trim_ter == 99) trim_ter = 0;
flag1 = old.flag1;
flag2 = old.flag2;
switch(old.special){
@@ -238,22 +254,6 @@ cTerrain& cTerrain::operator = (legacy::terrain_type_type& old){
light_radius = old.light_radius;
step_sound = old.step_sound;
shortcut_key = old.shortcut_key;
if(picture >= 260) combat_arena = 1;
else combat_arena = arenas[picture];
if(picture < 260){
ground_type = ground[picture];
trim_type = (eTrimType) trims[picture];
trim_ter = trim_ters[picture];
}else if(picture >= 400 && picture < 1000){
ground_type = ground[picture - 140];
trim_type = (eTrimType) trims[picture - 140];
trim_ter = trim_ters[picture - 140];
}else{ // TODO: Implement new-style road and walkway handling, and deprecate picture 216.
ground_type = 255;
trim_type = TRIM_NONE;
trim_ter = 0;
}
if(trim_ter == 99) trim_ter = 0;
switch(picture){
// Rubbles, plus pentagram as a bonus
case 68: