From 69a8d40796e3f42add2c35206c30e92cc448ccc5 Mon Sep 17 00:00:00 2001 From: danij Date: Sun, 22 Apr 2012 23:04:59 +0100 Subject: [PATCH] All Games|Fixed: Automap "follow on/off" messages were reversed --- doomsday/plugins/jdoom/src/st_stuff.c | 8 ++++---- doomsday/plugins/jdoom64/src/st_stuff.c | 8 ++++---- doomsday/plugins/jheretic/src/st_stuff.c | 8 ++++---- doomsday/plugins/jhexen/src/st_stuff.c | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doomsday/plugins/jdoom/src/st_stuff.c b/doomsday/plugins/jdoom/src/st_stuff.c index 128f805b1a..e0076cf50c 100644 --- a/doomsday/plugins/jdoom/src/st_stuff.c +++ b/doomsday/plugins/jdoom/src/st_stuff.c @@ -3277,11 +3277,11 @@ void ST_SetAutomapCameraRotation(int player, boolean on) void ST_ToggleAutomapPanMode(int player) { - uiwidget_t* obj = ST_UIAutomapForPlayer(player); - if(!obj) return; - if(UIAutomap_SetPanMode(obj, !UIAutomap_PanMode(obj))) + uiwidget_t* ob = ST_UIAutomapForPlayer(player); + if(!ob) return; + if(UIAutomap_SetPanMode(ob, !UIAutomap_PanMode(ob))) { - P_SetMessage(&players[player], (UIAutomap_PanMode(obj)? AMSTR_FOLLOWON : AMSTR_FOLLOWOFF), true); + P_SetMessage(&players[player], (UIAutomap_PanMode(ob)? AMSTR_FOLLOWOFF : AMSTR_FOLLOWON), true); } } diff --git a/doomsday/plugins/jdoom64/src/st_stuff.c b/doomsday/plugins/jdoom64/src/st_stuff.c index d38af302e1..3abe1dd782 100644 --- a/doomsday/plugins/jdoom64/src/st_stuff.c +++ b/doomsday/plugins/jdoom64/src/st_stuff.c @@ -1057,11 +1057,11 @@ void ST_SetAutomapCameraRotation(int player, boolean on) void ST_ToggleAutomapPanMode(int player) { - uiwidget_t* obj = ST_UIAutomapForPlayer(player); - if(!obj) return; - if(UIAutomap_SetPanMode(obj, !UIAutomap_PanMode(obj))) + uiwidget_t* ob = ST_UIAutomapForPlayer(player); + if(!ob) return; + if(UIAutomap_SetPanMode(ob, !UIAutomap_PanMode(ob))) { - P_SetMessage(&players[player], (UIAutomap_PanMode(obj)? AMSTR_FOLLOWON : AMSTR_FOLLOWOFF), true); + P_SetMessage(&players[player], (UIAutomap_PanMode(ob)? AMSTR_FOLLOWOFF : AMSTR_FOLLOWON), true); } } diff --git a/doomsday/plugins/jheretic/src/st_stuff.c b/doomsday/plugins/jheretic/src/st_stuff.c index fdea66bb87..b18646caea 100644 --- a/doomsday/plugins/jheretic/src/st_stuff.c +++ b/doomsday/plugins/jheretic/src/st_stuff.c @@ -3089,11 +3089,11 @@ void ST_SetAutomapCameraRotation(int player, boolean on) void ST_ToggleAutomapPanMode(int player) { - uiwidget_t* obj = ST_UIAutomapForPlayer(player); - if(!obj) return; - if(UIAutomap_SetPanMode(obj, !UIAutomap_PanMode(obj))) + uiwidget_t* ob = ST_UIAutomapForPlayer(player); + if(!ob) return; + if(UIAutomap_SetPanMode(ob, !UIAutomap_PanMode(ob))) { - P_SetMessage(&players[player], (UIAutomap_PanMode(obj)? AMSTR_FOLLOWON : AMSTR_FOLLOWOFF), true); + P_SetMessage(&players[player], (UIAutomap_PanMode(ob)? AMSTR_FOLLOWOFF : AMSTR_FOLLOWON), true); } } diff --git a/doomsday/plugins/jhexen/src/st_stuff.c b/doomsday/plugins/jhexen/src/st_stuff.c index 53f25a9146..381dfbd529 100644 --- a/doomsday/plugins/jhexen/src/st_stuff.c +++ b/doomsday/plugins/jhexen/src/st_stuff.c @@ -3367,11 +3367,11 @@ void ST_SetAutomapCameraRotation(int player, boolean on) void ST_ToggleAutomapPanMode(int player) { - uiwidget_t* obj = ST_UIAutomapForPlayer(player); - if(!obj) return; - if(UIAutomap_SetPanMode(obj, !UIAutomap_PanMode(obj))) + uiwidget_t* ob = ST_UIAutomapForPlayer(player); + if(!ob) return; + if(UIAutomap_SetPanMode(ob, !UIAutomap_PanMode(ob))) { - P_SetMessage(&players[player], (UIAutomap_PanMode(obj)? AMSTR_FOLLOWON : AMSTR_FOLLOWOFF), true); + P_SetMessage(&players[player], (UIAutomap_PanMode(ob)? AMSTR_FOLLOWOFF : AMSTR_FOLLOWON), true); } }