summaryrefslogtreecommitdiff
path: root/src/am_map.c
diff options
context:
space:
mode:
authorSimon Howard2008-02-28 20:04:10 +0000
committerSimon Howard2008-02-28 20:04:10 +0000
commit9935860426430cae26f58c0d066c8fb72cca2c3e (patch)
tree883e1c2005434c6f7a171866f326c407184c50e8 /src/am_map.c
parentc59c78f9a84567ddb77f4f89dd359c96ba4d29f3 (diff)
downloadchocolate-doom-9935860426430cae26f58c0d066c8fb72cca2c3e.tar.gz
chocolate-doom-9935860426430cae26f58c0d066c8fb72cca2c3e.tar.bz2
chocolate-doom-9935860426430cae26f58c0d066c8fb72cca2c3e.zip
Add fixes for MSVC warnings (thanks entryway).
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1095
Diffstat (limited to 'src/am_map.c')
-rw-r--r--src/am_map.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/am_map.c b/src/am_map.c
index 30d140f8..41da0071 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -195,17 +195,17 @@ mline_t cheat_player_arrow[] = {
#define R (FRACUNIT)
mline_t triangle_guy[] = {
- { { -.867*R, -.5*R }, { .867*R, -.5*R } },
- { { .867*R, -.5*R } , { 0, R } },
- { { 0, R }, { -.867*R, -.5*R } }
+ { { (fixed_t)(-.867*R), (fixed_t)(-.5*R) }, { (fixed_t)(.867*R ), (fixed_t)(-.5*R) } },
+ { { (fixed_t)(.867*R ), (fixed_t)(-.5*R) }, { (fixed_t)(0 ), (fixed_t)(R ) } },
+ { { (fixed_t)(0 ), (fixed_t)(R ) }, { (fixed_t)(-.867*R), (fixed_t)(-.5*R) } }
};
#undef R
#define R (FRACUNIT)
mline_t thintriangle_guy[] = {
- { { -.5*R, -.7*R }, { R, 0 } },
- { { R, 0 }, { -.5*R, .7*R } },
- { { -.5*R, .7*R }, { -.5*R, -.7*R } }
+ { { (fixed_t)(-.5*R), (fixed_t)(-.7*R) }, { (fixed_t)(R ), (fixed_t)(0 ) } },
+ { { (fixed_t)(R ), (fixed_t)(0 ) }, { (fixed_t)(-.5*R), (fixed_t)(.7*R ) } },
+ { { (fixed_t)(-.5*R), (fixed_t)(.7*R ) }, { (fixed_t)(-.5*R), (fixed_t)(-.7*R) } }
};
#undef R
@@ -271,7 +271,7 @@ static fixed_t old_m_x, old_m_y;
static mpoint_t f_oldloc;
// used by MTOF to scale from map-to-frame-buffer coords
-static fixed_t scale_mtof = INITSCALEMTOF;
+static fixed_t scale_mtof = (fixed_t)INITSCALEMTOF;
// used by FTOM to scale from frame-buffer-to-map coords (=1/scale_mtof)
static fixed_t scale_ftom;