kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

persistidents fixes (plz review/test)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7213 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Bukz
2013-02-16 01:43:47 +00:00
parent 7ab718f74e
commit 7480f036d3
31 changed files with 126 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/command.cpp
+18 -6
View File
@@ -17,11 +17,23 @@ int loop_level = 0; // avoid bad calls of b
hashtable<const char *, ident> *idents = NULL; // contains ALL vars/commands/aliases
bool persistidents = true, neverpersist = false;
COMMANDF(persistidents, "i", (int *on) {
persistidents = neverpersist ? false : *on;
VAR(persistidents, 0, 1, 1);
bool per_idents = true, neverpersist = false;
COMMANDF(per_idents, "i", (int *on) {
per_idents = neverpersist ? false : *on;
});
void ispersist()
{
if (persistidents)
conoutf("persistidents is on");
else
conoutf("persistidents is off");
}
COMMAND(ispersist, "");
void clearstack(ident &id)
{
identstack *stack = id.stack;
@@ -63,7 +75,7 @@ ident *newident(const char *name, int context = execcontext)
ident *id = idents->access(name);
if(!id)
{
ident init(ID_ALIAS, newstring(name), newstring(""), persistidents, context);
ident init(ID_ALIAS, newstring(name), newstring(""), per_idents, context);
id = &idents->access(init.name, init);
}
return id;
@@ -153,7 +165,7 @@ void constant(const char *name, const char *action)
ident *b = idents->access(name);
if(!b)
{
ident b(ID_ALIAS, newstring(name), newstring(action), persistidents, execcontext);
ident b(ID_ALIAS, newstring(name), newstring(action), false, execcontext); // never write consts to saved.cfg, too error prone - Bukz
b.isconst = true;
idents->access(b.name, b);
return;
@@ -177,7 +189,7 @@ void constant(const char *name, const char *action)
{
if(b->action!=b->executing) delete[] b->action;
b->action = newstring(action);
if(b->persist!=persistidents) b->persist = persistidents;
//if(b->persist!=persistidents) b->persist = persistidents;
}
}
else