summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Rice2008-02-05 05:34:07 +0000
committerRussell Rice2008-02-05 05:34:07 +0000
commitbfe674a83e58257519257bec75f223f6c6f9c0e9 (patch)
tree0d799d57ddfede055c455b19b90f15cc232fcc1e
parent4fdfcb2818edbb4006bf33db71753828fddd2118 (diff)
downloadchocolate-doom-bfe674a83e58257519257bec75f223f6c6f9c0e9.tar.gz
chocolate-doom-bfe674a83e58257519257bec75f223f6c6f9c0e9.tar.bz2
chocolate-doom-bfe674a83e58257519257bec75f223f6c6f9c0e9.zip
fix a few warnings
Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1045
-rw-r--r--src/d_iwad.c2
-rw-r--r--src/i_scale.c12
2 files changed, 13 insertions, 1 deletions
diff --git a/src/d_iwad.c b/src/d_iwad.c
index 64f40b7d..fa25f9b0 100644
--- a/src/d_iwad.c
+++ b/src/d_iwad.c
@@ -276,7 +276,7 @@ static void CheckSteamEdition(void)
{
char *install_path;
char *subpath;
- int i;
+ size_t i;
install_path = GetRegistryString(&steam_install_location);
diff --git a/src/i_scale.c b/src/i_scale.c
index 67611e8e..864b1de0 100644
--- a/src/i_scale.c
+++ b/src/i_scale.c
@@ -97,6 +97,7 @@ screen_mode_t mode_scale_1x = {
SCREENWIDTH, SCREENHEIGHT,
NULL,
I_Scale1x,
+ false,
};
// 2x scale (640x400)
@@ -137,6 +138,7 @@ screen_mode_t mode_scale_2x = {
SCREENWIDTH * 2, SCREENHEIGHT * 2,
NULL,
I_Scale2x,
+ false,
};
// 3x scale (960x600)
@@ -181,6 +183,7 @@ screen_mode_t mode_scale_3x = {
SCREENWIDTH * 3, SCREENHEIGHT * 3,
NULL,
I_Scale3x,
+ false,
};
// 4x scale (1280x800)
@@ -229,6 +232,7 @@ screen_mode_t mode_scale_4x = {
SCREENWIDTH * 4, SCREENHEIGHT * 4,
NULL,
I_Scale4x,
+ false,
};
// 5x scale (1600x1000)
@@ -281,6 +285,7 @@ screen_mode_t mode_scale_5x = {
SCREENWIDTH * 5, SCREENHEIGHT * 5,
NULL,
I_Scale5x,
+ false,
};
@@ -573,6 +578,7 @@ screen_mode_t mode_stretch_2x = {
SCREENWIDTH * 2, SCREENHEIGHT_4_3 * 2,
I_InitStretchTables,
I_Stretch2x,
+ false,
};
static inline void WriteLine3x(byte *dest, byte *src)
@@ -711,6 +717,7 @@ screen_mode_t mode_stretch_3x = {
SCREENWIDTH * 3, SCREENHEIGHT_4_3 * 3,
I_InitStretchTables,
I_Stretch3x,
+ false,
};
static inline void WriteLine4x(byte *dest, byte *src)
@@ -875,6 +882,7 @@ screen_mode_t mode_stretch_4x = {
SCREENWIDTH * 4, SCREENHEIGHT_4_3 * 4,
I_InitStretchTables,
I_Stretch4x,
+ false,
};
static inline void WriteLine5x(byte *dest, byte *src)
@@ -949,6 +957,7 @@ screen_mode_t mode_stretch_5x = {
SCREENWIDTH * 5, SCREENHEIGHT_4_3 * 5,
I_InitStretchTables,
I_Stretch5x,
+ false,
};
//
@@ -1210,6 +1219,7 @@ screen_mode_t mode_squash_3x = {
800, 600,
I_InitSquashTable,
I_Squash3x,
+ false,
};
#define DRAW_PIXEL4 \
@@ -1320,6 +1330,7 @@ screen_mode_t mode_squash_4x = {
SCREENWIDTH_4_3 * 4, SCREENHEIGHT * 4,
I_InitStretchTables,
I_Squash4x,
+ false,
};
#define DRAW_PIXEL5 \
@@ -1384,6 +1395,7 @@ screen_mode_t mode_squash_5x = {
SCREENWIDTH_4_3 * 5, SCREENHEIGHT * 5,
I_InitStretchTables,
I_Squash5x,
+ false,
};