#define MSLE_CLEAN_Byte(x)
#define MSLE_CLEAN_Char(x)
#define MSLE_CLEAN_Short(x)
+#define MSLE_CLEAN_Long(x)
#define MSLE_CLEAN_Coord(x)
#define MSLE_CLEAN_Angle(x)
#define MSLE_CLEAN_Float(x)
void minigame_autoclean_entity(entity e)
{
- dprint("CL Auto-cleaned: ",ftos(num_for_edict(e)), " (",e.classname,")\n");
+ LOG_TRACE("CL Auto-cleaned: ",ftos(num_for_edict(e)), " (",e.classname,")\n");
remove(e);
}
bool auto_close_minigamemenu;
void deactivate_minigame()
{
- if ( !active_minigame || active_minigame != self )
+ if ( !active_minigame )
return;
+
active_minigame.minigame_event(active_minigame,"deactivate");
entity e = world;
- while( (e = findentity(e, owner, self)) )
+ while( (e = findentity(e, owner, active_minigame)) )
if ( e.minigame_autoclean )
{
minigame_autoclean_entity(e);
HUD_MinigameMenu_CurrentButton();
}
+void minigame_entremove()
+{
+ if ( self == active_minigame )
+ deactivate_minigame();
+}
+
void activate_minigame(entity minigame)
{
if ( !minigame )
if ( !minigame.descriptor || minigame.classname != "minigame" )
{
- dprint("Trying to activate unregistered minigame ",minigame.netname," in client\n");
+ LOG_TRACE("Trying to activate unregistered minigame ",minigame.netname," in client\n");
return;
}
if ( active_minigame )
{
- entity olds = minigame_self;
deactivate_minigame();
- minigame_self = olds;
}
if ( minigame_self.owner != minigame )
vector ReadVector() { vector v; v_x = ReadCoord(); v_y = ReadCoord(); v_z = ReadCoord(); return v; }
string() ReadString_Raw = #366;
string ReadString_Zoned() { return strzone(ReadString_Raw()); }
-#define ReadFloat ReadCoord
#define ReadString ReadString_Zoned
#define FIELD(Flags, Type,Name) if ( sf & (Flags) ) self.Name = Read##Type();
#define MSLE(Name,Fields) \
self.owner = find(self.owner,netname,owner_name);
while ( self.owner && self.owner.classname != "minigame" );
if ( !self.owner )
- dprint("Got a minigame entity without a minigame!\n");
+ LOG_TRACE("Got a minigame entity without a minigame!\n");
}
void ent_read_minigame()
{
if ( sf & MINIG_SF_CREATE )
{
- self.entremove = deactivate_minigame;
+ self.entremove = minigame_entremove;
self.descriptor = minigame_get_descriptor(ReadString_Raw());
if ( !self.descriptor )
- dprint("Got a minigame without a client-side descriptor!\n");
+ LOG_TRACE("Got a minigame without a client-side descriptor!\n");
else
self.minigame_event = self.descriptor.minigame_event;
}
minigame_read_owner();
float ent = ReadLong();
self.minigame_playerslot = ent;
- dprint("Player: ",GetPlayerName(ent-1),"\n");
+ LOG_TRACE("Player: ",GetPlayerName(ent-1),"\n");
activate = (ent == player_localnum+1 && self.owner && self.owner != active_minigame);
if ( minigame_ent )
minigame_ent.minigame_event(minigame_ent,"network_receive",self,sf);
-
+
if ( sf & MINIG_SF_CREATE )
{
- dprint("CL Reading entity: ",ftos(num_for_edict(self)),
+ LOG_TRACE("CL Reading entity: ",ftos(num_for_edict(self)),
" classname:",self.classname," enttype:",ftos(self.enttype) );
- dprint(" sf:",ftos(sf)," netname:",self.netname,"\n\n");
+ LOG_TRACE(" sf:",ftos(sf)," netname:",self.netname,"\n\n");
}
}
-#undef ReadFloat
#undef ReadString
#undef FIELD
#undef MSLE
if ( take_until > strlen(s) )
take_until = strlen(s);
-
+
for ( int i = 0; i < take_until; i++ )
if ( substring(s,i,1) == "\n" )
{
HUD_Notify_Push(sprintf("minigames/%s/icon_notif",active_minigame.descriptor.netname),
_("It's your turn"), "");
}
-}
\ No newline at end of file
+}