Skip to content

Commit 4c06a3a

Browse files
q009q009
committed
quietworldalias -> worldmeta
1 parent b632cd6 commit 4c06a3a

File tree

8 files changed

+35
-35
lines changed

8 files changed

+35
-35
lines changed

‎config/tool/toolcommon.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ tool_file_ishidden = [
264264
TOOL_VERSION = 1
265265

266266
tool_remember_version_on_mapload = [
267-
quietworldalias tool_saved_version $TOOL_VERSION
267+
worldmeta tool_saved_version $TOOL_VERSION
268268
]
269269

270270
onevent 0 tool_remember_version_on_mapload

‎config/tool/toolentplacer.cfg‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@ tool_ent_placer_add_template_list = [
108108
_list_slot = $_num_lists
109109

110110
append _list_names [[@@@_new_name]]
111-
quietworldalias tool_ent_placer_template_list_names $_list_names
112-
quietworldalias tool_ent_placer_num_template_lists (+ $_num_lists 1)
113-
quietworldalias (concatword tool_ent_placer_templates_ $_list_slot) []
114-
quietworldalias (concatword tool_ent_placer_mods_ $_list_slot) []
111+
worldmeta tool_ent_placer_template_list_names $_list_names
112+
worldmeta tool_ent_placer_num_template_lists (+ $_num_lists 1)
113+
worldmeta (concatword tool_ent_placer_templates_ $_list_slot) []
114+
worldmeta (concatword tool_ent_placer_mods_ $_list_slot) []
115115
] [
116116
_list_names = (listsplice $_list_names [[@@@_new_name]] $_list_slot 1)
117-
quietworldalias tool_ent_placer_template_list_names $_list_names
118-
quietworldalias (concatword tool_ent_placer_templates_ $_list_slot) []
119-
quietworldalias (concatword tool_ent_placer_mods_ $_list_slot) []
117+
worldmeta tool_ent_placer_template_list_names $_list_names
118+
worldmeta (concatword tool_ent_placer_templates_ $_list_slot) []
119+
worldmeta (concatword tool_ent_placer_mods_ $_list_slot) []
120120
]
121121

122122
tool_ent_placer_parse_template_lists
@@ -130,9 +130,9 @@ tool_ent_placer_rem_template_list = [
130130
_list_slot = (tool_ent_placer_find_template_list_slot $arg1)
131131
_template_list_names = (getalias tool_ent_placer_template_list_names)
132132
_template_list_names = (listsplice $_template_list_names [[]] $_list_slot 1)
133-
quietworldalias tool_ent_placer_template_list_names $_template_list_names
134-
quietworldalias (concatword tool_ent_placer_templates_ $_list_slot) []
135-
quietworldalias (concatword tool_ent_placer_mods_ $_list_slot) []
133+
worldmeta tool_ent_placer_template_list_names $_template_list_names
134+
worldmeta (concatword tool_ent_placer_templates_ $_list_slot) []
135+
worldmeta (concatword tool_ent_placer_mods_ $_list_slot) []
136136

137137
tool_ent_placer_parse_template_lists
138138
]
@@ -146,7 +146,7 @@ tool_ent_placer_template_update = [
146146
_template = (at $_templates $tool_ent_placer_template_focus)
147147
_template = (listsplice $_template $arg2 (+ $arg1 1) 1)
148148

149-
quietworldalias $tool_ent_placer_templates (listsplice $_templates [[@@_template]] $tool_ent_placer_template_focus 1)
149+
worldmeta $tool_ent_placer_templates (listsplice $_templates [[@@_template]] $tool_ent_placer_template_focus 1)
150150
] [
151151
error "tool_ent_placer_template_update error: invalid state!"
152152
]
@@ -165,7 +165,7 @@ tool_ent_placer_mod_update = [
165165
_mod = (at $_mods $tool_ent_placer_template_focus)
166166
_mod = (listsplice $_mod $arg1 $arg2 1)
167167

168-
quietworldalias $tool_ent_placer_mods (listsplice $_mods [[@@_mod]] $tool_ent_placer_template_focus 1)
168+
worldmeta $tool_ent_placer_mods (listsplice $_mods [[@@_mod]] $tool_ent_placer_template_focus 1)
169169
] [
170170
error "tool_ent_placer_template_update error: invalid state!"
171171
]
@@ -229,8 +229,8 @@ tool_ent_placer_template_add = [
229229
append _templates [[@@_template]]
230230
append _mods [[@@_mod]]
231231

232-
quietworldalias $tool_ent_placer_templates $_templates
233-
quietworldalias $tool_ent_placer_mods $_mods
232+
worldmeta $tool_ent_placer_templates $_templates
233+
worldmeta $tool_ent_placer_mods $_mods
234234

235235
tool_ent_placer_set_template_focus (- (listlen $$tool_ent_placer_templates) 1)
236236
]
@@ -250,8 +250,8 @@ tool_ent_placer_template_froment = [
250250
append _templates [[@@(entget)]]
251251
append _mods [[@@_mod]]
252252

253-
quietworldalias $tool_ent_placer_templates $_templates
254-
quietworldalias $tool_ent_placer_mods $_mods
253+
worldmeta $tool_ent_placer_templates $_templates
254+
worldmeta $tool_ent_placer_mods $_mods
255255

256256
tool_ent_placer_set_template_focus (- (listlen $$tool_ent_placer_templates) 1)
257257
]
@@ -265,17 +265,17 @@ tool_ent_placer_template_duplicate = [
265265
append _templates [[@@(tool_ent_placer_template_get)]]
266266
append _mods [[@@(tool_ent_placer_mods_get)]]
267267

268-
quietworldalias $tool_ent_placer_templates $_templates
269-
quietworldalias $tool_ent_placer_mods $_mods
268+
worldmeta $tool_ent_placer_templates $_templates
269+
worldmeta $tool_ent_placer_mods $_mods
270270

271271
tool_ent_placer_set_template_focus (- (listlen $$tool_ent_placer_templates) 1)
272272
]
273273
]
274274

275275
// 1:<index>
276276
tool_ent_placer_template_remove = [
277-
quietworldalias $tool_ent_placer_templates (listsplice $$tool_ent_placer_templates "" $arg1 1)
278-
quietworldalias $tool_ent_placer_mods (listsplice $$tool_ent_placer_mods "" $arg1 1)
277+
worldmeta $tool_ent_placer_templates (listsplice $$tool_ent_placer_templates "" $arg1 1)
278+
worldmeta $tool_ent_placer_mods (listsplice $$tool_ent_placer_mods "" $arg1 1)
279279

280280
if (>= $tool_ent_placer_template_focus (listlen $$tool_ent_placer_templates)) [
281281
tool_ent_placer_template_focus = -1

‎src/engine/command.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ static inline void setalias(ident &id, tagval &v, bool world, bool quiet = false
517517
id.flags = 0;
518518

519519
// In order to stop abuse, do not add the quiet flag if it was absent before
520-
if(quiet) id.flags |= oldflags&IDF_QUIET;
520+
if(quiet) id.flags |= oldflags&IDF_META;
521521
if(world || oldflags&IDF_WORLD) id.flags |= IDF_WORLD;
522522
id.flags |= oldflags&IDF_PERSIST;
523523
#ifndef STANDALONE
@@ -574,7 +574,7 @@ static void setalias(const char *name, tagval &v, bool world, bool quiet = false
574574
#endif
575575
int extraflags = 0;
576576
if(world) extraflags |= IDF_WORLD;
577-
if(quiet) extraflags |= IDF_QUIET;
577+
if(quiet) extraflags |= IDF_META;
578578

579579
id = addident(ident(ID_ALIAS, newstring(name), v, identflags|extraflags, 0));
580580
#ifndef STANDALONE
@@ -607,11 +607,11 @@ void worldalias(const char *name, const char *action)
607607
}
608608
COMMAND(0, worldalias, "ss");
609609

610-
void quietworldalias(const char *name, const char *action)
610+
void worldmeta(const char *name, const char *action)
611611
{
612612
alias(name, action, true, true);
613613
}
614-
COMMAND(0, quietworldalias, "ss");
614+
COMMAND(0, worldmeta, "ss");
615615

616616
void loadalias(const char *name, const char *fname, int *world)
617617
{

‎src/engine/world.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1322,7 +1322,7 @@ void clearworldvars(bool msg)
13221322
case ID_FVAR: setfvar(id.name, id.def.f, true); break;
13231323
case ID_SVAR: setsvar(id.name, id.def.s && *id.def.s ? id.def.s : "", true); break;
13241324
case ID_ALIAS:
1325-
if(id.flags&IDF_QUIET) quietworldalias(id.name, "");
1325+
if(id.flags&IDF_META) worldmeta(id.name, "");
13261326
else worldalias(id.name, "");
13271327
break;
13281328
default: break;

‎src/engine/worldio.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ void save_config(char *mname, bool forcesave = false)
637637
aliases++;
638638
if(validateblock(str))
639639
{
640-
if(id.flags&IDF_QUIET) h->printf("quietworldalias %s [%s]\n", escapeid(id), str);
640+
if(id.flags&IDF_META) h->printf("worldmeta %s [%s]\n", escapeid(id), str);
641641
else h->printf("%s = [%s]\n", escapeid(id), str);
642642
}
643643
else h->printf("%s = %s\n", escapeid(id), escapestring(str));

‎src/game/client.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1873,7 +1873,7 @@ namespace client
18731873

18741874
void editvar(ident *id, bool local)
18751875
{
1876-
if(id && id->flags&IDF_WORLD && !(id->flags&IDF_QUIET) && !(id->flags&IDF_SERVER) && local && m_edit(game::gamemode) && game::player1->state == CS_EDITING)
1876+
if(id && id->flags&IDF_WORLD && !(id->flags&IDF_META) && !(id->flags&IDF_SERVER) && local && m_edit(game::gamemode) && game::player1->state == CS_EDITING)
18771877
{
18781878
switch(id->type)
18791879
{
@@ -3133,7 +3133,7 @@ namespace client
31333133
getstring(val, p, vlen+1);
31343134
if(commit || !id) // set aliases anyway
31353135
{
3136-
if(flags&IDF_QUIET) quietworldalias(text, val);
3136+
if(flags&IDF_META) worldmeta(text, val);
31373137
else
31383138
{
31393139
worldalias(text, val);

‎src/game/server.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7453,7 +7453,7 @@ namespace server
74537453
{
74547454
int val = getint(p);
74557455

7456-
if(!(flags&IDF_QUIET))
7456+
if(!(flags&IDF_META))
74577457
relayf(3, "\fy%s set world variable %s to %d", colourname(ci), text, val);
74587458

74597459
QUEUE_INT(val);
@@ -7463,7 +7463,7 @@ namespace server
74637463
{
74647464
float val = getfloat(p);
74657465

7466-
if(!(flags&IDF_QUIET))
7466+
if(!(flags&IDF_META))
74677467
relayf(3, "\fy%s set world variable %s to %s", colourname(ci), text, floatstr(val));
74687468

74697469
QUEUE_FLT(val);
@@ -7477,7 +7477,7 @@ namespace server
74777477
char *val = newstring(vlen);
74787478
getstring(val, p, vlen+1);
74797479

7480-
if(!(flags&IDF_QUIET))
7480+
if(!(flags&IDF_META))
74817481
relayf(3, "\fy%s set world %s %s to %s", colourname(ci), t == ID_ALIAS ? "alias" : "variable", text, val);
74827482

74837483
QUEUE_INT(vlen);

‎src/shared/command.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ enum
5656
IDF_INIT = 1<<0, IDF_PERSIST = 1<<1, IDF_READONLY = 1<<2, IDF_REWRITE = 1<<3, IDF_WORLD = 1<<4, IDF_COMPLETE = 1<<5,
5757
IDF_TEXTURE = 1<<6, IDF_CLIENT = 1<<7, IDF_SERVER = 1<<8, IDF_HEX = 1<<9, IDF_UNKNOWN = 1<<10, IDF_ARG = 1<<11,
5858
IDF_PRELOAD = 1<<12, IDF_GAMEPRELOAD = 1<<13, IDF_GAMEMOD = 1<<14, IDF_NAMECOMPLETE = 1<<15, IDF_EMUVAR = 1<<16,
59-
IDF_QUIET = 1<<17
59+
IDF_META = 1<<17
6060
};
6161

62-
#define IDF_TX_MASK IDF_QUIET
62+
#define IDF_TX_MASK IDF_META
6363

6464
struct ident;
6565
struct identval
@@ -390,7 +390,7 @@ extern bool execfile(const char *cfgfile, bool msg = true, int flags = 0);
390390
extern void alias(const char *name, const char *action, bool world = false, bool quiet = false);
391391
extern void alias(const char *name, tagval &v, bool world = false, bool quiet = false);
392392
extern void worldalias(const char *name, const char *action);
393-
extern void quietworldalias(const char *name, const char *action);
393+
extern void worldmeta(const char *name, const char *action);
394394
extern const char *getalias(const char *name);
395395
extern const char *escapestring(const char *s);
396396
extern const char *escapeid(const char *s);

0 commit comments

Comments
 (0)