diff options
Diffstat (limited to 'src/hexen')
| -rw-r--r-- | src/hexen/h2_main.c | 19 | ||||
| -rw-r--r-- | src/hexen/p_map.c | 2 | ||||
| -rw-r--r-- | src/hexen/p_maputl.c | 2 | ||||
| -rw-r--r-- | src/hexen/p_spec.c | 2 |
4 files changed, 13 insertions, 12 deletions
diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c index 62cd3d38..c907d29c 100644 --- a/src/hexen/h2_main.c +++ b/src/hexen/h2_main.c @@ -150,14 +150,15 @@ void D_BindVariables(void) key_multi_msgplayer[6] = CT_KEY_PLAYER7; key_multi_msgplayer[7] = CT_KEY_PLAYER8; - M_BindVariable("graphical_startup", &graphical_startup); - M_BindVariable("mouse_sensitivity", &mouseSensitivity); - M_BindVariable("sfx_volume", &snd_MaxVolume); - M_BindVariable("music_volume", &snd_MusicVolume); - M_BindVariable("messageson", &messageson); - M_BindVariable("screenblocks", &screenblocks); - M_BindVariable("snd_channels", &snd_Channels); - M_BindVariable("savedir", &SavePath); + M_BindIntVariable("graphical_startup", &graphical_startup); + M_BindIntVariable("mouse_sensitivity", &mouseSensitivity); + M_BindIntVariable("sfx_volume", &snd_MaxVolume); + M_BindIntVariable("music_volume", &snd_MusicVolume); + M_BindIntVariable("messageson", &messageson); + M_BindIntVariable("screenblocks", &screenblocks); + M_BindIntVariable("snd_channels", &snd_Channels); + + M_BindStringVariable("savedir", &SavePath); // Multiplayer chat macros @@ -166,7 +167,7 @@ void D_BindVariables(void) char buf[12]; M_snprintf(buf, sizeof(buf), "chatmacro%i", i); - M_BindVariable(buf, &chat_macros[i]); + M_BindStringVariable(buf, &chat_macros[i]); } } diff --git a/src/hexen/p_map.c b/src/hexen/p_map.c index 11aa23e0..b1c542ca 100644 --- a/src/hexen/p_map.c +++ b/src/hexen/p_map.c @@ -661,7 +661,7 @@ boolean PIT_CheckThing(mobj_t * thing) // Check for special thing if (thing->flags & MF_SPECIAL) { - solid = thing->flags & MF_SOLID; + solid = (thing->flags & MF_SOLID) != 0; if (tmflags & MF_PICKUP) { // Can be picked up by tmthing P_TouchSpecialThing(thing, tmthing); // Can remove thing diff --git a/src/hexen/p_maputl.c b/src/hexen/p_maputl.c index a48ea8fa..dcc7d5d2 100644 --- a/src/hexen/p_maputl.c +++ b/src/hexen/p_maputl.c @@ -699,7 +699,7 @@ boolean P_PathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2, int mapx, mapy, mapxstep, mapystep; int count; - earlyout = flags & PT_EARLYOUT; + earlyout = (flags & PT_EARLYOUT) != 0; validcount++; intercept_p = intercepts; diff --git a/src/hexen/p_spec.c b/src/hexen/p_spec.c index e2069fb9..d36d3e86 100644 --- a/src/hexen/p_spec.c +++ b/src/hexen/p_spec.c @@ -864,7 +864,7 @@ boolean P_ActivateLine(line_t * line, mobj_t * mo, int side, if (line->flags & ML_SECRET) return false; // never open secret doors } - repeat = line->flags & ML_REPEAT_SPECIAL; + repeat = (line->flags & ML_REPEAT_SPECIAL) != 0; buttonSuccess = false; // Construct args[] array to contain the arguments from the line, as we |