From 3e44d850b385b8a7d819da73e3a5db43fbb6098a Mon Sep 17 00:00:00 2001 From: Mitchell Richters Date: Tue, 4 Aug 2020 18:04:44 +1000 Subject: [PATCH] - fix issues with Exhumed and SW `warptocoords` CCMDs when cherry-picking from public branch. --- source/exhumed/src/osdcmds.cpp | 4 ++-- source/sw/src/osdcmds.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/exhumed/src/osdcmds.cpp b/source/exhumed/src/osdcmds.cpp index d0213110c..c6d95ee9b 100644 --- a/source/exhumed/src/osdcmds.cpp +++ b/source/exhumed/src/osdcmds.cpp @@ -126,7 +126,7 @@ static int osdcmd_changelevel(CCmdFuncPtr parm) static int osdcmd_warptocoords(CCmdFuncPtr parm) { if (parm->numparms != 5) - return OSDCMD_SHOWHELP; + return CCMD_SHOWHELP; Player *nPlayer = &PlayerList[nLocalPlayer]; spritetype *pSprite = &sprite[nPlayer->nSprite]; @@ -138,7 +138,7 @@ static int osdcmd_warptocoords(CCmdFuncPtr parm) nPlayer->q16angle = fix16_from_int(atoi(parm->parms[3])); nPlayer->q16horiz = fix16_from_int(atoi(parm->parms[4])); - return OSDCMD_OK; + return CCMD_OK; } int32_t registerosdcommands(void) diff --git a/source/sw/src/osdcmds.cpp b/source/sw/src/osdcmds.cpp index 24714f210..94f546901 100644 --- a/source/sw/src/osdcmds.cpp +++ b/source/sw/src/osdcmds.cpp @@ -279,7 +279,7 @@ static int osdcmd_give(CCmdFuncPtr parm) static int osdcmd_warptocoords(CCmdFuncPtr parm) { if (parm->numparms != 5) - return OSDCMD_SHOWHELP; + return CCMD_SHOWHELP; Player->oposx = Player->posx = atoi(parm->parms[0]); Player->oposy = Player->posy = atoi(parm->parms[1]); @@ -288,7 +288,7 @@ static int osdcmd_warptocoords(CCmdFuncPtr parm) Player->oq16ang = Player->q16ang = Player->camq16ang = fix16_from_int(atoi(parm->parms[3])); Player->oq16horiz = Player->q16horiz = Player->camq16horiz = fix16_from_int(atoi(parm->parms[4])); - return OSDCMD_OK; + return CCMD_OK; } int32_t registerosdcommands(void)