Skip to content

Commit

Permalink
Removed some unnecessary function duplication I did.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Caldfir @RosaryMala
Caldfir authored and RosaryMala committed Dec 15, 2012
1 parent 3503cf2 commit 637d131
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 20 deletions.
28 changes: 14 additions & 14 deletions SpriteObjects.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ void c_sprite::set_by_xml(TiXmlElement *elemSprite)
// }
//}

void c_sprite::assemble_world_offset_src(int x, int y, int z, int plateoffset, Tile * b, Tile* src, bool chop)
void c_sprite::assemble_world_offset(int x, int y, int z, int plateoffset, Tile * b, bool chop)
{
if(defaultsheet == 0) {
defaultsheet = IMGObjectSheet;
Expand Down Expand Up @@ -682,33 +682,33 @@ void c_sprite::assemble_world_offset_src(int x, int y, int z, int plateoffset, T
goto draw_subsprite;
}
int foo = 0;
if(!(snowmin <= src->snowlevel && (snowmax == -1 || snowmax >= src->snowlevel))) {
if(!(snowmin <= b->snowlevel && (snowmax == -1 || snowmax >= b->snowlevel))) {
goto draw_subsprite;
}
if (!(bloodmin <= src->bloodlevel && (bloodmax == -1 || bloodmax >= src->bloodlevel))) {
if (!(bloodmin <= b->bloodlevel && (bloodmax == -1 || bloodmax >= b->bloodlevel))) {
goto draw_subsprite;
}
if(!(mudmin <= src->mudlevel && (mudmax == -1 || mudmax >= src->mudlevel))) {
if(!(mudmin <= b->mudlevel && (mudmax == -1 || mudmax >= b->mudlevel))) {
goto draw_subsprite;
}
if(!(grassmin <= src->grasslevel && (grassmax == -1 || grassmax >= src->grasslevel))) {
if(!(grassmin <= b->grasslevel && (grassmax == -1 || grassmax >= b->grasslevel))) {
goto draw_subsprite;
}
//only bother with this plate if it's in the light, or not.
if(!((light==LIGHTANY) || ((light==LIGHTYES) && b->designation.bits.outside) || ((light==LIGHTNO) && !(b->designation.bits.outside)))) {
goto draw_subsprite;
}
if(!((grasstype == -1) || (grasstype == src->grassmat))) {
if(!((grasstype == -1) || (grasstype == b->grassmat))) {
goto draw_subsprite;
}
if(!((grass_growth == GRASS_GROWTH_ANY) ||
((grass_growth == GRASS_GROWTH_NORMAL) &&
((src->tileMaterial() == tiletype_material::GRASS_DARK) ||
(src->tileMaterial() == tiletype_material::GRASS_LIGHT))) ||
((b->tileMaterial() == tiletype_material::GRASS_DARK) ||
(b->tileMaterial() == tiletype_material::GRASS_LIGHT))) ||
((grass_growth == GRASS_GROWTH_DRY) &&
(src->tileMaterial() == tiletype_material::GRASS_DRY)) ||
(b->tileMaterial() == tiletype_material::GRASS_DRY)) ||
((grass_growth == GRASS_GROWTH_DEAD) &&
(src->tileMaterial() == tiletype_material::GRASS_DEAD)))) {
(b->tileMaterial() == tiletype_material::GRASS_DEAD)))) {
goto draw_subsprite;
}

Expand Down Expand Up @@ -758,16 +758,16 @@ void c_sprite::assemble_world_offset_src(int x, int y, int z, int plateoffset, T
sheetx = ((sheetindex+plateoffset+randoffset) % SHEET_OBJECTSWIDE) * spritewidth;
sheety = ((sheetindex+plateoffset+randoffset) / SHEET_OBJECTSWIDE) * spriteheight;
} else if(platelayout == RAMPBOTTOMPLATE) {
sheetx = SPRITEWIDTH * src->rampindex;
sheetx = SPRITEWIDTH * b->rampindex;
sheety = ((PLATEHEIGHT + FLOORHEIGHT + SPRITEHEIGHT) * (sheetindex+plateoffset+randoffset))+(PLATEHEIGHT + FLOORHEIGHT);
} else if(platelayout == RAMPTOPPLATE) {
sheetx = SPRITEWIDTH * src->rampindex;
sheetx = SPRITEWIDTH * b->rampindex;
sheety = (PLATEHEIGHT + FLOORHEIGHT + SPRITEHEIGHT) * (sheetindex+plateoffset+randoffset);
} else {
sheetx = ((sheetindex+plateoffset+randoffset) % SHEET_OBJECTSWIDE) * spritewidth;
sheety = ((sheetindex+plateoffset+randoffset) / SHEET_OBJECTSWIDE) * spriteheight;
}
ALLEGRO_COLOR shade_color = shadeAdventureMode(get_color(src), b->fog_of_war, b->designation.bits.outside);
ALLEGRO_COLOR shade_color = shadeAdventureMode(get_color(b), b->fog_of_war, b->designation.bits.outside);
if(chop && ( halftile == HALFPLATECHOP)) {
if(fileindex < 0) {
if(shade_color.a > 0.001f)
Expand Down Expand Up @@ -889,7 +889,7 @@ void c_sprite::assemble_world_offset_src(int x, int y, int z, int plateoffset, T
draw_subsprite:
if(!subsprites.empty()) {
for(int i = 0; i < subsprites.size(); i++) {
subsprites.at(i).assemble_world_offset_src(x, y, z, plateoffset, b, src, chop);
subsprites.at(i).assemble_world_offset(x, y, z, plateoffset, b, chop);
}
}
}
Expand Down
7 changes: 2 additions & 5 deletions SpriteObjects.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,11 @@ class c_sprite
c_sprite(void);
~c_sprite(void);
//void draw_screen(int x, int y);
void assemble_world_offset_src(int x, int y, int z, int plateoffset, Tile * b, Tile* src, bool chop = false);
inline void assemble_world(int x, int y, int z, Tile * b, bool chop=false)
{
assemble_world_offset_src(x, y, z, 0, b, b, chop);
}
inline void assemble_world_offset(int x, int y, int z, int plateoffset, Tile * b, bool chop=false){
assemble_world_offset_src(x, y, z, plateoffset, b, b, chop);
assemble_world_offset(x, y, z, 0, b, chop);
}
void assemble_world_offset(int x, int y, int z, int plateoffset, Tile * b, bool chop=false);
void assemble_world_ramp_bottom(int x, int y, int z, bool chop = false);
void set_by_xml(TiXmlElement* elemSprite, int32_t fileindex);
void set_by_xml(TiXmlElement* elemSprite);
Expand Down
2 changes: 1 addition & 1 deletion Tile.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ void Tile::AssembleTile()
spriteobject->set_size(SPRITEWIDTH, PLATEHEIGHT);
spriteobject->set_plate_layout(RAMPTOPPLATE);
spriteobject->set_offset(0, WALLHEIGHT);
spriteobject->assemble_world_offset_src(x, y, z, 0, this, b, (chopThisTile && this->z == ownerSegment->pos.z + ownerSegment->size.z -2));
spriteobject->assemble_world_offset(x, y, z, 0, b, (chopThisTile && this->z == ownerSegment->pos.z + ownerSegment->size.z -2));
spriteobject->set_offset(0, 0);
}
spriteobject->set_plate_layout(TILEPLATE);
Expand Down

0 comments on commit 637d131

Please sign in to comment.