Casts repariert.
Change-Id: Icdfe3814074844b8c192408d7554294cdbe4ece4
diff --git a/obj/tools/fehlerteufel.c b/obj/tools/fehlerteufel.c
index 02b099f..7b9c8e6 100644
--- a/obj/tools/fehlerteufel.c
+++ b/obj/tools/fehlerteufel.c
@@ -78,7 +78,7 @@
}
else
{
- string hashkey = (string)ERRORD->LogReportedError(feingabe);
+ string hashkey = ({string})ERRORD->LogReportedError(feingabe);
tell_object(PL, sprintf(
"Vielen Dank! Die ID des eingegebenen Fehlers lautet: %s\n",
hashkey || "N/A"));
@@ -201,7 +201,7 @@
{
foreach(<int|string>* row : list)
{
- if ((int)ERRORD->ToggleDeleteError(row[0]) == 1)
+ if (({int})ERRORD->ToggleDeleteError(row[0]) == 1)
{
tell_object(PL,
row[0] + " als geloescht markiert.\n");
@@ -216,7 +216,7 @@
public int CmdFehlerLoeschen(string arg)
{
int issueid;
- arg = (string)this_player()->_unparsed_args(0);
+ arg = ({string})this_player()->_unparsed_args(0);
if (stringp(arg) && sizeof(arg))
issueid = to_int(arg);
@@ -225,7 +225,7 @@
notify_fail("Einen Eintrag mit dieser ID/diesem Loadname gibt es nicht!\n");
- int res = (int)ERRORD->ToggleDeleteError(issueid);
+ int res = ({int})ERRORD->ToggleDeleteError(issueid);
if (res == 1)
{
tell_object(PL,
@@ -414,7 +414,7 @@
public int CmdFilter(string arg) {
- arg=(string)PL->_unparsed_args(0);
+ arg=({string})PL->_unparsed_args(0);
if (!stringp(arg) || !sizeof(arg)) {
tell_object(PL,break_string(
@@ -480,7 +480,7 @@
public int CmdMonitor(string arg) {
- arg=(string)PL->_unparsed_args(0);
+ arg=({string})PL->_unparsed_args(0);
if (!stringp(arg) || !sizeof(arg)) {
tell_object(PL,break_string(
@@ -566,7 +566,7 @@
if(!objectp(TI))
return 0;
- str=(string)PL->_unparsed_args(0);
+ str=({string})PL->_unparsed_args(0);
if (!stringp(str) || !sizeof(str))
return 0;
@@ -577,7 +577,7 @@
str=implode(arr[1..]," "); //text wiederherstellen, aber ohne ID
- switch((int)ERRORD->AddNote(issueid,str))
+ switch(({int})ERRORD->AddNote(issueid,str))
{
case -1:
tell_object(PL,
@@ -604,7 +604,7 @@
if(!objectp(TI))
return 0;
- str=(string)PL->_unparsed_args(0);
+ str=({string})PL->_unparsed_args(0);
if (!stringp(str) || !sizeof(str))
return 0;
@@ -620,11 +620,11 @@
if (query_verb()=="ffix" || query_verb()=="fehlerfix")
{
fixing=1;
- res = (int)ERRORD->ResolveIssue(issueid, str);
+ res = ({int})ERRORD->ResolveIssue(issueid, str);
}
else
{
- res = (int)ERRORD->ReOpenIssue(issueid, str);
+ res = ({int})ERRORD->ReOpenIssue(issueid, str);
}
if (res==-1)
@@ -670,7 +670,7 @@
if(!objectp(TI))
return 0;
- str=(string)PL->_unparsed_args(0);
+ str=({string})PL->_unparsed_args(0);
if (!stringp(str) || !sizeof(str))
return 0;
@@ -686,11 +686,11 @@
if (query_verb()=="flock" || query_verb()=="fehlerlock")
{
locking=1;
- res=(int)ERRORD->LockIssue(issueid,str);
+ res=({int})ERRORD->LockIssue(issueid,str);
}
else
{
- res=(int)ERRORD->UnlockIssue(issueid,str);
+ res=({int})ERRORD->UnlockIssue(issueid,str);
}
if (res==-1)
@@ -739,7 +739,7 @@
if(!objectp(TI))
return 0;
- str=(string)PL->_unparsed_args(0);
+ str=({string})PL->_unparsed_args(0);
if (!stringp(str) || !sizeof(str))
return 0;
@@ -755,7 +755,7 @@
else
str = 0;
- switch((int)ERRORD->ReassignIssue(issueid, newuid, str))
+ switch(({int})ERRORD->ReassignIssue(issueid, newuid, str))
{
case -1:
tell_object(PL,
@@ -960,13 +960,13 @@
// ******** private functions *********************
private void get_uids()
{
- uids=(string *)master()->QueryUIDsForWizard(owner);
+ uids=({string *})master()->QueryUIDsForWizard(owner);
xmonitoruids=({});
if (sizeof(monitoruids))
{
closure cl=symbol_function("QueryUIDAlias", master());
foreach(string uid: monitoruids) {
- xmonitoruids += (string*)funcall(cl, uid);
+ xmonitoruids += ({string*})funcall(cl, uid);
}
}
}
@@ -992,7 +992,7 @@
{
//DEBUG(sprintf("Type: %d, UID: %s\n",type,uid));
< <int|string>* >* list =
- (< <int|string>* >*)ERRORD->QueryIssueList(type,uid);
+ ({< <int|string>* >*})ERRORD->QueryIssueList(type,uid);
count += sizeof(list);
if (!member(issuelist, type))
@@ -1026,9 +1026,9 @@
// Wurde eine ID oder nichts uebergeben, ist issueid die ID als int und
// arg die ID als string.
if (to_string(issueid) == arg)
- issue = (struct fullissue_s)ERRORD->QueryIssueByID(issueid);
+ issue = ({struct fullissue_s})ERRORD->QueryIssueByID(issueid);
else
- issue = (struct fullissue_s)ERRORD->QueryIssueByHash(arg);
+ issue = ({struct fullissue_s})ERRORD->QueryIssueByHash(arg);
return issue;
}
@@ -1054,7 +1054,7 @@
if (!(m & modus))
continue;
struct fullissue_s *tmp =
- (struct fullissue_s *)ERRORD->QueryIssuesByFile(arg, m);
+ ({struct fullissue_s *})ERRORD->QueryIssuesByFile(arg, m);
if (tmp)
issues+=tmp;
}
diff --git a/obj/vitem_proxy.c b/obj/vitem_proxy.c
index 333d6ce..2543f16 100644
--- a/obj/vitem_proxy.c
+++ b/obj/vitem_proxy.c
@@ -95,7 +95,7 @@
break;
}
// Eintragung in die Fehler-DB
- string hashkey = (string)ERRORD->LogReportedError(err);
+ string hashkey = ({string})ERRORD->LogReportedError(err);
if (stringp(hashkey))
{
previous_object()->ReceiveMsg(sprintf(
diff --git a/secure/bbmaster.c b/secure/bbmaster.c
index 4e5c784..d0bc8f1 100644
--- a/secure/bbmaster.c
+++ b/secure/bbmaster.c
@@ -160,7 +160,7 @@
mixed erstie;
if (ob)
- erstie = (string)ob->QueryProp(P_SECOND);
+ erstie = ({string})ob->QueryProp(P_SECOND);
ldata += ([uid: time() + LOGTIME + random(LOGTIME/2);
0;
diff --git a/secure/gildenmaster.c b/secure/gildenmaster.c
index 56c5e3d..dfd411d 100644
--- a/secure/gildenmaster.c
+++ b/secure/gildenmaster.c
@@ -46,8 +46,8 @@
return -4;
}
- if ((ogname=(string)pl->QueryProp(P_GUILD)) &&
- (ogname!=(((string)pl->QueryProp(P_DEFAULT_GUILD)) || DEFAULT_GUILD))) {
+ if ((ogname=({string})pl->QueryProp(P_GUILD)) &&
+ (ogname!=((({string})pl->QueryProp(P_DEFAULT_GUILD)) || DEFAULT_GUILD))) {
write("Du bist noch in einer anderen Gilde.\n");
return -1;
}
@@ -90,7 +90,7 @@
// Gilden muessen Blueprints sein, so. ;-)
gname=object_name(gilde);
if (gname[0..7]!=GUILD_DIR ||
- ((string)pl->QueryProp(P_GUILD))!=gname[8..]) {
+ (({string})pl->QueryProp(P_GUILD))!=gname[8..]) {
write("Du kannst hier nicht aus einer anderen Gilde austreten.\n");
return -1;
}
@@ -100,7 +100,7 @@
return -1;
}
if (loss<=0) loss=20;
- skills=(mapping)pl->QueryProp(P_NEWSKILLS);
+ skills=({mapping})pl->QueryProp(P_NEWSKILLS);
walk_mapping(skills,"loose_ability",this_object(),loss);
pl->SetProp(P_NEWSKILLS,skills);
pl->SetProp(P_GUILD,0);
@@ -112,7 +112,7 @@
E_LAST_GUILDNAME: gname ]) );
// Defaultgilde ggf. neuen Titel setzen lassen.
- gname = (string)pl->QueryProp(P_GUILD);
+ gname = ({string})pl->QueryProp(P_GUILD);
(GUILD_DIR+"/"+gname)->adjust_title(pl);
return 1;