summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJapa Illo2012-03-14 08:44:40 +0100
committerJapa Illo2012-03-14 08:44:40 +0100
commit42de27ed582314bfb08fbf4ae61f6bdd8fb5fb8f (patch)
tree9c5bdedd1ed6d541e64f5770da46442e4ae9af79
parentdfae65496e4b4a591fdb8db9feda37dede714a89 (diff)
downloadstonesense-42de27ed582314bfb08fbf4ae61f6bdd8fb5fb8f.tar.gz
stonesense-42de27ed582314bfb08fbf4ae61f6bdd8fb5fb8f.tar.bz2
stonesense-42de27ed582314bfb08fbf4ae61f6bdd8fb5fb8f.tar.xz
Fixed half-wall tops bring moved wrong when zoomed.
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
-rw-r--r--GUI.cpp2
-rw-r--r--MapLoading.cpp2
-rw-r--r--SpriteObjects.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/GUI.cpp b/GUI.cpp
index 693909b..55c4817 100644
--- a/GUI.cpp
+++ b/GUI.cpp
@@ -618,7 +618,7 @@ void drawDebugCursorAndInfo(WorldSegment * segment)
}
}
}
- if(1) //just so it has it's own scope
+ //just so it has it's own scope
{
char strCreature[150] = {0};
generateCreatureDebugString( b->creature, strCreature );
diff --git a/MapLoading.cpp b/MapLoading.cpp
index d67fcdd..fad508c 100644
--- a/MapLoading.cpp
+++ b/MapLoading.cpp
@@ -288,7 +288,7 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C
//b->grassmats.push_back(grass[i].material);
}
}
- if(1)
+ if(1)// just in case we need to quickly disable it.
{
long red=0;
long green=0;
diff --git a/SpriteObjects.cpp b/SpriteObjects.cpp
index 9743666..31d7fb5 100644
--- a/SpriteObjects.cpp
+++ b/SpriteObjects.cpp
@@ -871,7 +871,7 @@ void c_sprite::draw_world_offset(int x, int y, int z, Block * b, int tileoffset,
al_draw_scaled_bitmap(IMGObjectSheet,
TILEWIDTH * SPRITEFLOOR_CUTOFF, 0,
SPRITEWIDTH, SPRITEWIDTH,
- drawx+offset_x, drawy+offset_y-((SPRITEHEIGHT-WALL_CUTOFF_HEIGHT)/2),
+ drawx+offset_x, (drawy+offset_y-((SPRITEHEIGHT-WALL_CUTOFF_HEIGHT)/2))*config.scale,
SPRITEWIDTH*config.scale, SPRITEWIDTH*config.scale, 0);
}
else if ((chop && (halftile == HALFTILEYES)) || (!chop && (halftile == HALFTILENO)) || (!chop && (halftile == HALFTILECHOP)) || (halftile == HALFTILEBOTH))