tech
/
nuclide
2
0
Fork 0
Code Issues 33 Releases Activity

Mapcycle: Disable sanity check until the engine fixes whichpack 

Gamerules: Intermission will now call 'nextmap' instead of 'restart'.
func_button: Basic support for 'message' field.
env_cubemap: default to saving .ktx
This commit is contained in:
Marco Cawthorne 2022-04-17 13:50:14 -07:00
parent a34c9a8059
commit 069c59628d
Signed by: eukara
GPG Key ID: C196CD8BA993248A
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gs-entbase/baseentity.h
View File

@ -60,6 +60,7 @@ enumflags
BASEFL_CHANGED_ANGLES,
BASEFL_CHANGED_MODELINDEX,
BASEFL_CHANGED_SIZE,
BASEFL_CHANGED_FLAGS,
BASEFL_CHANGED_SOLID,
BASEFL_CHANGED_FRAME,
BASEFL_CHANGED_SKIN,

6
src/gs-entbase/client/env_cubemap.qc
View File

@ -93,7 +93,7 @@ CMap_Shoot(void)
setproperty(VF_ANGLES, [0,0,0]);
strReflectcube = sprintf(
"env/%s_%d_%d_%d",
"env/%s_%d_%d_%d.ktx",
mapname,
g_vecCubePos[0],
g_vecCubePos[1],
@ -103,7 +103,7 @@ CMap_Shoot(void)
strReflectcube,
tmp.m_iSize));
self.think = CMap_Check;
self.nextthink = time + 0.5f;
self.nextthink = time + 0.25f;
} else {
print("^2Cubemaps done...\n");
localcmd("vid_reload\n");
@ -124,7 +124,7 @@ CMap_Check(void)
{
self.owner = find(self.owner, classname, "env_cubemap");
self.think = CMap_Shoot;
self.nextthink = time + 0.25f; /* because sigh */
self.nextthink = time + 0.1f; /* because sigh */
}
/*

7
src/gs-entbase/server/func_button.qc
View File

@ -304,6 +304,10 @@ func_button::Trigger(entity act, int state)
UseOutput(act, m_strOnPressed);
UseTargets(act, TRIG_TOGGLE, m_flDelay);
if (message)
env_message_single(act, message);
health = GetSpawnHealth();
}
@ -436,6 +440,9 @@ void
func_button::SpawnKey(string strKey, string strValue)
{
switch (strKey) {
case "message":
message = strValue;
break;
case "speed":
m_flSpeed = stof(strValue);
break;

4
src/server/gamerules.qc
View File

@ -381,7 +381,7 @@ CGameRules::IntermissionEnd(void)
if (!(input_buttons & INPUT_BUTTON0) && !(input_buttons & INPUT_BUTTON2))
return;
localcmd("restart\n");
localcmd("nextmap\n");
}
void
@ -403,4 +403,4 @@ bool
CGameRules::PlayerCanAttack(base_player bp)
{
return true;
}
}

5
src/server/mapcycle.qc
View File

@ -43,8 +43,11 @@ Mapcycle_Init(void)
/* read the lines in, see if the map exists and define an enumerated alias */
while ((temp = fgets(fs_mapcycle))) {
#if 0
print(sprintf( "checking for map %s whichpack result: %S\n", strcat("maps/", temp, ".bsp"), whichpack(strcat("maps/", temp, ".bsp"))));
if (!whichpack(strcat("maps/", temp, ".bsp")))
break;
continue;
#endif
readcmd(sprintf("alias m%i \"map %s;alias nextmap m%i\"\n", mapcount, temp, mapcount + 1i));
if (mapname == lastmap)