vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

build_engine.sh: iqm has been renamed to iqmtool, so adjust those basenames

Browse source
This commit is contained in:
Marco Cawthorne 2021-07-20 12:18:45 +02:00
parent 972304bf23
commit 3ef55c5e48
8 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build_engine.sh
View file

@ -89,7 +89,7 @@ cp -v ./release/fteqcc ../../../bin/fteqcc
if [ "$BUILD_IQMTOOL" -eq 1 ]; then
gmake -j $BUILD_PROC iqm-rel
cp -v ./release/iqm ../../../bin/iqm
cp -v ./release/iqmtool ../../../bin/iqmtool
fi
if [ "$BUILD_IMGTOOL" -eq 1 ]; then

2
src/client/camera.qc
View file

@ -63,7 +63,7 @@ Camera_RunBob(__inout vector camera_angle)
}
/* applies a tilt to the camera for when we're strafing left to right */
float
void
Camera_StrafeRoll(__inout vector camera_angle)
{
if (!autocvar(v_camroll, 1, "Enables strafe-roll for the first-person camera"))

6
src/client/entry.qc
View file

@ -35,6 +35,7 @@ CSQC_Init(float apilevel, string enginename, float engineversion)
registercommand("view_geomtest");
registercommand("player_geomtest");
registercommand("way_menu");
registercommand("dev_explode");
/* basic actions */
registercommand("+attack");
@ -684,6 +685,11 @@ CSQC_ConsoleCommand(string sCMD)
tokenize(sCMD);
switch (argv(0)) {
case "dev_explode":
makevectors(getproperty(VF_ANGLES));
traceline(getproperty(VF_ORIGIN), getproperty(VF_ORIGIN) + v_forward * 4096, FALSE, pSeat->m_ePlayer);
FX_Explosion(trace_endpos);
break;
case "dev_sunpos":
vector sunpos, sunang;
vector lepos, leang;

12
src/client/viewmodel.qc
View file

@ -91,20 +91,18 @@ Viewmodel_VisionsBobRun(entity gun)
vector angmod;
angmod[0] += pViewBob->m_flBob * 0.5f;
angmod[1] += pViewBob->m_flBob;
angmod[2] += pViewBob->m_flBob * 2.0f;
gun.angles += angmod * 2.0f;
angmod[2] += pViewBob->m_flBob * 2.5f;
gun.angles += angmod * 1.5f;
/* sway with speed */
sintime = sin( time * 1.5f);
sintime = sin(time);
strength = pViewBob->m_flSpeed * 0.01f;
gun.angles[0] += strength * sintime;
gun.angles[1] += strength * sintime;
gun.angles[2] += strength * sintime;
gun.origin += [0,0,-1] - (v_up * (-pViewBob->m_flBob * 0.2))
+ (v_forward * autocvar_v_gunofs[0])
+ (v_right * autocvar_v_gunofs[1])
+ (v_up * autocvar_v_gunofs[2]);
gun.origin += [0,0,-1];
}
/* bob vars are calculated separately from application, so that if there's

2
src/menu-fn/m_configuration.qc
View file

@ -136,7 +136,7 @@ menu_configuration_init(void)
cf_btnUpdate = spawn(CMainButton);
cf_btnUpdate.SetImage(BTN_UPDATE);
cf_btnUpdate.SetExecute(cf_btnupdates_start);
//cf_btnUpdate.SetExecute(cf_btnupdates_start);
cf_btnUpdate.SetPos(50,268);
Widget_Add(fn_configuration, cf_btnUpdate);

8
src/menu-fn/m_customgame.qc
View file

@ -211,10 +211,10 @@ customgame_liblist_parse(int id, string strKey, string strValue)
games[id].gamedll = strValue;
break;
case "startmap":
games[id].startmap = strValue;
games[id].startmap = strcat("map ", strValue, "\n");
break;
case "trainingmap":
games[id].trainingmap = strValue;
games[id].trainingmap = strcat("map ", strValue, "\n");
break;
/* newly added with Nuclide */
case "pkgname":
@ -495,8 +495,8 @@ games_init(void)
games[id].nosprays = 0;
games[id].mpentity = "info_player_deathmatch";
games[id].gamedll = "progs.dat";
games[id].startmap = "c0a0";
games[id].trainingmap = "t0a0";
games[id].startmap = "map c0a0\n";
games[id].trainingmap = "map t0a0\n";
games[id].cldll = 1;
games[id].hlversion = "1000";
games[id].svonly = 0;

2
src/menu-fn/m_main.qc
View file

@ -78,7 +78,7 @@ btn_training(void)
{
localcmd("stopmusic\n");
localcmd("maxplayers 1\n");
localcmd(sprintf("map %s\n", games[gameinfo_current].trainingmap));
localcmd(games[gameinfo_current].trainingmap);
}
void

6
src/menu-fn/m_newgame.qc
View file

@ -28,7 +28,7 @@ ng_btneasy_start(void)
g_menupage = PAGE_MAIN;
localcmd("stopmusic\n");
localcmd("set skill 1; maxplayers 1\n");
localcmd(sprintf("map %s\n", games[gameinfo_current].startmap));
localcmd(games[gameinfo_current].startmap);
}
localsound("../media/launch_upmenu1.wav");
header.SetStartEndPos(45,45,70,208);
@ -46,7 +46,7 @@ ng_btnnormal_start(void)
g_menupage = PAGE_MAIN;
localcmd("stopmusic\n");
localcmd("set skill 2; maxplayers 1\n");
localcmd(sprintf("map %s\n", games[gameinfo_current].startmap));
localcmd(games[gameinfo_current].startmap);
}
localsound("../media/launch_upmenu1.wav");
header.SetStartEndPos(45,45,70,208);
@ -64,7 +64,7 @@ ng_btnhard_start(void)
g_menupage = PAGE_MAIN;
localcmd("stopmusic\n");
localcmd("set skill 3; maxplayers 1\n");
localcmd(sprintf("map %s\n", games[gameinfo_current].startmap));
localcmd(games[gameinfo_current].startmap);
}
localsound("../media/launch_upmenu1.wav");
header.SetStartEndPos(45,45,70,208);