case NOTIF_ALL:
{
if (client) {
- return "Entity provided when world was required!";
+ return "Entity provided when NULL was required!";
}
break;
}
if (notif.nent_icon != "") strunzone(notif.nent_icon);
if (notif.nent_durcnt != "") strunzone(notif.nent_durcnt);
if (notif.nent_string != "") strunzone(notif.nent_string);
- remove(notif);
+ delete(notif);
}
void Destroy_All_Notifications()
// used by MSG_CHOICE to build list of choices
#ifdef SVQC
-void Notification_GetCvars()
+void Notification_GetCvars(entity this)
{
FOREACH(Notifications, it.nent_type == MSG_CHOICE, {
GetCvars_handleFloat(
+ this,
get_cvars_s,
get_cvars_f,
msg_choice_choices[it.nent_choice_idx],
#ifdef NOTIFICATIONS_DEBUG
Debug_Notification(sprintf(
(
- "Local_Notification_sound(world, %f, '%s', %f, %f) "
+ "Local_Notification_sound(NULL, %f, '%s', %f, %f) "
"^1BLOCKED BY ANTISPAM:^7 prevsnd: '%s', timediff: %f, limit: %f\n"
),
soundchannel,
#endif
#ifdef SVQC
-void Net_Notification_Remove()
+void Net_Notification_Remove(entity this)
{
- SELFPARAM();
#ifdef NOTIFICATIONS_DEBUG
Debug_Notification(sprintf(
"Net_Notification_Remove() at %f: %s '%s - %s' notification\n",
));
#endif
for (int i = 0; i < this.nent_stringcount; ++i) { if (this.nent_strings[i]) strunzone(this.nent_strings[i]); }
- remove(this);
+ delete(this);
}
bool Net_Write_Notification(entity this, entity client, int sf)
net_notif.nent_floats[i] = ...((net_notif.nent_stringcount + i), float);
}
- net_notif.think = Net_Notification_Remove;
+ setthink(net_notif, Net_Notification_Remove);
net_notif.nextthink = (time > autocvar_notification_lifetime_mapload)
? (time + autocvar_notification_lifetime_runtime)
: autocvar_notification_lifetime_mapload;