zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 13:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- make ang and horiz optional on each game's warptocoords CCMD as suggested in commentary for 1dc6edfa56.

Browse source
This commit is contained in:
Mitchell Richters 2020-08-04 22:33:17 +10:00
parent 8817914744
commit b9eef9c6a3
4 changed files with 51 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/blood/src/osdcmd.cpp
View file

@ -194,7 +194,7 @@ static int osdcmd_levelwarp(CCmdFuncPtr parm)
static int osdcmd_warptocoords(CCmdFuncPtr parm) static int osdcmd_warptocoords(CCmdFuncPtr parm)
{ {
if (parm->numparms != 5) if (parm->numparms < 3 || parm->numparms > 5)
return CCMD_SHOWHELP; return CCMD_SHOWHELP;
PLAYER *pPlayer = &gPlayer[myconnectindex]; PLAYER *pPlayer = &gPlayer[myconnectindex];
@ -202,9 +202,18 @@ static int osdcmd_warptocoords(CCmdFuncPtr parm)
pPlayer->pSprite->x = gView->pSprite->x = atoi(parm->parms[0]); pPlayer->pSprite->x = gView->pSprite->x = atoi(parm->parms[0]);
pPlayer->pSprite->y = gView->pSprite->y = atoi(parm->parms[1]); pPlayer->pSprite->y = gView->pSprite->y = atoi(parm->parms[1]);
pPlayer->zView = gView->zView = atoi(parm->parms[2]); pPlayer->zView = gView->zView = atoi(parm->parms[2]);
pPlayer->q16ang = gView->q16ang = fix16_from_int(atoi(parm->parms[3]));
pPlayer->q16horiz = gView->q16horiz = fix16_from_int(atoi(parm->parms[4])); if (parm->numparms == 4)
gViewAngle = fix16_from_dbl(atan2(atoi(parm->parms[4]), 100) * (1024. / pi::pi())); {
pPlayer->q16ang = gView->q16ang = fix16_from_int(atoi(parm->parms[3]));
}
if (parm->numparms == 5)
{
// fix me, I'm broken.
pPlayer->q16horiz = gView->q16horiz = fix16_from_int(atoi(parm->parms[4]));
gViewAngle = fix16_from_dbl(atan2(atoi(parm->parms[4]), 100) * (1024. / pi::pi()));
}
viewBackupView(pPlayer->nPlayer); viewBackupView(pPlayer->nPlayer);
@ -221,7 +230,7 @@ int32_t registerosdcommands(void)
C_RegisterFunction("levelwarp","levelwarp <e> <m>: warp to episode 'e' and map 'm'", osdcmd_levelwarp); C_RegisterFunction("levelwarp","levelwarp <e> <m>: warp to episode 'e' and map 'm'", osdcmd_levelwarp);
C_RegisterFunction("warptocoords","warptocoords [x] [y] [z] [ang] [horiz]: warps the player to the specified coordinates",osdcmd_warptocoords); C_RegisterFunction("warptocoords","warptocoords [x] [y] [z] [ang] (optional) [horiz] (optional): warps the player to the specified coordinates",osdcmd_warptocoords);
return 0; return 0;
} }

15
source/exhumed/src/osdcmds.cpp
View file

@ -125,7 +125,7 @@ static int osdcmd_changelevel(CCmdFuncPtr parm)
static int osdcmd_warptocoords(CCmdFuncPtr parm) static int osdcmd_warptocoords(CCmdFuncPtr parm)
{ {
if (parm->numparms != 5) if (parm->numparms < 3 || parm->numparms > 5)
return CCMD_SHOWHELP; return CCMD_SHOWHELP;
Player *nPlayer = &PlayerList[nLocalPlayer]; Player *nPlayer = &PlayerList[nLocalPlayer];
@ -135,8 +135,15 @@ static int osdcmd_warptocoords(CCmdFuncPtr parm)
nPlayer->opos.y = pSprite->y = atoi(parm->parms[1]); nPlayer->opos.y = pSprite->y = atoi(parm->parms[1]);
nPlayer->opos.z = pSprite->z = atoi(parm->parms[2]); nPlayer->opos.z = pSprite->z = atoi(parm->parms[2]);
nPlayer->q16angle = fix16_from_int(atoi(parm->parms[3])); if (parm->numparms == 4)
nPlayer->q16horiz = fix16_from_int(atoi(parm->parms[4])); {
nPlayer->q16angle = fix16_from_int(atoi(parm->parms[3]));
}
if (parm->numparms == 5)
{
nPlayer->q16horiz = fix16_from_int(atoi(parm->parms[4]));
}
return CCMD_OK; return CCMD_OK;
} }
@ -162,7 +169,7 @@ int32_t registerosdcommands(void)
//C_RegisterFunction("spawn","spawn <picnum> [palnum] [cstat] [ang] [x y z]: spawns a sprite with the given properties",osdcmd_spawn); //C_RegisterFunction("spawn","spawn <picnum> [palnum] [cstat] [ang] [x y z]: spawns a sprite with the given properties",osdcmd_spawn);
C_RegisterFunction("warptocoords","warptocoords [x] [y] [z] [ang] [horiz]: warps the player to the specified coordinates",osdcmd_warptocoords); C_RegisterFunction("warptocoords","warptocoords [x] [y] [z] [ang] (optional) [horiz] (optional): warps the player to the specified coordinates",osdcmd_warptocoords);
return 0; return 0;
} }

22
source/games/duke/src/ccmds.cpp
View file

@ -263,16 +263,24 @@ static int ccmd_give(CCmdFuncPtr parm)
static int osdcmd_warptocoords(CCmdFuncPtr parm) static int osdcmd_warptocoords(CCmdFuncPtr parm)
{ {
if (parm->numparms != 5) if (parm->numparms < 3 || parm->numparms > 5)
return CCMD_SHOWHELP; return CCMD_SHOWHELP;
player_struct* p = &ps[myconnectindex]; player_struct* p = &ps[myconnectindex];
p->oposx = p->posx = atoi(parm->parms[0]); p->oposx = p->posx = atoi(parm->parms[0]);
p->oposy = p->posy = atoi(parm->parms[1]); p->oposy = p->posy = atoi(parm->parms[1]);
p->oposz = p->posz = atoi(parm->parms[2]); p->oposz = p->posz = atoi(parm->parms[2]);
p->oq16ang = p->q16ang = fix16_from_int(atoi(parm->parms[3]));
p->oq16horiz = p->q16horiz = fix16_from_int(atoi(parm->parms[4])); if (parm->numparms == 4)
{
p->oq16ang = p->q16ang = fix16_from_int(atoi(parm->parms[3]));
}
if (parm->numparms == 5)
{
p->oq16horiz = p->q16horiz = fix16_from_int(atoi(parm->parms[4]));
}
return CCMD_OK; return CCMD_OK;
} }
@ -292,7 +300,7 @@ int registerosdcommands(void)
C_RegisterFunction("spawn","spawn <picnum> [palnum] [cstat] [ang] [x y z]: spawns a sprite with the given properties",ccmd_spawn); C_RegisterFunction("spawn","spawn <picnum> [palnum] [cstat] [ang] [x y z]: spawns a sprite with the given properties",ccmd_spawn);
C_RegisterFunction("warptocoords","warptocoords [x] [y] [z] [ang] [horiz]: warps the player to the specified coordinates",osdcmd_warptocoords); C_RegisterFunction("warptocoords","warptocoords [x] [y] [z] [ang] (optional) [horiz] (optional): warps the player to the specified coordinates",osdcmd_warptocoords);
return 0; return 0;
} }

15
source/sw/src/osdcmds.cpp
View file

@ -278,15 +278,22 @@ static int osdcmd_give(CCmdFuncPtr parm)
static int osdcmd_warptocoords(CCmdFuncPtr parm) static int osdcmd_warptocoords(CCmdFuncPtr parm)
{ {
if (parm->numparms != 5) if (parm->numparms < 3 || parm->numparms > 5)
return CCMD_SHOWHELP; return CCMD_SHOWHELP;
Player->oposx = Player->posx = atoi(parm->parms[0]); Player->oposx = Player->posx = atoi(parm->parms[0]);
Player->oposy = Player->posy = atoi(parm->parms[1]); Player->oposy = Player->posy = atoi(parm->parms[1]);
Player->oposz = Player->posz = atoi(parm->parms[2]); Player->oposz = Player->posz = atoi(parm->parms[2]);
Player->oq16ang = Player->q16ang = Player->camq16ang = fix16_from_int(atoi(parm->parms[3])); if (parm->numparms == 4)
Player->oq16horiz = Player->q16horiz = Player->camq16horiz = fix16_from_int(atoi(parm->parms[4])); {
Player->oq16ang = Player->q16ang = Player->camq16ang = fix16_from_int(atoi(parm->parms[3]));
}
if (parm->numparms == 5)
{
Player->oq16horiz = Player->q16horiz = Player->camq16horiz = fix16_from_int(atoi(parm->parms[4]));
}
return CCMD_OK; return CCMD_OK;
} }
@ -306,7 +313,7 @@ int32_t registerosdcommands(void)
// C_RegisterFunction("spawn","spawn <picnum> [palnum] [cstat] [ang] [x y z]: spawns a sprite with the given properties",osdcmd_spawn); // C_RegisterFunction("spawn","spawn <picnum> [palnum] [cstat] [ang] [x y z]: spawns a sprite with the given properties",osdcmd_spawn);
C_RegisterFunction("warptocoords","warptocoords [x] [y] [z] [ang] [horiz]: warps the player to the specified coordinates",osdcmd_warptocoords); C_RegisterFunction("warptocoords","warptocoords [x] [y] [z] [ang] (optional) [horiz] (optional): warps the player to the specified coordinates",osdcmd_warptocoords);
return 0; return 0;
} }