Skip to content

Commit

Permalink
Fixed str() being passed as an instance for variadic arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
smallmodel committed Oct 7, 2023
1 parent f24303d commit 475fc92
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions code/fgame/entity.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4283,7 +4283,7 @@ void Entity::AttachEvent(Event *ev)
if (tagnum >= 0) {
attach(parent->entnum, tagnum, use_angles, offset);
} else {
warning("AttachEvent", "Tag %s not found", bone);
warning("AttachEvent", "Tag %s not found", bone.c_str());
}
}

Expand Down Expand Up @@ -4371,7 +4371,7 @@ void Entity::AttachModelEvent(Event *ev)
return;
}
} else {
warning("AttachModelEvent", "Tag %s not found", bone);
warning("AttachModelEvent", "Tag %s not found", bone.c_str());
}
}

Expand Down
2 changes: 1 addition & 1 deletion code/fgame/scriptslave.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1573,7 +1573,7 @@ void ScriptSlave::FollowPath
}
else
{
ScriptError( "Unknown followpath command %s.", token );
ScriptError( "Unknown followpath command %s.", token.c_str() );
}
}
if( ent && ent->IsSubclassOfSplinePath() )
Expand Down
2 changes: 1 addition & 1 deletion code/fgame/scriptthread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3438,7 +3438,7 @@ void ScriptThread::CameraCommand(Event *ev)

CameraMan.ProcessEvent(e);
} else {
throw ScriptException("Unknown camera command '%s'.\n", cmd);
throw ScriptException("Unknown camera command '%s'.\n", cmd.c_str());
}
}

Expand Down
2 changes: 1 addition & 1 deletion code/fgame/viewthing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ void ViewMaster::Spawn

if( !gi.modeltiki( viewthing->model ) )
{
ScriptError( "model %s not found, viewmodel not spawned.", mdl );
ScriptError( "model %s not found, viewmodel not spawned.", mdl.c_str() );
delete viewthing;
current_viewthing = NULL;
return;
Expand Down

0 comments on commit 475fc92

Please sign in to comment.