diff options
| author | Machiavelli <none@none> | 2010-06-03 18:16:07 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2010-06-03 18:16:07 +0200 |
| commit | 2cec9d276e68ecbaf24f173864f8d4b9e43afded (patch) | |
| tree | a052abe5359af378d57984fe82402597a29bac87 | |
| parent | f346d779a541b3fb4982553c1ca4a4f8421294fa (diff) | |
Rename SCRIPT_COMMAND_MOD_UPDATEFIELD to SCRIPT_COMMAND_SET_FLAG to avoid confusion.
Also add a parameter ´apply´ (dataint). If 1, it will set the flag, if 0, it will remove it.
Note: currently only supports 32bit integers.
--HG--
branch : trunk
| -rw-r--r-- | src/game/Map.cpp | 5 | ||||
| -rw-r--r-- | src/game/World.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index b22b78cf766..b866b3c877a 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -3939,7 +3939,10 @@ void Map::ScriptsProcess() break; } - source->SetFlag(step.script->datalong, step.script->datalong2); + if (step.script->dataint) + source->SetFlag(step.script->datalong, step.script->datalong2); + else + source->RemoveFlag(step.script->datalong, step.script->datalong2); break; } diff --git a/src/game/World.h b/src/game/World.h index db0a11fa320..37e869f7ddf 100644 --- a/src/game/World.h +++ b/src/game/World.h @@ -453,7 +453,7 @@ enum WorldStates #define SCRIPT_COMMAND_MODEL 32 // datalong = model id #define SCRIPT_COMMAND_CLOSE_GOSSIP 33 // close gossip window -- no values #define SCRIPT_COMMAND_PLAYMOVIE 34 // datalong = movie id -#define SCRIPT_COMMAND_MOD_UPDATEFIELD 35 // datalong = index, datalong2 = newvalue +#define SCRIPT_COMMAND_SET_FLAG 35 // dataint: 1=apply,0=remove, datalong = index, datalong2 = newvalue /// Storage class for commands issued for delayed execution struct CliCommandHolder |